From 2b331bf797960e5abb6e411b4af100df7eeab4b7 Mon Sep 17 00:00:00 2001
From: Maxime Graulich <maxime.graulich@gmail.com>
Date: Tue, 21 May 2013 14:27:44 +0000
Subject: [PATCH] Fix Async compute on Android
---
.../src/org/geuz/onelab/MainActivity.java | 18 +++++-------------
contrib/mobile/drawGModel.cpp | 2 +-
2 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java b/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java
index d429d45d15..828e31e859 100644
--- a/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java
+++ b/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java
@@ -33,7 +33,6 @@ import android.support.v4.view.ViewPager;
import android.text.Editable;
import android.text.TextWatcher;
import android.util.DisplayMetrics;
-import android.util.Log;
import android.view.MenuItem;
import android.view.MotionEvent;
import android.view.SubMenu;
@@ -470,22 +469,13 @@ public class MainActivity extends Activity {
run.setText("Run");
reset.setText("Reset");
run.setOnClickListener(new OnClickListener() {public void onClick(View v) {
- if(run.getText().equals("Show step"))
+ if(run.getText().equals("Show progress"))
{
loading.show();
return;
}
- boolean changed = false;
- for(Parameter p : params){
- if(p.changed()){
- changed = true;
- break;
- }
- }
- if(changed){
+ else
new Run().execute();
- }
- getAvailableParam();
pager.setCurrentItem(2, true);
}});
@@ -699,6 +689,7 @@ public class MainActivity extends Activity {
loading.setMessage("...");
loading.show();
run.setText("Show progress");
+ reset.setEnabled(false);
super.onPreExecute();
}
@@ -713,8 +704,9 @@ public class MainActivity extends Activity {
loading.dismiss();
run.setText("Run");
Vibrator v = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
- v.vibrate(500);
+ v.vibrate(350);
run.setEnabled(true);
+ reset.setEnabled(true);
glView.requestRender();
super.onPostExecute(result);
}
diff --git a/contrib/mobile/drawGModel.cpp b/contrib/mobile/drawGModel.cpp
index ee283f6fa7..7704aa4a0d 100644
--- a/contrib/mobile/drawGModel.cpp
+++ b/contrib/mobile/drawGModel.cpp
@@ -541,7 +541,7 @@ void drawGModel::drawView()
this->drawPost();
if(_showGeom) this->drawGeom();
if(_showMesh) this->drawMesh();
- this->drawScale();
+ //this->drawScale();
glDisable(GL_LIGHTING);
glDisable(GL_LIGHT0);
glDisable(GL_DEPTH_TEST);
--
GitLab