Index: /issm/trunk-jpl/src/android/ISSM/AndroidManifest.xml =================================================================== --- /issm/trunk-jpl/src/android/ISSM/AndroidManifest.xml (revision 14209) +++ /issm/trunk-jpl/src/android/ISSM/AndroidManifest.xml (revision 14210) @@ -12,5 +12,5 @@ android:label="@string/app_name" android:theme="@style/AppTheme" > - @@ -20,4 +20,8 @@ + + Index: /issm/trunk-jpl/src/android/ISSM/bin/AndroidManifest.xml =================================================================== --- /issm/trunk-jpl/src/android/ISSM/bin/AndroidManifest.xml (revision 14209) +++ /issm/trunk-jpl/src/android/ISSM/bin/AndroidManifest.xml (revision 14210) @@ -12,5 +12,5 @@ android:label="@string/app_name" android:theme="@style/AppTheme" > - @@ -20,4 +20,8 @@ + + Index: /issm/trunk-jpl/src/android/ISSM/res/anim/alpha.xml =================================================================== --- /issm/trunk-jpl/src/android/ISSM/res/anim/alpha.xml (revision 14210) +++ /issm/trunk-jpl/src/android/ISSM/res/anim/alpha.xml (revision 14210) @@ -0,0 +1,6 @@ + + Index: /issm/trunk-jpl/src/android/ISSM/res/anim/translate.xml =================================================================== --- /issm/trunk-jpl/src/android/ISSM/res/anim/translate.xml (revision 14210) +++ /issm/trunk-jpl/src/android/ISSM/res/anim/translate.xml (revision 14210) @@ -0,0 +1,14 @@ + + + + + + Index: sm/trunk-jpl/src/android/ISSM/res/layout/activity_issm.xml =================================================================== --- /issm/trunk-jpl/src/android/ISSM/res/layout/activity_issm.xml (revision 14209) +++ (revision ) @@ -1,46 +1,0 @@ - - - - - - - - - - + Index: /issm/trunk-jpl/src/android/ISSM/res/layout/splashscreen.xml =================================================================== --- /issm/trunk-jpl/src/android/ISSM/res/layout/splashscreen.xml (revision 14210) +++ /issm/trunk-jpl/src/android/ISSM/res/layout/splashscreen.xml (revision 14210) @@ -0,0 +1,16 @@ + + + + + Index: /issm/trunk-jpl/src/android/ISSM/src/com/example/issm/ColorBar.java =================================================================== --- /issm/trunk-jpl/src/android/ISSM/src/com/example/issm/ColorBar.java (revision 14210) +++ /issm/trunk-jpl/src/android/ISSM/src/com/example/issm/ColorBar.java (revision 14210) @@ -0,0 +1,94 @@ +package com.example.issm; + +import android.content.Context; +import android.graphics.Canvas; +import android.graphics.Color; +import android.graphics.Paint; +import android.view.MotionEvent; +import android.view.View; +///////////////////////////////////////////////////////////// +public class ColorBar extends View +{ + Paint paint = new Paint(); + Paint textpaint = new Paint(); + //coordinate of the colorbar + private int width = 30; + private int start_x = 10; + private int start_y = 30; + private int end_y = 0; + boolean touch; + final int MAX_SCALING =255; + double [][] colorBuffer; + public ColorBar(Context context) + { + super(context); + setWillNotDraw(false); + paint.setStrokeWidth(5); + textpaint.setColor(Color.WHITE); + textpaint.setTextSize(20); + touch = false; + } +//---------------------------------------------------------------- + //change the color map + public void setColorMap(ColorMap colorMap) + { + this.colorBuffer = colorMap.getColorBuffer(); + } +//---------------------------------------------------------------- + @Override + public void onDraw(Canvas canvas) + { + int r,g,b; + int y = start_y; + for(int i = 0; i < 64; i++ ) + { + r = Math.round((float)colorBuffer[i][0]*MAX_SCALING); + g = Math.round((float)colorBuffer[i][1]*MAX_SCALING); + 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); + + 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; + } + + end_y = y; + } +//---------------------------------------------------------------- + //allow user to move color bar around + @Override + public boolean onTouchEvent (MotionEvent event) + { + + if (event.getAction() == MotionEvent.ACTION_DOWN) + { + int x = (int) event.getX(); + int y = (int) event.getY(); + if(x >= start_x && x <= start_x+width && y >= start_y && y <= end_y) + touch = true; + } + else if (event.getAction() == MotionEvent.ACTION_MOVE) + { + if(touch) + { + start_x = (int) event.getX(); + start_y = (int) event.getY(); + } + invalidate(); + + } + else if (event.getAction() == MotionEvent.ACTION_UP) + { + touch = false; + } + return true; + } +//---------------------------------------------------------------- +} +//////////////////////////////////////////////////////////////////////////// Index: /issm/trunk-jpl/src/android/ISSM/src/com/example/issm/ColorMap.java =================================================================== --- /issm/trunk-jpl/src/android/ISSM/src/com/example/issm/ColorMap.java (revision 14209) +++ /issm/trunk-jpl/src/android/ISSM/src/com/example/issm/ColorMap.java (revision 14210) @@ -12,4 +12,9 @@ } //------------------------------------------------------- + public double[][] getColorBuffer() + { + return d; + } +//-------------------------------------------------------- //set default color map => hsv {{{ public void setDefault() Index: /issm/trunk-jpl/src/android/ISSM/src/com/example/issm/ISSM.java =================================================================== --- /issm/trunk-jpl/src/android/ISSM/src/com/example/issm/ISSM.java (revision 14209) +++ /issm/trunk-jpl/src/android/ISSM/src/com/example/issm/ISSM.java (revision 14210) @@ -4,8 +4,9 @@ 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,17 +14,19 @@ 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,58 +36,69 @@ 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,12 +114,8 @@ 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,5 +124,6 @@ return true; } -//------------------------------------------------------------------------------------------------ +//------------------------------------------------------------------------------------------------ + //Option Menu that allow user to choose color. public boolean onOptionsItemSelected(MenuItem item) { @@ -124,60 +135,60 @@ 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,19 +196,151 @@ 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 + { + @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; + } +//------------------------------------------------------------------------------------------- } +///////////////////////////////////////////////////////////////////////////////////////////// Index: sm/trunk-jpl/src/android/ISSM/src/com/example/issm/MapSelection.java =================================================================== --- /issm/trunk-jpl/src/android/ISSM/src/com/example/issm/MapSelection.java (revision 14209) +++ (revision ) @@ -1,144 +1,0 @@ -package com.example.issm; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -import android.app.Activity; -import android.os.Bundle; -import android.os.Environment; -import android.text.TextUtils; -import android.util.Log; -import android.view.Menu; -import android.view.View; -import android.widget.Button; -import android.widget.ImageButton; -import android.widget.Toast; -import android.content.Intent; -import android.content.SharedPreferences; -import android.content.res.AssetManager; -/////////////////////////////////////////////////////////////////////////// -public class MapSelection extends Activity -{ - ISSM issm = new ISSM(); - private static final String PREFERENCE_FIRST_RUN = null; - private String extStorageDirectory; - private String issmFolder; -//------------------------------------------------------------------------ - public void onCreate(Bundle icicle) - { - super.onCreate(icicle); - setContentView(R.layout.activity_mapselection); - - SharedPreferences settings = this.getSharedPreferences("ISSM", 0); - boolean firstrun = settings.getBoolean(PREFERENCE_FIRST_RUN, true); - extStorageDirectory = Environment.getExternalStorageDirectory().toString(); - - issmFolder = extStorageDirectory + "/ISSM/input_files/"; - if (firstrun) - { // Checks to see if we've ran the application b4 - SharedPreferences.Editor e = settings.edit(); - e.putBoolean(PREFERENCE_FIRST_RUN, false); - - e.commit(); - // If not, run these methods: - SetDirectory(issmFolder); - } - - - //this button represents greenland and pass signal to issm - ImageButton gl = (ImageButton) findViewById(R.id.button1); - gl.setOnClickListener(new View.OnClickListener() - { - public void onClick(View v) - { - Intent i = new Intent(MapSelection.this, ISSM.class); - i.putExtra("map", "greenland"); - i.putExtra("pathToFile", issmFolder); - startActivity(i); - } - }); - - //this button represents artarctica and pass signal to issm - ImageButton art = (ImageButton) findViewById(R.id.button2); - art.setOnClickListener(new View.OnClickListener() - { - public void onClick(View v) - { - Intent i = new Intent(MapSelection.this, ISSM.class); - i.putExtra("map", "antarctica"); - i.putExtra("pathToFile", issmFolder); - startActivity(i); - } - }); - } -//------------------------------------------------------------------------ - private void SetDirectory(String directory) - { - if (android.os.Environment.getExternalStorageState().equals(android.os.Environment.MEDIA_MOUNTED)) - { - System.out.println(issmFolder); - File txtDirectory = new File(issmFolder); - - // Check and create directory in SDcard - if(!txtDirectory.exists()) - { - txtDirectory.mkdirs(); - System.out.println("making directory"); - } - CopyAssets(); // Then run the method to copy the file. - - } - else if (android.os.Environment.getExternalStorageState().equals(android.os.Environment.MEDIA_MOUNTED_READ_ONLY)) - { - Toast toast = Toast.makeText(this.getApplicationContext(), "Memory is not mounted to device", Toast.LENGTH_LONG); - toast.show(); - } - - } -//---------------------------------------------------------------------------- - /** - * -- Copy the file from the assets folder to the sdCard - * =========================================================== - **/ - private void CopyAssets() - { - AssetManager assetManager = getAssets(); - String[] files = null; - try { - files = assetManager.list("Map"); - } catch (IOException e) { - Log.e("tag", e.getMessage()); - } - for (int i = 0; i < files.length; i++) { - InputStream in = null; - OutputStream out = null; - try { - in = assetManager.open("Map/"+files[i]); - out = new FileOutputStream(issmFolder + files[i]); - copyFile(in, out); - in.close(); - in = null; - out.flush(); - out.close(); - out = null; - } catch (Exception e) { - Log.e("tag", e.getMessage()); - } - } - System.out.println("Done"); - } -//---------------------------------------------------------------------------- - private void copyFile(InputStream in, OutputStream out) throws IOException - { - byte[] buffer = new byte[1024]; - int read; - while ((read = in.read(buffer)) != -1) { - out.write(buffer, 0, read); - } - } -//---------------------------------------------------------------------------- -} -/////////////////////////////////////////////////////////////////////////// Index: /issm/trunk-jpl/src/android/ISSM/src/com/example/issm/MenuPage.java =================================================================== --- /issm/trunk-jpl/src/android/ISSM/src/com/example/issm/MenuPage.java (revision 14210) +++ /issm/trunk-jpl/src/android/ISSM/src/com/example/issm/MenuPage.java (revision 14210) @@ -0,0 +1,88 @@ +package com.example.issm; + +import android.app.Activity; +import android.net.Uri; +import android.os.Bundle; +import android.view.Gravity; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.Button; +import android.widget.ImageButton; +import android.widget.PopupWindow; +import android.content.Intent; +/////////////////////////////////////////////////////////////////////////// +public class MenuPage extends Activity +{ + ISSM issm = new ISSM(); + private String issmFolder; +//------------------------------------------------------------------------ + public void onCreate(Bundle icicle) + { + super.onCreate(icicle); + setContentView(R.layout.menupage); + Bundle map = getIntent().getExtras(); + { + if(map!= null) + { + issmFolder = map.getString("pathToFile"); + } + } + //start the core implementation of ISSM + ImageButton start = (ImageButton) findViewById(R.id.start); + start.setOnClickListener(new View.OnClickListener() + { + public void onClick(View v) + { + Intent i = new Intent(MenuPage.this, ISSM.class); + i.putExtra("pathToFile", issmFolder); + startActivity(i); + } + }); + // navigate to youtube video + ImageButton video = (ImageButton) findViewById(R.id.video); + video.setOnClickListener(new View.OnClickListener() + { + public void onClick(View v) + { + String url = "http://www.youtube.com/watch?v=KlDO0C8r_ws"; + Intent i = new Intent(Intent.ACTION_VIEW); + i.setData(Uri.parse(url)); + startActivity(i); + } + }); + // pop up a text box that contains information about ISSM + final ImageButton intro = (ImageButton) findViewById(R.id.intro); + intro.setOnClickListener(new View.OnClickListener() + { + public void onClick(View v) + { + LayoutInflater layoutInflater = (LayoutInflater)getBaseContext().getSystemService(LAYOUT_INFLATER_SERVICE); + View popupView = layoutInflater.inflate(R.layout.popuptext, null); + final PopupWindow popupWindow = new PopupWindow( popupView, 400,600, true); + popupWindow.showAtLocation(popupView, Gravity.CENTER, 0, 0); + Button dismiss = (Button)popupView.findViewById(R.id.dismiss); + dismiss.setOnClickListener(new Button.OnClickListener() + { + public void onClick(View v) + { + popupWindow.dismiss(); + } + }); + } + }); + //navigate to website + ImageButton visitus = (ImageButton) findViewById(R.id.visitus); + visitus.setOnClickListener(new View.OnClickListener() + { + public void onClick(View v) + { + String url = "http://issm.jpl.nasa.gov/"; + Intent i = new Intent(Intent.ACTION_VIEW); + i.setData(Uri.parse(url)); + startActivity(i); + } + }); + } +//------------------------------------------------------------------------------------- +} +///////////////////////////////////////////////////////////////////////////////////////// Index: /issm/trunk-jpl/src/android/ISSM/src/com/example/issm/MyGLRenderer.java =================================================================== --- /issm/trunk-jpl/src/android/ISSM/src/com/example/issm/MyGLRenderer.java (revision 14209) +++ /issm/trunk-jpl/src/android/ISSM/src/com/example/issm/MyGLRenderer.java (revision 14210) @@ -101,5 +101,5 @@ { // 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. Index: /issm/trunk-jpl/src/android/ISSM/src/com/example/issm/MyGLSurfaceView.java =================================================================== --- /issm/trunk-jpl/src/android/ISSM/src/com/example/issm/MyGLSurfaceView.java (revision 14209) +++ /issm/trunk-jpl/src/android/ISSM/src/com/example/issm/MyGLSurfaceView.java (revision 14210) @@ -2,4 +2,5 @@ import java.nio.DoubleBuffer; +import java.util.Random; import android.content.Context; @@ -107,4 +108,20 @@ f[i][15] = (f[i][15]-ymin)/(ymax-ymin)*YSCALE_FACTOR; } + + Random r = new Random(); + float z1,z2,z3; + for(int i = 0 ; i + { + @Override + protected Boolean doInBackground(Boolean... target) + { + StartAnimations(); + try { + Thread.sleep(3000); + } catch (InterruptedException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } + if(target[0] = false) + { + SharedPreferences.Editor e = settings.edit(); + e.putBoolean(PREFERENCE_FIRST_RUN, false); + + e.commit(); + // If not, run these methods: + SetDirectory(issmFolder); + } + return true; + } + protected void onPostExecute(Boolean result) + { + Intent i = new Intent(SplashScreen.this, MenuPage.class); + i.putExtra("pathToFile", issmFolder); + startActivity(i); + } + } +//------------------------------------------------------------------------------------------- + private void SetDirectory(String directory) + { + if (android.os.Environment.getExternalStorageState().equals(android.os.Environment.MEDIA_MOUNTED)) + { + System.out.println(issmFolder); + File txtDirectory = new File(issmFolder); + + // Check and create directory in SDcard + if(!txtDirectory.exists()) + { + txtDirectory.mkdirs(); + System.out.println("making directory"); + } + CopyAssets(); // Then run the method to copy the file. + + } + else if (android.os.Environment.getExternalStorageState().equals(android.os.Environment.MEDIA_MOUNTED_READ_ONLY)) + { + Toast toast = Toast.makeText(this.getApplicationContext(), "Memory is not mounted to device", Toast.LENGTH_LONG); + toast.show(); + } + + } +//---------------------------------------------------------------------------- + /** + * -- Copy the file from the assets folder to the sdCard + * =========================================================== + **/ + private void CopyAssets() + { + AssetManager assetManager = getAssets(); + String[] files = null; + try { + files = assetManager.list("Map"); + } catch (IOException e) { + Log.e("tag", e.getMessage()); + } + for (int i = 0; i < files.length; i++) { + InputStream in = null; + OutputStream out = null; + try { + in = assetManager.open("Map/"+files[i]); + out = new FileOutputStream(issmFolder + files[i]); + copyFile(in, out); + in.close(); + in = null; + out.flush(); + out.close(); + out = null; + } catch (Exception e) { + Log.e("tag", e.getMessage()); + } + } + System.out.println("Done"); + } +//---------------------------------------------------------------------------- + private void copyFile(InputStream in, OutputStream out) throws IOException + { + byte[] buffer = new byte[1024]; + int read; + while ((read = in.read(buffer)) != -1) { + out.write(buffer, 0, read); + } + } +//---------------------------------------------------------------------------- + private void StartAnimations() + { + Animation anim = AnimationUtils.loadAnimation(this, R.anim.alpha); + anim.reset(); + LinearLayout l=(LinearLayout) findViewById(R.id.lin_lay); + l.clearAnimation(); + l.startAnimation(anim); + + anim = AnimationUtils.loadAnimation(this, R.anim.translate); + anim.reset(); + ImageView iv = (ImageView) findViewById(R.id.logo); + iv.clearAnimation(); + iv.startAnimation(anim); + } +//------------------------------------------------------------------------------- +} +////////////////////////////////////////////////////////////////////////////////// Index: /issm/trunk-jpl/src/android/ISSM/src/com/example/issm/VerticalSeekBar.java =================================================================== --- /issm/trunk-jpl/src/android/ISSM/src/com/example/issm/VerticalSeekBar.java (revision 14210) +++ /issm/trunk-jpl/src/android/ISSM/src/com/example/issm/VerticalSeekBar.java (revision 14210) @@ -0,0 +1,61 @@ +package com.example.issm; + +import android.content.Context; +import android.graphics.Canvas; +import android.util.AttributeSet; +import android.view.MotionEvent; +import android.widget.SeekBar; + +public class VerticalSeekBar extends SeekBar { + + private final int MAX_SIZE = 500; + public VerticalSeekBar(Context context) { + super(context); + } + + public VerticalSeekBar(Context context, AttributeSet attrs, int defStyle) { + super(context, attrs, defStyle); + } + + public VerticalSeekBar(Context context, AttributeSet attrs) { + super(context, attrs); + } + + protected void onSizeChanged(int w, int h, int oldw, int oldh) { + super.onSizeChanged(h, w, oldh, oldw); + } + + @Override + protected synchronized void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + super.onMeasure(heightMeasureSpec, widthMeasureSpec); + setMeasuredDimension(getMeasuredHeight(), getMeasuredWidth()); + } + + protected void onDraw(Canvas c) { + c.rotate(90); + c.translate(0, -getWidth()); + + super.onDraw(c); + } + + @Override + public boolean onTouchEvent(MotionEvent event) { + if (!isEnabled()) { + return false; + } + int i = 0; + switch (event.getAction()) { + case MotionEvent.ACTION_DOWN: + case MotionEvent.ACTION_MOVE: + case MotionEvent.ACTION_UP: + i = getMax() - (int) (getMax() * event.getY() / getHeight()); + setProgress(MAX_SIZE-i); + onSizeChanged(getWidth(), getHeight(), 0, 0); + break; + + case MotionEvent.ACTION_CANCEL: + break; + } + return true; + } +}