Changeset 14109

Timestamp:

12/07/12 18:44:09 (12 years ago)

Author:

ltnguyen

Message:

working android prototype

Location:

issm/trunk-jpl/src/android/ISSM

Files:

• AndroidManifest.xml (modified) (1 diff)
• gen/com/example/issm/R.java (modified) (1 diff)
• jni/Main.cpp (modified) (3 diffs)
• project.properties (modified) (1 diff)
• res/layout/activity_issm.xml (modified) (2 diffs)
• src/com/example/issm/ISSM.java (modified) (7 diffs)
• src/com/example/issm/MyGLRenderer.java (added)
• src/com/example/issm/MyGLSurfaceView.java (added)

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

@@ -2 +2 @@
     package="com.example.issm"
     android:versionCode="1"
-    android:versionName="1.0" >
-
+    android:versionName="1.0"
+    android:installLocation="preferExternal" >
     <uses-sdk
         android:minSdkVersion="10"

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

@@ -21 +21 @@
     }
     public static final class id {
-        public static final int button1=0x7f080001;
-        public static final int button2=0x7f080003;
-        public static final int input=0x7f080000;
-        public static final int menu_settings=0x7f080004;
-        public static final int output=0x7f080002;
+        public static final int button1=0x7f080004;
+        public static final int button2=0x7f080005;
+        public static final int frame=0x7f080003;
+        public static final int menu_settings=0x7f080006;
+        public static final int relativeLay=0x7f080000;
+        public static final int seekBar=0x7f080001;
+        public static final int value=0x7f080002;
     }
     public static final class layout {

issm/trunk-jpl/src/android/ISSM/jni/Main.cpp

@@ -79 +79 @@
                 __android_log_print(ANDROID_LOG_INFO, "Native","Solving ");
 
-                /*fill out the first two slots, extract the same way in java using get(int position)*/
                 jdouble *dBuf = (jdouble *)env->GetDirectBufferAddress(buf);
 
@@ -139 +138 @@
                 }
 
-                /*for(i=0;i<148;i++){
+                for(i=0;i<148;i++){
                 __android_log_print(ANDROID_LOG_INFO, "Native","%g %g %g | %g %g %g | %g %g %g | %g %g %g\n",
                                 dBuf[12*i+0],dBuf[12*i+1],dBuf[12*i+2],
@@ -145 +144 @@
                                 dBuf[12*i+6],dBuf[12*i+7],dBuf[12*i+8],
                                 dBuf[12*i+9],dBuf[12*i+10],dBuf[12*i+11]);
-                }*/
+                }
 
                 /*delete temporary data:*/

issm/trunk-jpl/src/android/ISSM/project.properties

@@ -12 +12 @@
 
 # Project target.
-target=android-14
+target=android-15

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

@@ -1 +1 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/relativeLay"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent"
+    android:orientation="horizontal" >
 
-    <EditText
-        android:id="@+id/input"
+    <SeekBar
+        android:id="@+id/seekBar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_marginBottom="41dp" />
+
+    <TextView
+        android:id="@+id/value"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:ems="10"
-        android:inputType="number" />
+        android:layout_above="@+id/seekBar"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="15dp"
+        android:text="alpha value = 0" />
+
+    <FrameLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/frame"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/value"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="12dp" >
+    </FrameLayout>
 
     <Button
@@ -16 +38 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignRight="@+id/input"
-        android:layout_below="@+id/input"
-        android:layout_marginRight="46dp"
-        android:layout_marginTop="23dp"
-        android:text="calculate" />
-
-    <TextView
-        android:id="@+id/output"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_below="@+id/button1"
-        android:layout_marginTop="39dp"
-        android:textSize="20sp" />
+        android:layout_above="@+id/seekBar"
+        android:layout_alignParentRight="true"
+        android:text="Reset" />
 
 </RelativeLayout>

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

@@ -6 +6 @@
 import java.nio.ByteOrder;
 import java.nio.DoubleBuffer;
+import java.text.DecimalFormat;
 
+import android.opengl.GLSurfaceView;
 import android.os.Bundle;
 import android.app.Activity;
@@ -16 +18 @@
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.FrameLayout;
+import android.widget.SeekBar;
 import android.widget.TextView;
 
@@ -28 +32 @@
         private String issmFolder;
         private int size;
+    private GLSurfaceView mGLView;
+        private FrameLayout frame;
+        private SeekBar bar;
+    private TextView /*txtStatus,*/ txtValue;
+    
+
     @Override
   //------------------------------------------------------------------------------------------------    
@@ -41 +51 @@
         }
         setContentView(R.layout.activity_issm);
-        this.input  = (EditText) super.findViewById(R.id.input);
-        this.output  = (TextView) super.findViewById(R.id.output);
+        this.bar  = (SeekBar) findViewById(R.id.seekBar);
+        this.txtValue  = (TextView) super.findViewById(R.id.value);
         Button button = (Button) super.findViewById(R.id.button1);
         button.setOnClickListener(this);
@@ -51 +61 @@
         this.createModel();
         buff = ByteBuffer.allocateDirect(size*12*8).order(ByteOrder.nativeOrder()).asDoubleBuffer();
+        
+
     }
 //------------------------------------------------------------------------------------------------    
@@ -69 +81 @@
     {
         issmNative.solveISSMModel(5,buff);
-
-                //for(int i=0;i< size*12;i++)
-                        //System.out.println(buff.get(i));
-
     }
  //------------------------------------------------------------------------------------------------   
@@ -78 +86 @@
         {
                 //factorial method
-                String input = this.input.getText().toString();
+                /*String input = this.input.getText().toString();
                 if(TextUtils.isEmpty(input))
                 {
                         return;
-                }               
-                long resultfromFac = issmNative.fac(Long.parseLong(input));
+                }*/             
                 //example of how to fill buffer Native
                 this.fillBuffer();
                 
-                //print result from fac and the first two slot of filled buffer.
-                this.output.setText("Result = " + resultfromFac + "\n" 
-                                                                                + "First slot from buffer:\n" 
-                                                                                + buff.get(0) + " size " +  size);
-
+                mGLView = new MyGLSurfaceView(this, buff, size);
+            frame = (FrameLayout)findViewById(R.id.frame);
+            frame.addView(mGLView);
         }
 }