Changeset 14210

Timestamp:

01/06/13 14:13:48 (12 years ago)

Author:

ltnguyen

Message:

Change ISSM app layout, add random Z coordinate

Location:

issm/trunk-jpl/src/android/ISSM

Files:

• AndroidManifest.xml (modified) (2 diffs)
• bin/AndroidManifest.xml (modified) (2 diffs)
• res/anim (added)
• res/anim/alpha.xml (added)
• res/anim/translate.xml (added)
• res/drawable-hdpi/background.jpg (added)
• res/drawable-mdpi/intro.png (added)
• res/drawable-mdpi/issm_logo.png (added)
• res/drawable-mdpi/start.png (added)
• res/drawable-mdpi/video.png (added)
• res/drawable-mdpi/visitus.png (added)
• res/layout/activity_issm.xml (deleted)
• res/layout/activity_mapselection.xml (deleted)
• res/layout/issmcore.xml (added)
• res/layout/issmmapselection.xml (added)
• res/layout/main_issm.xml (added)
• res/layout/menupage.xml (added)
• res/layout/popuptext.xml (added)
• res/layout/splashscreen.xml (added)
• src/com/example/issm/ColorBar.java (added)
• src/com/example/issm/ColorMap.java (modified) (1 diff)
• src/com/example/issm/ISSM.java (modified) (7 diffs)
• src/com/example/issm/MapSelection.java (deleted)
• src/com/example/issm/MenuPage.java (added)
• src/com/example/issm/MyGLRenderer.java (modified) (1 diff)
• src/com/example/issm/MyGLSurfaceView.java (modified) (3 diffs)
• src/com/example/issm/SplashScreen.java (added)
• src/com/example/issm/VerticalSeekBar.java (added)

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

@@ -12 +12 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
-        <activity android:name=".MapSelection"
+        <activity android:name="com.example.issm.SplashScreen"
                   android:label="@string/title_activity_issm" >
             <intent-filter>
@@ -20 +20 @@
             </activity>
             <activity
+            android:name=".MenuPage"
+            android:label="@string/title_activity_issm" >
+        </activity>
+            <activity
             android:name=".ISSM"
             android:label="@string/title_activity_issm" >

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

@@ -12 +12 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
-        <activity android:name=".MapSelection"
+        <activity android:name="com.example.issm.SplashScreen"
                   android:label="@string/title_activity_issm" >
             <intent-filter>
@@ -20 +20 @@
             </activity>
             <activity
+            android:name=".MenuPage"
+            android:label="@string/title_activity_issm" >
+        </activity>
+            <activity
             android:name=".ISSM"
             android:label="@string/title_activity_issm" >

issm/trunk-jpl/src/android/ISSM/src/com/example/issm/ColorMap.java

@@ -12 +12 @@
         }
 //-------------------------------------------------------
+        public double[][] getColorBuffer()
+        {
+                return d;
+        }
+//--------------------------------------------------------      
         //set default color map => hsv {{{
         public void setDefault()

issm/trunk-jpl/src/android/ISSM/src/com/example/issm/ISSM.java

@@ -4 +4 @@
 import java.nio.ByteOrder;
 import java.nio.DoubleBuffer;
-
 import android.opengl.GLSurfaceView;
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.app.Activity;
+import android.app.ProgressDialog;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -13 +14 @@
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.animation.AccelerateInterpolator;
+import android.view.animation.Animation;
+import android.view.animation.TranslateAnimation;
 import android.widget.Button;
-import android.widget.EditText;
 import android.widget.FrameLayout;
+import android.widget.ImageButton;
 import android.widget.SeekBar;
 import android.widget.SeekBar.OnSeekBarChangeListener;
 import android.widget.TextView;
 import android.widget.Toast;
