Changeset 14506

Timestamp:

04/04/13 01:04:25 (12 years ago)

Author:

ltnguyen

Message:

Adding temperature sliders its prototype on Jni port

Location:

issm/trunk-jpl/src/mobile/android/ISSM_APP

Files:

• jni (added)
• jni/Android.mk (added)
• jni/Application.mk (added)
• jni/Main.cpp (added)
• jni/gsllib (added)
• jni/gsllib/Android.mk (added)
• jni/issmlib (added)
• jni/issmlib/Android.mk (added)
• src/gov/nasa/jpl/issm/ISSM.java (modified) (3 diffs)
• src/gov/nasa/jpl/issm/IssmJni.java (modified) (1 diff)
• src/gov/nasa/jpl/issm/SliderMenu.java (modified) (1 diff)

issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/ISSM.java ¶

@@ -45 +45 @@
         private FrameLayout frame;
         private ColorMap colorMap;
-        private int friction; //temperature,sealevel;
+        private int friction, temperature;//,sealevel;
         private final int MINIMUM = 90;
         private final int OFFSET = 10;
@@ -200 +200 @@
                         {
                                 friction = sliders.getFric();
+                                temperature = sliders.getTemp();
                             //temperature = sliders.getTemp();
                             //sealevel = sliders.getSea();
                                 popupWindow.dismiss();
                                 System.out.println("Friction = " + friction );
-                                new CalculationTask().execute(friction);
+                                new CalculationTask().execute(friction,temperature);
                         }
                     });
@@ -241 +242 @@
                         };
                         thread.start();
-                        issmNative.solveISSMModel(target[0],buff);
+                        System.out.println("temperatature = " + target[1]);
+                        issmNative.solveISSMModel(target[0],target[1],buff);
                         return true;
                 }

issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/IssmJni.java ¶

@@ -4 +4 @@
 class IssmJni
 {
-        public native void solveISSMModel(double alpha, DoubleBuffer buff);
+        public native void solveISSMModel(double alpha, double temperature, DoubleBuffer buff);
         public native int createISSMModel(String solution_type, String absfile, String relfile);
         static 

issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/SliderMenu.java ¶

@@ -36 +36 @@
         temp  = (TextView) this.findViewById(R.id.temp);
         sealvl   = (TextView) this.findViewById(R.id.sealvl);
-        tempBar.setVisibility(INVISIBLE);
+        //tempBar.setVisibility(INVISIBLE);
         seaLevelBar.setVisibility(INVISIBLE);
-        temp.setVisibility(INVISIBLE);
+        //temp.setVisibility(INVISIBLE);
         sealvl.setVisibility(INVISIBLE);
         friction = MINIMUM + OFFSET;