Changeset 14443

Timestamp:

03/11/13 20:33:04 (12 years ago)

Author:

ltnguyen

Message:

change to package name, fix slider and allow multiple sliders as seperate UI component. Modify buttons, look, and location

Location:

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

Files:

• AndroidManifest.xml (modified) (1 diff)
• bin/AndroidManifest.xml (modified) (1 diff)
• res/drawable-mdpi/back_button.png (added)
• res/layout/issmcore.xml (modified) (3 diffs)
• res/layout/roundcorner.xml (added)
• res/layout/settingsmenu.xml (added)
• src/gov/nasa/jpl/issm/ISSM.java (modified) (7 diffs)
• src/gov/nasa/jpl/issm/ISSMAPP.java (added)
• src/gov/nasa/jpl/issm/IssmJni.java (modified) (1 diff)
• src/gov/nasa/jpl/issm/SliderMenu.java (added)
• src/gov/nasa/jpl/issm/SplashScreen.java (deleted)

issm/trunk-jpl/src/mobile/android/ISSM/AndroidManifest.xml

@@ -12 +12 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
-        <activity android:name="gov.nasa.jpl.issm.SplashScreen"
+        <activity android:name="gov.nasa.jpl.issm.ISSMAPP"
                   android:label="@string/title_activity_issm" >
             <intent-filter>

issm/trunk-jpl/src/mobile/android/ISSM/bin/AndroidManifest.xml

@@ -12 +12 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
-        <activity android:name="gov.nasa.jpl.issm.SplashScreen"
+        <activity android:name="gov.nasa.jpl.issm.ISSMAPP"
                   android:label="@string/title_activity_issm" >
             <intent-filter>

issm/trunk-jpl/src/mobile/android/ISSM/res/layout/issmcore.xml

@@ -7 +7 @@
     android:orientation="horizontal"
     android:background="@drawable/background" >
-      <TextView
-        android:id="@+id/friction"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:textSize="15sp"
-        android:typeface="serif"
-        android:textColor="#f49956"
-        android:text="Friction" />
       
-      <TextView
-        android:id="@+id/value"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_below="@+id/friction"
-        android:typeface="serif"
-        android:textColor="#FF0000"
-        android:text="100%" />
-
-    <gov.nasa.jpl.issm.VerticalSeekBar
-        android:id="@+id/seekbar"
-        android:layout_width="wrap_content"
-        android:layout_height="300dp"
-        android:layout_above="@+id/back"
-        android:layout_marginBottom="50dp"
-        android:max="490"
-        android:progress="100"
-        android:progressDrawable="@layout/seekbar_progress"
-        android:thumb="@drawable/thumb" />
       
     <FrameLayout
@@ -44 +14 @@
         android:layout_height="wrap_content"
         android:layout_above="@+id/solve"
-        android:layout_below="@+id/value"
-        android:layout_marginLeft="30dp"
+        android:layout_below="@+id/back"
         android:layout_marginBottom="12dp" >
     </FrameLayout>
-    
+
+    <Button
+        android:id="@+id/solve"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_marginLeft="20dp"
+        android:layout_marginBottom="18dp"
+        android:background="@drawable/btn_lightblue_glossy"
+        android:text="Solve" />
+
+    <Button
+        android:id="@+id/setting"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_below="@+id/frame"
+        android:layout_marginRight="20dp"
+        android:background="@drawable/btn_lightblue_glossy"
+        android:text="Settings" />
 
     <Button
@@ -54 +43 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
-        android:layout_marginBottom="17dp"
-        android:background="@drawable/btn_lightblue_glossy"
-        android:text="Back"/>
-
-    <Button
-        android:id="@+id/solve"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBaseline="@+id/back"
-        android:layout_alignBottom="@+id/back"
-        android:layout_marginLeft="14dp"
-        android:layout_toRightOf="@+id/back"
-        android:background="@drawable/btn_lightblue_glossy"
-        android:text="Solve"/>
+        android:layout_alignParentTop="true"
+        android:background="@drawable/back_button"/>
 
 </RelativeLayout>

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