-
-
-public class ISSM extends Activity implements OnClickListener 
+import android.widget.ViewFlipper;
+
+
+public class ISSM extends Activity implements OnClickListener
 {
-        private EditText input;
-        private TextView output;
         private DoubleBuffer buff;
         private IssmJni issmNative;
@@ -33 +36 @@
     private GLSurfaceView mGLView;
         private FrameLayout frame;
-        private SeekBar bar;
-    private TextView /*txtStatus,*/ txtValue;
-    private ColorMap colorMap;
-    private int alpha;
-    private final int MINIMUM = 0;
-    private final int OFFSET = 10;
+        private VerticalSeekBar bar;
+        private TextView value;
+        private ColorMap colorMap;
+        private int alpha;
+        private final int MINIMUM = 90;
+        private final int OFFSET = 10;
+        private ViewFlipper viewflipper;
+        private ProgressDialog dialog;
+        private ColorBar colorBar;
+        //------------------------------------------------------------------------------------------------    
     @Override
-  //------------------------------------------------------------------------------------------------    
-    public void onCreate(Bundle savedInstanceState) {
+    public void onCreate(Bundle savedInstanceState)
+    {
         super.onCreate(savedInstanceState);
-        Bundle map = getIntent().getExtras();
+        setContentView(R.layout.main_issm);
+        this.initialize();         
+    }
+  //----------------------------------------------------------------------------------------------
+    private void initialize()
+    {
+        Bundle map = getIntent().getExtras();
         {
                 if(map!= null)
                 {
-                        mapName = map.getString("map");
                         issmFolder = map.getString("pathToFile");
                 }
         }
-        alpha = 90 + OFFSET;
-        setContentView(R.layout.activity_issm);
-        this.bar  = (SeekBar) findViewById(R.id.seekBar);
-        this.txtValue  = (TextView) super.findViewById(R.id.value);
-        Button button = (Button) super.findViewById(R.id.button1);
-            frame = (FrameLayout)findViewById(R.id.frame);
-        button.setOnClickListener(this);
+        alpha = 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);
+        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;
-                        txtValue.setText("Friction Scaling: " +  alpha + "%");
+                        value.setText("" + alpha + "%");
                 }
 
                     @Override
-                    public void onStartTrackingTouch(SeekBar seekBar) {
-                            // TODO Auto-generated method stub
-        
-                    }
+                    public void onStartTrackingTouch(SeekBar seekBar) {}
         
                     @Override
-                    public void onStopTrackingTouch(SeekBar seekBar) {
-                            // TODO Auto-generated method stub
-        
-                    }
+                    public void onStopTrackingTouch(SeekBar seekBar) {}
         });
 
+        //load up the ISSM library and create double buffer in java
+        //which later on will be pass for native for allocation.
+        issmNative = new IssmJni();
         
-        //load up the ISSM library and create double buffer in java
-        //which later on will be pass for native allocation.
-        issmNative = new IssmJni();
-        this.createModel();
+        //set default color map to be HSV
         this.colorMap = new ColorMap();
-        buff = ByteBuffer.allocateDirect(size*12*8).order(ByteOrder.nativeOrder()).asDoubleBuffer();
+        //create colorBar
+        colorBar = new ColorBar(this);
+        colorBar.setColorMap(colorMap);
     }
 //------------------------------------------------------------------------------------------------    
@@ -100 +114 @@
 
         size = issmNative.createISSMModel(solution_type,issmFolder,file);
-    }
-//------------------------------------------------------------------------------------------------
-    public void fillBuffer()
-    {
-        issmNative.solveISSMModel(alpha,buff);
+        buff = ByteBuffer.allocateDirect(size*12*8).order(ByteOrder.nativeOrder()).asDoubleBuffer();
     }
 //------------------------------------------------------------------------------------------------  
-    public boolean onCreateOptionsMenu(Menu menu)
+    public boolean onCreateOptionsMenu(Menu menu) 
     {
         MenuInflater menuInflater = getMenuInflater();
@@ -114 +124 @@
         return true;
     }
