Changeset 15287

Timestamp:

06/19/13 16:26:07 (12 years ago)

Author:

ltnguyen

Message:

final modification for android project, freezing project and start ISSM web-base application

Location:

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

Files:

• ISSM.java (modified) (1 diff)
• ISSMAPP.java (modified) (2 diffs)
• ImageList.java (modified) (4 diffs)
• ImageListFromUrl.java (added)
• ImageResizer.java (modified) (1 diff)
• IssmJni.java (modified) (1 diff)
• MyGLSurfaceView.java (modified) (2 diffs)

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

@@ -357 +357 @@
                         thread.start();
                         System.out.println("temperatature = " + target[1]);
-                        issmNative.solveISSMModel(target[0],target[1],buff);
+                        issmNative.solveISSMModel(target[0],buff);
+                        //issmNative.solveISSMModel(target[0],target[1],buff);
                         return true;
                 }

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

@@ -25 +25 @@
         ImageList imageList;
         private static final String PREFERENCE_FIRST_RUN = null;
-        private String extStorageDirectory;
+        public static String extStorageDirectory;
         private String issmFolder; 
         SharedPreferences settings;
@@ -49 +49 @@
                         protected Boolean doInBackground(Boolean... target) 
                         {
+                                imageList.decodeAndResizeImageFromURL();
                                 imageList.decodeAndResizeImage();
                                 //not sure why, but target[0] can be true on install! more to be done.

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

@@ -1 +1 @@
 package gov.nasa.jpl.issm;
 
+import java.io.BufferedOutputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
 import java.util.ArrayList;
 
 import android.content.Context;
 import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.util.Log;
 
 public class ImageList 
 {
         private static ArrayList <Bitmap> imageList;
+        private static ArrayList <Bitmap> imageListFromURL;
         private Context context;
         final int nImage = 17; 
@@ -15 +25 @@
         {
                 imageList = new ArrayList <Bitmap>();
+                imageListFromURL = new ArrayList <Bitmap>();
                 this.context = context;
+        }
+//----------------------------------------------------------
+        public void decodeAndResizeImageFromURL()
+        {
+                URL url;
+                for(int i =0; i <1; i++)
+                {
+                        try 
+                        {
+                                url = new URL(ImageListFromUrl.imageUrls[0]);
+                                URLConnection connection = url.openConnection();
+                                HttpURLConnection httpConnection = (HttpURLConnection) connection;
+                    httpConnection.setRequestMethod("GET");
+                    httpConnection.connect();
+         
+                    if (httpConnection.getResponseCode() == HttpURLConnection.HTTP_OK) 
+                    {
+                        imageList.add(ImageResizer.decodeSampledBitmapFromURL(url, 50, 50)); 
+                    }
+                    } catch (IOException e) {
+                        Log.e("ImageResizer", "Could not load Bitmap from: " + ImageListFromUrl.imageUrls[i]);
+                    }
+                }
         }
 //----------------------------------------------------------
@@ -21 +55 @@
         {
                 int resID;
-                for(int i = 0 ; i < nImage; i++)
+                for(int i = 1 ; i < nImage; i++)
                 {
                         resID=context.getResources().getIdentifier("image"+i, "drawable", context.getPackageName());
@@ -32 +66 @@
                 return imageList;
         }
+//----------------------------------------------------------
+                public static ArrayList<Bitmap> getImageListFromURL()
+                {
+                        return imageListFromURL;
+                }       
 }

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

@@ -1 +1 @@
 package gov.nasa.jpl.issm;
+
+import java.io.IOException;
+import java.net.URL;
 
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.util.Log;
 
 public class ImageResizer {
+        
+        public static Bitmap decodeSampledBitmapFromURL(URL url , int reqWidth, int reqHeight) {
+
+        // First decode with inJustDecodeBounds=true to check dimensions
+        final BitmapFactory.Options options = new BitmapFactory.Options();
+        options.inJustDecodeBounds = true;
+        try
+        {
+                BitmapFactory.decodeStream(url.openConnection().getInputStream(),null, options);
+                
+                // Calculate inSampleSize
+                options.inSampleSize = calculateInSampleSize(options, reqWidth, reqHeight);
+        
+                // Decode bitmap with inSampleSize set
+                options.inJustDecodeBounds = false;
+                return BitmapFactory.decodeStream(url.openConnection().getInputStream(), null, options);
+        }
+        catch (IOException e) {
+                Log.e("Error", "Could not load Bitmap from: " + url.toString());
+            }
+        return null;
+    }
         
         public static Bitmap decodeSampledBitmapFromResource(Resources res, int resId,

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);

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

@@ -1 +1 @@
 package gov.nasa.jpl.issm;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
 import java.nio.DoubleBuffer;
 import android.content.Context;
@@ -117 +121 @@
                 }
                                 
+                File file1 = new File(ISSMAPP.extStorageDirectory + "/ISSM/input_files/coordinate.txt");
+                File file2 = new File(ISSMAPP.extStorageDirectory + "/ISSM/input_files/color.txt");
+                try {
+                        file1.createNewFile();
+                        file2.createNewFile();
+                        FileOutputStream fout1 = new FileOutputStream(file1);
+                        OutputStreamWriter write1 = new OutputStreamWriter(fout1);
+                        FileOutputStream fout2 = new FileOutputStream(file2);
+                        OutputStreamWriter write2 = new OutputStreamWriter(fout2);
+                        for(int i = 0; i < size; i ++)
+                        {
+                                write1.append(f[i][0]+","+f[i][1]+","+f[i][2]+","+f[i][7]+","+f[i][8]+","+f[i][9]+","+f[i][14]+","+f[i][15]+","+f[i][16]+"\n");
+                                write2.append(f[i][3]+","+f[i][4]+","+f[i][5]+","+f[i][10]+","+f[i][11]+","+f[i][12]+","+f[i][17]+","+f[i][18]+","+f[i][19]+"\n");
+                        }
+                        write1.close();
+                        write2.close();
+                } catch (IOException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                }
+                
         mRend = new MyGLRenderer(f);
         // Set the Renderer for drawing on the GLSurfaceView