diff --git a/contrib/mobile/Android/src/org/geuz/onelab/ModelFragment.java b/contrib/mobile/Android/src/org/geuz/onelab/ModelFragment.java index d3db4e1ec1d03c6f4c762c9d2b73aa375f7d2512..707bc2421f1fe9525e58d375ac5af9b50c5effa2 100644 --- a/contrib/mobile/Android/src/org/geuz/onelab/ModelFragment.java +++ b/contrib/mobile/Android/src/org/geuz/onelab/ModelFragment.java @@ -46,8 +46,8 @@ public class ModelFragment extends Fragment{ Bundle bundle = new Bundle(); bundle.putParcelable("Gmsh", g); fragment.setArguments(bundle); - return fragment; - } + return fragment; + } public ModelFragment() { } diff --git a/contrib/mobile/Android/src/org/geuz/onelab/OptionsPostProcessingFragment.java b/contrib/mobile/Android/src/org/geuz/onelab/OptionsPostProcessingFragment.java index 68e83f9331f49b36a45ec3eb6452ea9d1fbc063b..cc44519dd0c3e4bb7200088bfa571067fe2ffc20 100644 --- a/contrib/mobile/Android/src/org/geuz/onelab/OptionsPostProcessingFragment.java +++ b/contrib/mobile/Android/src/org/geuz/onelab/OptionsPostProcessingFragment.java @@ -7,7 +7,6 @@ import android.content.Context; import android.os.Bundle; import android.text.Editable; import android.text.TextWatcher; -import android.util.Log; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.View; @@ -49,7 +48,6 @@ public class OptionsPostProcessingFragment extends Fragment{ Bundle savedInstanceState) { String[] PViews = _gmsh.getPView(); String[] infos = PViews[_pview].split("\n"); - if(infos.length != 5){ Log.e("Gmsh", "Pview length is incorect"); return null;} getActivity().getActionBar().setTitle(infos[0]); LinearLayout layout = (LinearLayout)inflater.inflate(R.layout.fragment_postprocessing, container, false); final Spinner intervalsType = (Spinner)layout.findViewById(R.id.intervals_type); diff --git a/contrib/mobile/Android/src/org/geuz/onelab/ParameterNumber.java b/contrib/mobile/Android/src/org/geuz/onelab/ParameterNumber.java index 6b75613657c2d11ad5e427d4757cde81c05cdb7c..7e85b1b2eb4fdd6197fdf9dec199cf884dd918a4 100644 --- a/contrib/mobile/Android/src/org/geuz/onelab/ParameterNumber.java +++ b/contrib/mobile/Android/src/org/geuz/onelab/ParameterNumber.java @@ -6,7 +6,6 @@ import java.util.ArrayList; import android.content.Context; import android.text.Editable; import android.text.TextWatcher; -import android.util.Log; import android.view.KeyEvent; import android.view.View; import android.view.inputmethod.InputMethodManager; @@ -76,7 +75,7 @@ public class ParameterNumber extends Parameter{ public void setValue(double value) { if(value < _min || value > _max) { - Log.w("ParameterNumber", "Incorect value "+value+" (max="+_max+" min="+_min+")"); + //Log.w("ParameterNumber", "Incorect value "+value+" (max="+_max+" min="+_min+")"); return; } if(value == _value) return; diff --git a/contrib/mobile/Android/src/org/geuz/onelab/SplashScreen.java b/contrib/mobile/Android/src/org/geuz/onelab/SplashScreen.java index 3320d54aef7c20f1d0944a341c0a937d9870c17d..ec5aa7e82a9e56c1a38b3302b5922de54883b236 100644 --- a/contrib/mobile/Android/src/org/geuz/onelab/SplashScreen.java +++ b/contrib/mobile/Android/src/org/geuz/onelab/SplashScreen.java @@ -12,7 +12,6 @@ import android.content.Context; import android.content.Intent; import android.os.Handler; import android.os.Message; -import android.util.Log; public class SplashScreen extends Activity{ private static final int SPLASHTIME = 1000; // duration for the splash screen in milliseconds @@ -83,7 +82,6 @@ public class SplashScreen extends Activity{ byte[] buffer = new byte[2048]; for (int i = zipStream.read(buffer, 0, buffer.length); i > 0;i = zipStream.read(buffer, 0, buffer.length)) outputStream.write(buffer,0,i); - Log.d("Load files", "Add " + entry.getName() + " from the zip file"); } zipStream.close(); } catch (IOException e1) { diff --git a/contrib/mobile/CMakeLists.txt b/contrib/mobile/CMakeLists.txt index 59f4c713dd0858d97e8175a1141283b637ed60f8..ae688f6bbd131544f4c136c85b4bffe975356ef9 100644 --- a/contrib/mobile/CMakeLists.txt +++ b/contrib/mobile/CMakeLists.txt @@ -176,7 +176,7 @@ if(ENABLE_BUILD_ANDROID) add_custom_command(TARGET androidProject POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory ${DIR} ${CMAKE_CURRENT_BINARY_DIR}/models/${DIRNAME}) endforeach(DIR) - find_path(ZIP_COMMAND zip) + find_program(ZIP_COMMAND zip) add_custom_command(TARGET androidProject POST_BUILD COMMAND pushd ${CMAKE_CURRENT_BINARY_DIR}/models/ && ${ZIP_COMMAND} -r ${CMAKE_CURRENT_BINARY_DIR}/Onelab/res/raw/models.zip * && popd)