-//------------------------------------------------------------------------------------------------
+//------------------------------------------------------------------------------------------------  
+    //Option Menu that allow user to choose color. 
    public boolean onOptionsItemSelected(MenuItem item)
     {
@@ -124 +135 @@
                             
                 case R.id.cl_autumn:
-                        colorMap.setAutumn();
+                        colorMap.setAutumn(); colorBar.setColorMap(colorMap);
                         drawFigure();
                         return true;
                 
                 case R.id.cl_bone:
-                        colorMap.setBone();
+                        colorMap.setBone(); colorBar.setColorMap(colorMap);
                         drawFigure();
                         return true;
                 
                 case R.id.cl_cool:
-                        colorMap.setCool();
+                        colorMap.setCool(); colorBar.setColorMap(colorMap);
                         drawFigure();
                         return true;
                         
                 case R.id.cl_copper:
-                        colorMap.setCopper();
+                        colorMap.setCopper(); colorBar.setColorMap(colorMap);
                         drawFigure();
                         return true;
                         
                 case R.id.cl_gray:
-                        colorMap.setGray();
+                        colorMap.setGray(); colorBar.setColorMap(colorMap);
                         drawFigure();
                         return true;
                 
                 case R.id.cl_hot:
-                        colorMap.setGray();
+                        colorMap.setGray(); colorBar.setColorMap(colorMap);
                         drawFigure();
                         return true;
                 
                 case R.id.cl_hsv:
-                        colorMap.setDefault();
+                        colorMap.setDefault(); colorBar.setColorMap(colorMap);
                         drawFigure();
                         return true;
                         
                 case R.id.cl_jet:
-                        colorMap.setJet();
+                        colorMap.setJet(); colorBar.setColorMap(colorMap);
                         drawFigure();
                         return true;
                         
                 case R.id.cl_pink:
-                        colorMap.setPink();
+                        colorMap.setPink(); colorBar.setColorMap(colorMap);
                         drawFigure();
                         return true;
                         
                 case R.id.cl_spring:
-                        colorMap.setSpring();
+                        colorMap.setSpring(); colorBar.setColorMap(colorMap);
                         drawFigure();
                         return true;
                         
                 case R.id.cl_summer:    
-                        colorMap.setSummer();
+                        colorMap.setSummer(); colorBar.setColorMap(colorMap);
                         drawFigure();
                         return true;
                         
                 case R.id.cl_winter:
-                        colorMap.setWinter();
+                        colorMap.setWinter();colorBar.setColorMap(colorMap);
                         drawFigure();
                         return true;
@@ -185 +196 @@
                         return super.onOptionsItemSelected(item);
         }
-            
-    }
+        
+    }
+//   
+   
 //---------------------------------------------------------------------------------   
     public void onClick(View view) 
         {
-                this.fillBuffer();
-                drawFigure();
+        switch(view.getId())
+        {
+                case R.id.greenland:
+                        {
+                                mapName= "greenland";
+                                viewflipper.setInAnimation(inFromRightAnimation());
+                        viewflipper.setOutAnimation(outToLeftAnimation());
+                        viewflipper.showNext();
+                        //create FemModel in native code and return the size of the model
+                        this.createModel();
+                        break;
+                        }
+                case R.id.antarctica:
+                        {
+                                mapName= "antarctica";
+                                viewflipper.setInAnimation(inFromRightAnimation());
+                        viewflipper.setOutAnimation(outToLeftAnimation());
+                        viewflipper.showNext();
+                        //create FemModel in native code and return the size of the model
+                        this.createModel();
+                        break;
+                        }
+                case R.id.back:
+                {
+                         frame.removeView(mGLView);
+                         viewflipper.setInAnimation(inFromLeftAnimation());
+                         viewflipper.setOutAnimation(outToRightAnimation());
+                         viewflipper.showPrevious(); 
+                         break;
+                }
+                case R.id.solve:
+                {
+                        dialog = new ProgressDialog(view.getContext());
+                        dialog.setCancelable(true);
+                        dialog.setMessage("Loading View. Please Wait ...");
+                        dialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
+                        dialog.setProgress(0);
+                        dialog.setMax(100);
+                        new CalculationTask().execute(alpha);
+                        break;
+                }
+        }
         }
 //---------------------------------------------------------------------------------- 
     public void drawFigure()
     {
-        frame.removeView(mGLView);
+        frame.removeAllViews();
         mGLView = new MyGLSurfaceView(this, buff, size, colorMap);
         frame.addView(mGLView);
-    }
-//-----------------------------------------------------------------------------------    
+        frame.addView(colorBar);
+    }
+//------------------------------------------------------------------------------------
+   //AsyncTask will allow to display while doing some task in the background
+   private class CalculationTask extends AsyncTask<Integer,Integer,Boolean>
+   {
+                @Override
+                protected Boolean doInBackground(Integer... target) 
+                {
+                        Thread thread = new Thread()
+                        {
+                                public void run()
+                                {
+                                        for(int i = 0; i <= 100; i+=5)
+                                        {
+                                                try {
+                                                        Thread.sleep(300);
+                                                } catch (InterruptedException e) {
+                                                        // TODO Auto-generated catch block
+                                                        e.printStackTrace();
+                                                }
+                                                publishProgress(i);
+                                        }
+                                }
+                        };
+                        thread.start();
+                        issmNative.solveISSMModel(target[0],buff);
+                        return true;
+                }
+                
+                protected void onPreExecute()
+                {
+                        super.onPostExecute(null);
+                        dialog.show();
+                }
+                protected void onProgressUpdate(Integer ... value)
+                {
+                        super.onProgressUpdate();
+                        dialog.setProgress(value[0]);
+                }
+                protected void onPostExecute(Boolean result)
+                {
+                        super.onPostExecute(result);
+                        dialog.dismiss();
+                        if(result) drawFigure();
+                }
+           
+   }
+//----------------------------------------------------------------------------------- 
+    
+    // Below are implementation for the animation between map selection and core computation
+
+        private Animation inFromRightAnimation() {
+
+        Animation inFromRight = new TranslateAnimation(
+        Animation.RELATIVE_TO_PARENT,  +1.0f, Animation.RELATIVE_TO_PARENT,  0.0f,
+        Animation.RELATIVE_TO_PARENT,  0.0f, Animation.RELATIVE_TO_PARENT,   0.0f
+        );
+        inFromRight.setDuration(500);
+        inFromRight.setInterpolator(new AccelerateInterpolator());
+        return inFromRight;
+        }
+        private Animation outToLeftAnimation() {
+        Animation outtoLeft = new TranslateAnimation(
+          Animation.RELATIVE_TO_PARENT,  0.0f, Animation.RELATIVE_TO_PARENT,  -1.0f,
+          Animation.RELATIVE_TO_PARENT,  0.0f, Animation.RELATIVE_TO_PARENT,   0.0f
+        );
+        outtoLeft.setDuration(500);
+        outtoLeft.setInterpolator(new AccelerateInterpolator());
+        return outtoLeft;
+        }
+
+        private Animation inFromLeftAnimation() {
+        Animation inFromLeft = new TranslateAnimation(
+        Animation.RELATIVE_TO_PARENT,  -1.0f, Animation.RELATIVE_TO_PARENT,  0.0f,
+        Animation.RELATIVE_TO_PARENT,  0.0f, Animation.RELATIVE_TO_PARENT,   0.0f
+        );
+        inFromLeft.setDuration(500);
+        inFromLeft.setInterpolator(new AccelerateInterpolator());
+        return inFromLeft;
+        }
+        private Animation outToRightAnimation() {
+        Animation outtoRight = new TranslateAnimation(
+          Animation.RELATIVE_TO_PARENT,  0.0f, Animation.RELATIVE_TO_PARENT,  +1.0f,
+          Animation.RELATIVE_TO_PARENT,  0.0f, Animation.RELATIVE_TO_PARENT,   0.0f
+        );
+        outtoRight.setDuration(500);
+        outtoRight.setInterpolator(new AccelerateInterpolator());
+        return outtoRight;
+        }
+//-------------------------------------------------------------------------------------------    
 }