@@ -9 +9 @@
 import android.app.Activity;
 import android.app.ProgressDialog;
+import android.view.Gravity;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -20 +22 @@
 import android.widget.FrameLayout;
 import android.widget.ImageButton;
+import android.widget.PopupWindow;
 import android.widget.SeekBar;
 import android.widget.SeekBar.OnSeekBarChangeListener;
@@ -36 +39 @@
     private GLSurfaceView mGLView;
         private FrameLayout frame;
-        private VerticalSeekBar bar;
-        private TextView value;
         private ColorMap colorMap;
-        private int alpha;
+        private int friction,temperature,sealevel;
         private final int MINIMUM = 90;
         private final int OFFSET = 10;
@@ -63 +64 @@
                 }
         }
-        alpha = MINIMUM + OFFSET;
+        friction = MINIMUM + OFFSET;
+        temperature = MINIMUM + OFFSET;
+        sealevel = MINIMUM + OFFSET;
         frame = (FrameLayout)findViewById(R.id.frame);
         viewflipper = (ViewFlipper) findViewById(R.id.flipper);
-        this.bar  = (VerticalSeekBar) findViewById(R.id.seekbar);
-        this.value  = (TextView) super.findViewById(R.id.value);
         Button solve = (Button) super.findViewById(R.id.solve);
         solve.setOnClickListener(this);
         Button back = (Button) super.findViewById(R.id.back);
         back.setOnClickListener(this);
+        Button setting = (Button) super.findViewById(R.id.setting);
+        setting.setOnClickListener(this);
         ImageButton gl = (ImageButton) findViewById(R.id.greenland);            
                 gl.setOnClickListener(this);
                 ImageButton art = (ImageButton) findViewById(R.id.antarctica);
                 art.setOnClickListener(this);
-        bar.setOnSeekBarChangeListener(new OnSeekBarChangeListener()
-        {
-                public void onProgressChanged(SeekBar seekBar, int progress,boolean fromUser)
-                {
-                                
-                        alpha = progress + OFFSET;
-                        value.setText("" + alpha + "%");
-                }
-
-                    @Override
-                    public void onStartTrackingTouch(SeekBar seekBar) {}
-        
-                    @Override
-                    public void onStopTrackingTouch(SeekBar seekBar) {}
-        });
 
         //load up the ISSM library and create double buffer in java
@@ -198 +186 @@
         
     }
-//   
-   
 //---------------------------------------------------------------------------------   
     public void onClick(View view) 
@@ -241 +227 @@
                         dialog.setProgress(0);
                         dialog.setMax(100);
-                        new CalculationTask().execute(alpha);
+                        System.out.println(friction);
+                        new CalculationTask().execute(friction);
                         break;
+                }
+                case R.id.setting:
+                {
+                        final SliderMenu sliders= new SliderMenu(this);
+                        final PopupWindow popupWindow = new PopupWindow( sliders, 400,300, true);
+                        popupWindow.showAtLocation(sliders, Gravity.CENTER, 0, 0);
+                        Button dismiss = (Button)sliders.findViewById(R.id.exitSetting);
+                    dismiss.setOnClickListener(new Button.OnClickListener()
+                    {
+                        public void onClick(View v)
+                        {
+                                friction = sliders.getFric();
+                            temperature = sliders.getTemp();
+                            sealevel = sliders.getSea();
+                                popupWindow.dismiss();
+                                System.out.println("Friction = " + friction );
+                            System.out.println("Temp =" + temperature);
+                            System.out.println("SeaLevel" + sealevel);
+                        }
+                    });
                 }
         }
@@ -252 +259 @@
         mGLView = new MyGLSurfaceView(this, buff, size, colorMap);
         frame.addView(mGLView);
-        //frame.addView(colorBar);
     }
 //------------------------------------------------------------------------------------

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

@@ -8 +8 @@
         static 
         {
-        System.loadLibrary("ISSMJNI");
+        System.loadLibrary("IssmJni");
     }
 }