Changeset 14710

Timestamp:

04/22/13 21:34:06 (12 years ago)

Author:

ltnguyen

Message:

ADD: color bar

Location:

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

Files:

• bin/AndroidManifest.xml (modified) (1 diff)
• res/layout/issmcore.xml (modified) (1 diff)
• src/gov/nasa/jpl/issm/ColorBar.java (modified) (7 diffs)
• src/gov/nasa/jpl/issm/ISSM.java (modified) (4 diffs)
• src/gov/nasa/jpl/issm/MyGLSurfaceView.java (modified) (4 diffs)

issm/trunk-jpl/src/mobile/android/ISSM_APP/bin/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/res/layout/issmcore.xml

@@ -36 +36 @@
         android:background="@drawable/back_button"/> -->
     
+    <gov.nasa.jpl.issm.ColorBar
+        android:id="@+id/colorbar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignTop="@+id/spinner" />
     <Spinner
         android:id="@+id/spinner"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/back"
         android:layout_marginBottom="5dp"
         android:layout_toRightOf="@+id/play"

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

@@ -1 +1 @@
 package gov.nasa.jpl.issm;
+
+import java.text.DecimalFormat;
 
 import android.content.Context;
@@ -5 +7 @@
 import android.graphics.Color;
 import android.graphics.Paint;
+import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
@@ -15 +18 @@
     private int width = 30;
         private int start_x = 10;
-        private int start_y = 30;
+        private int start_y = 10;
         private int end_y = 0;
         boolean touch;
         final int MAX_SCALING =255;
         double [][] colorBuffer;
-    public ColorBar(Context context)
+        private String vmax;
+        private String vmin;
+        private String vmid;
+        private boolean drawInformation = false;
+    public ColorBar(Context context, AttributeSet attrs)
     {
-        super(context);
+        super(context,attrs);
         setWillNotDraw(false);
         paint.setStrokeWidth(5);
@@ -29 +36 @@
         touch = false;
     }
-//----------------------------------------------------------------    
+//----------------------------------------------------------------
+    //change the color map
+    public void setVelocity(double vmax, double vmin)
+    {
+        this.vmin = vmin+"";
+        String max = vmax+"";
+        String mid = ((vmax+vmin)/2) + "";
+        this.vmax = max.substring(0,3) + max.substring(max.length()-3, max.length());
+        this.vmid = mid.substring(0,3) + mid.substring(mid.length()-3, mid.length());
+        drawInformation = true;
+    }
+//-----------------------------------------------------------------    
     //change the color map
     public void setColorMap(ColorMap colorMap)
@@ -41 +59 @@
         int r,g,b;
         int y = start_y;
-        for(int i = 0; i < 64; i++ )
+        for(int i = 63; i >= 0; i-- )
         {       
                 r =  Math.round((float)colorBuffer[i][0]*MAX_SCALING);
@@ -47 +65 @@
                 b =  Math.round((float)colorBuffer[i][2]*MAX_SCALING);
                 paint.setColor(Color.argb(MAX_SCALING, r, g, b));
-                canvas.drawLine(start_x, y, start_x+width, y, paint);
+                canvas.drawLine(y, start_x,y, start_x+width, paint);
                 
-                if(i == 60)  canvas.drawText("_0.0", start_x+width, y, textpaint);
-                if(i == 48) canvas.drawText("_0.2", start_x+width, y, textpaint);
-                if(i == 36) canvas.drawText("_0.4", start_x+width, y, textpaint);
-                if(i == 24) canvas.drawText("_0.6", start_x+width, y, textpaint);
-                if(i == 12) canvas.drawText("_0.8", start_x+width, y, textpaint);
-                if(i == 0) canvas.drawText("_1.0", start_x+width, y, textpaint);
-                
-                y+=5;
+                if(drawInformation)
+                {
+                        if(i == 63)  canvas.drawText(vmin,y, start_x+width+20, textpaint);
+                        if(i == 38) canvas.drawText(vmid,y, start_x+width+20, textpaint);
+                        if(i == 8)      canvas.drawText(vmax,y, start_x+width+20, textpaint);
+                        if(i == 0) canvas.drawText("V(m/yr)",y+10, start_x+width, textpaint);
+                }
+                y+=3;
         }
-        
         end_y = y;
     }
-//----------------------------------------------------------------        
-    //allow user to move color bar around
+//----------------------------------------------------------------    
+    /*allow user to move color bar around
     @Override
     public boolean onTouchEvent (MotionEvent event)
@@ -89 +106 @@
               }
               return true;
-    }
+    }*/
 //----------------------------------------------------------------        
 }
 ////////////////////////////////////////////////////////////////////////////
+class Velocity
+{
+        private double vmax;
+        private double vmin;
+        public void setVmax(double vmax) {this.vmax = vmax;}
+        public void setVmin(double vmin) {this.vmin = vmin;}
+        public double getVmax() {return vmax;}
+        public double getVmin() {return vmin;}
+}

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

@@ -51 +51 @@
         private ProgressDialog dialog;
         private ColorBar colorBar;
+        private Velocity velocity;
         private SliderMenu sliders;
         private ImageView defaultMap;
@@ -92 +93 @@
                 defaultMap = (ImageView) findViewById(R.id.defaultMap);
                 dialog = new ProgressDialog(this);
-
+                colorBar = (ColorBar) findViewById(R.id.colorbar);
         //load up the ISSM library and create double buffer in java
         //which later on will be pass for native for allocation.
         issmNative = new IssmJni();
+        velocity = new Velocity();
         
         //set default color map to be HSV
         this.colorMap = new ColorMap();
         //create colorBar
-        colorBar = new ColorBar(this);
         colorBar.setColorMap(colorMap);
         spinner.setOnItemSelectedListener(new OnItemSelectedListener()
@@ -112 +113 @@
                                         String color = (String) spinner.getItemAtPosition(item);
                                         colorMap.setColor(color);
+                                        colorBar.setColorMap(colorMap);
+                                        colorBar.invalidate();
                                         drawFigure();
                                 }
@@ -242 +245 @@
     {
         frame.removeView(mGLView);
-        mGLView = new MyGLSurfaceView(this, buff, size, colorMap);
+        mGLView = new MyGLSurfaceView(this, buff, size, colorMap, velocity);
+        colorBar.setVelocity(velocity.getVmax(), velocity.getVmin());
+        colorBar.invalidate();
         frame.addView(mGLView);
     }

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

@@ -8 +8 @@
 
 
-class MyGLSurfaceView extends GLSurfaceView 
+public class MyGLSurfaceView extends GLSurfaceView 
 {
         private MyGLRenderer mRend;
@@ -16 +16 @@
         final int firstVelocity = 9; 
         ColorMap colorMap;
-        
+        Velocity velocity;
         // pinch to zoom
         float oldDist = 100.0f;
@@ -22 +22 @@
         
         int mode = 0;
-    public MyGLSurfaceView(Context context, DoubleBuffer db, int size, ColorMap colorMap) 
+    public MyGLSurfaceView(Context context, DoubleBuffer db, int size, ColorMap colorMap, Velocity velocity) 
     {
         super(context);
@@ -30 +30 @@
         this.size = size;
         this.colorMap = colorMap;
+        this.velocity = velocity;
         vmin = db.get(firstVelocity);
         findMinMaxVelocity(); 
         intialize();
+        this.velocity.setVmin(vmin);
+        this.velocity.setVmax(vmax);
     }
     private void intialize()