Changeset 14703

Timestamp:

04/22/13 16:28:25 (12 years ago)

Author:

cnpetrie

Message:

Scale image of greenland to more closely reflect scale of model on model page

Location:

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

Files:

• AndroidManifest.xml (modified) (1 diff)
• src/gov/nasa/jpl/issm/ISSM.java (modified) (6 diffs)

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

@@ -5 +5 @@
     android:installLocation="preferExternal" >
     <uses-sdk
-        android:minSdkVersion="10"
+        android:minSdkVersion="11"
         android:targetSdkVersion="15" />
         <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

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

@@ -9 +9 @@
 import android.app.Activity;
 import android.app.ProgressDialog;
+import android.graphics.Matrix;
 import android.util.DisplayMetrics;
 import android.view.Gravity;
@@ -174 +175 @@
                                 mapName= "greenland";
                                 defaultMap.setImageResource(R.drawable.greenland_button);
+                                defaultMap.setScaleX(1.12f);
+                                defaultMap.setScaleY(0.92f);
                                 viewflipper.setInAnimation(inFromRightAnimation());
                         viewflipper.setOutAnimation(outToLeftAnimation());
                         viewflipper.showNext();
                         defaultMap.setVisibility(View.VISIBLE);
+                        defaultMap.setAlpha(1.0f);
                         onSimulationScreen = true;
                         //create FemModel in native code and return the size of the model
@@ -190 +194 @@
                         viewflipper.setOutAnimation(outToLeftAnimation());
                         viewflipper.showNext();
+                        defaultMap.setAlpha(1.0f);
                         defaultMap.setVisibility(View.VISIBLE);
                         onSimulationScreen = true;
@@ -228 +233 @@
                                 System.out.println("Friction = " + friction );
                                 new CalculationTask().execute(friction,temperature);
-                                defaultMap.setImageResource(0);
                         }
                     });
@@ -287 +291 @@
                         {
                                 dialog.dismiss();
-                                fadeImage();
+                                if(defaultMap.getDrawable().isVisible() == true )
+                                        fadeImage();
                         }
                 }
@@ -299 +304 @@
                                 e.printStackTrace();
                         }
-                        if(result) drawFigure();
+                        if(result)
+                        { 
+                                drawFigure();
+                        }
                         
                 }