+/////////////////////////////////////////////////////////////////////////////////////////////

issm/trunk-jpl/src/android/ISSM/src/com/example/issm/MyGLRenderer.java

@@ -101 +101 @@
     {
         // Set the background frame color
-        GLES20.glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
+        GLES20.glClearColor(0.0f, 0.8f, 1.0f, 1.0f);
         
                 // Position the eye behind the origin.

issm/trunk-jpl/src/android/ISSM/src/com/example/issm/MyGLSurfaceView.java

@@ -2 +2 @@
 
 import java.nio.DoubleBuffer;
+import java.util.Random;
 
 import android.content.Context;
@@ -107 +108 @@
                                 f[i][15] =  (f[i][15]-ymin)/(ymax-ymin)*YSCALE_FACTOR;
                 }
+                
+                Random r = new Random();
+                float z1,z2,z3;
+                for(int i = 0 ; i <size; i++)
+                {
+                        //r.nextFloat() will generate random from 0-1
+                        z1 = r.nextFloat();
+                        z2 = r.nextFloat();
+                        z3 = r.nextFloat();
+                        f[i][2] = z1;
+                        f[i][9] = z2;
+                        f[i][16]= z3;
+                        
+                        //System.out.println("z = " + z1 + "," + z2 + "," + z3);
+                        //System.out.println("x = " + f[i][1] + "," + f[i][7] + "," + f[i][14]);
+                }
                         
         mRend = new MyGLRenderer(f);
@@ -130 +147 @@
     private double getAlphaColor(double velocity)
     {
-        double alpha=(velocity-vmin)/(vmax-vmin) ;
-        return alpha;
+        return (velocity-vmin)/(vmax-vmin);
     }