Skip to content
Snippets Groups Projects
Commit 2b331bf7 authored by Maxime Graulich's avatar Maxime Graulich
Browse files

Fix Async compute on Android

parent 2bb7be39
No related branches found
No related tags found
No related merge requests found
...@@ -33,7 +33,6 @@ import android.support.v4.view.ViewPager; ...@@ -33,7 +33,6 @@ import android.support.v4.view.ViewPager;
import android.text.Editable; import android.text.Editable;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.util.Log;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.SubMenu; import android.view.SubMenu;
...@@ -470,22 +469,13 @@ public class MainActivity extends Activity { ...@@ -470,22 +469,13 @@ public class MainActivity extends Activity {
run.setText("Run"); run.setText("Run");
reset.setText("Reset"); reset.setText("Reset");
run.setOnClickListener(new OnClickListener() {public void onClick(View v) { run.setOnClickListener(new OnClickListener() {public void onClick(View v) {
if(run.getText().equals("Show step")) if(run.getText().equals("Show progress"))
{ {
loading.show(); loading.show();
return; return;
} }
boolean changed = false; else
for(Parameter p : params){
if(p.changed()){
changed = true;
break;
}
}
if(changed){
new Run().execute(); new Run().execute();
}
getAvailableParam();
pager.setCurrentItem(2, true); pager.setCurrentItem(2, true);
}}); }});
...@@ -699,6 +689,7 @@ public class MainActivity extends Activity { ...@@ -699,6 +689,7 @@ public class MainActivity extends Activity {
loading.setMessage("..."); loading.setMessage("...");
loading.show(); loading.show();
run.setText("Show progress"); run.setText("Show progress");
reset.setEnabled(false);
super.onPreExecute(); super.onPreExecute();
} }
...@@ -713,8 +704,9 @@ public class MainActivity extends Activity { ...@@ -713,8 +704,9 @@ public class MainActivity extends Activity {
loading.dismiss(); loading.dismiss();
run.setText("Run"); run.setText("Run");
Vibrator v = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE); Vibrator v = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
v.vibrate(500); v.vibrate(350);
run.setEnabled(true); run.setEnabled(true);
reset.setEnabled(true);
glView.requestRender(); glView.requestRender();
super.onPostExecute(result); super.onPostExecute(result);
} }
......
...@@ -541,7 +541,7 @@ void drawGModel::drawView() ...@@ -541,7 +541,7 @@ void drawGModel::drawView()
this->drawPost(); this->drawPost();
if(_showGeom) this->drawGeom(); if(_showGeom) this->drawGeom();
if(_showMesh) this->drawMesh(); if(_showMesh) this->drawMesh();
this->drawScale(); //this->drawScale();
glDisable(GL_LIGHTING); glDisable(GL_LIGHTING);
glDisable(GL_LIGHT0); glDisable(GL_LIGHT0);
glDisable(GL_DEPTH_TEST); glDisable(GL_DEPTH_TEST);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment