diff --git a/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java b/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java index d429d45d15e282a61911686371ac4f2ceda6f16f..828e31e859f739fe527c9e61dcbf9b3ae1f29ac5 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 ee283f6fa72bc4f90d24e01472c84c5e2c8e6a11..7704aa4a0dac3e9469a3f52578549b82fabccd0e 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);