From 119e2d64edcb9a6896d72f021279de1d62e59c47 Mon Sep 17 00:00:00 2001
From: Maxime Graulich <maxime.graulich@gmail.com>
Date: Thu, 16 May 2013 11:15:41 +0000
Subject: [PATCH] Fixes and removal of useless stuff
---
contrib/mobile/Android/AndroidManifest.xml | 19 +++++++++++-------
.../Android/res/drawable-mdpi/model.png | Bin 1116 -> 0 bytes
.../Android/res/drawable-mdpi/param.png | Bin 3371 -> 0 bytes
.../src/org/geuz/onelab/MainActivity.java | 2 +-
contrib/mobile/androidGModel.cpp | 2 +-
contrib/mobile/drawGModel.cpp | 4 ++--
contrib/mobile/drawGModel.h | 2 --
contrib/mobile/utils/onelab_android.sh | 2 +-
8 files changed, 17 insertions(+), 14 deletions(-)
delete mode 100644 contrib/mobile/Android/res/drawable-mdpi/model.png
delete mode 100644 contrib/mobile/Android/res/drawable-mdpi/param.png
diff --git a/contrib/mobile/Android/AndroidManifest.xml b/contrib/mobile/Android/AndroidManifest.xml
index 1c288d7224..022614d098 100644
--- a/contrib/mobile/Android/AndroidManifest.xml
+++ b/contrib/mobile/Android/AndroidManifest.xml
@@ -1,7 +1,9 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.geuz.onelab"
android:versionCode="1"
- android:versionName="1.0" >
+ android:versionName="1.0"
+ android:installLocation="preferExternal"
+ >
<uses-feature android:glEsVersion="0x00010000" android:required="true"></uses-feature>
<uses-sdk
@@ -12,7 +14,10 @@
<application
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
- android:theme="@style/AppTheme" android:logo="@drawable/ic_launcher">
+ android:theme="@style/AppTheme"
+ android:logo="@drawable/ic_launcher"
+ android:allowBackup="true"
+ >
<activity
android:name=".MainActivity"
android:label="@string/title_activity_main" >
@@ -21,11 +26,11 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<intent-filter>
- <action android:name="android.intent.action.VIEW" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:scheme="file" android:host="*" android:pathPattern=".*\\.msh" android:mimeType="*/*" />
- <data android:scheme="file" android:host="*" android:pathPattern=".*\\.geo" android:mimeType="*/*" />
- <data android:scheme="file" android:host="*" android:pathPattern=".*\\.pro" android:mimeType="*/*" />
+ <action android:name="android.intent.action.VIEW" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <data android:scheme="file" android:host="*" android:pathPattern=".*\\.msh" android:mimeType="*/*" />
+ <data android:scheme="file" android:host="*" android:pathPattern=".*\\.geo" android:mimeType="*/*" />
+ <data android:scheme="file" android:host="*" android:pathPattern=".*\\.pro" android:mimeType="*/*" />
</intent-filter>
</activity>
</application>
diff --git a/contrib/mobile/Android/res/drawable-mdpi/model.png b/contrib/mobile/Android/res/drawable-mdpi/model.png
deleted file mode 100644
index 3a71677c81cae0c5bad62b5baa29b1c6001982e9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1116
zcmeAS@N?(olHy`uVBq!ia0y~yU<d$V4mJh`hCabhYZ(|A*pj^6T^Rm@;DWu&Co?cG
za29w(7Beu2ECpf4A62<33=9nHC7!;n>~}Z?Mdej5=*_ofU|@df>EaktaqI1^v-#4l
z5^Nuy&%9Y<k=r%dNk~JJl|{?d$;(G$@0Tmi-A7oTFrQ*PDgQfP;U7=V^G6;WCxyZt
z9yLv<Vo2iN%B0G^>R48kl4;)^vzs*)aePaHZsr{|>z#X}w*L6WJ<0Y}-|tFRGc27F
z<fVyBSY4_Ju{-hRP0s%Z4<1NgyA|%5GABjofT7^a`@iShR@u(L!f?$cW$KeG0hX^t
zJ8RzW<TaRndah!n+<|D7w{`0jm9&*MxqOP+7!gyg$8;ve=<&5%r&Z3&TrqWZ@zC2A
zwRUxJaq(Bb8vgeNhfY8LEI(-v%K^Cz(+MmE*P^P$4otTdPq3PsW;F9p$CKawD;CHy
zlroqzT$x+Uzis<=bD>U`4Lf&c3U?lHSbfzhv8S^0i8jMMmV!?P(E;wvK5CPvFFqtZ
zF?Z7boZQ@4-RY-i`&aB{-oX68u0fPx|NE~O3?~_@+-JUUe>4BY7(Mgco}U&<d!kkL
zYl?7vpTBYWx9IHi%sV_TX^U{l?rhCfSNm97-|{5=;ZK*8iBGP#Iw@9Mv&`BWwK{68
zp1;3;JhMU6+OYNCeORA;{%LZuc;Sb4Y>pqU{`vFA&s=}WUcQj~5)B0vd<VAQm6Kzb
zQRc6p6zG4)zWeASFa4aSx1<uR=BhQ6D?9z&8vgB2E^k3a#Sf8_3j->8gI1OVGxro1
zCi}Vb=zqVo-Y}PU!V{M($KsiL@=X?L<!3j1)Gn~F*|vN4?uCrU;t%oIZChBX_hKo-
zUbFCo_#+?oF@351-@UxnU;W!*wpSka5B29>wK*?+h2in-t{08Aq6xd}eKMFN_`V)h
zWGLs~HUI5$_cCYJb*^ie)xU`Kz4tqELzCBF-_wqzXP2-^T>kazm#!e^e@~NHXVd(%
z8w^9VL=`J-7xACVXfU*VUe_&Q_x$(27B&gzl_6206YZU9FEISL^1ardxo5ljKf(Y1
zH2<v-cYQLs#OiHk!~gvpc^xPC1rP3<?4xFX{%O(iU8WAVS9Y$t`s!_nmZ?Y_`y?Ai
zg{fXke=S?K?A?{Dt#_C2%u|~zIe+HNolFTje{LN*bjbhizNx?a-4=iRd*Va~>jbV=
z3x)@a44*Z<|9x7i=&)tD_(b-3&vSKjby+7*o_z1X0f+s??{;kcrqVE-agT4&8w2eR
z0q59%?W=cm(R*v_!#Ahn5ATEBNgFFRt247S)Y#ecJ>WWdozGy0+R6FSy~muE22Gr|
z_JDip=9|}h4doN&yVtlbVNJMb8J=r4yS`LwhqCYkXMX;f(#dL`ecdOx8Tux_5f)@#
zu(kZeAGwCMjx|=#U!6@W-WjyA<gcVOaxM$<+IrP~&()OEhUN9=85kHCJYD@<);T3K
F0RSep{C@xd
diff --git a/contrib/mobile/Android/res/drawable-mdpi/param.png b/contrib/mobile/Android/res/drawable-mdpi/param.png
deleted file mode 100644
index 0103c21fe2a6bbcd3e59fa6f3ca9503cfc367e60..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3371
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
diff --git a/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java b/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java
index e05a47571c..06ecba2e50 100644
--- a/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java
+++ b/contrib/mobile/Android/src/org/geuz/onelab/MainActivity.java
@@ -363,7 +363,7 @@ public class MainActivity extends Activity {
StringBuilder tmp = new StringBuilder(androidName);
tmp.setCharAt(androidName.lastIndexOf('_'), '.');
String nativeName = tmp.toString();
- String nativeExtension = nativeName.substring(nativeName.lastIndexOf('.'));
+ //String nativeExtension = nativeName.substring(nativeName.lastIndexOf('.'));
/*if(new File(getFilesDir().toString()+"/"+nativeName).exists()){
//TODO check if the files are the same
continue;
diff --git a/contrib/mobile/androidGModel.cpp b/contrib/mobile/androidGModel.cpp
index 41f84f6ec5..9d6e0b499f 100644
--- a/contrib/mobile/androidGModel.cpp
+++ b/contrib/mobile/androidGModel.cpp
@@ -109,7 +109,7 @@ JNIEXPORT jlong JNICALL Java_org_geuz_onelab_Gmsh_init
Msg::SetCallback(new MobileMessage());
const char* name = env->GetStringUTFChars(jname, NULL);
- return reinterpret_cast<jlong>(new drawGModel(name));
+ return reinterpret_cast<jlong>(new drawGModel());
}
JNIEXPORT void JNICALL Java_org_geuz_onelab_Gmsh_loadFile
(JNIEnv *env, jobject obj, jlong jptr, jstring jname)
diff --git a/contrib/mobile/drawGModel.cpp b/contrib/mobile/drawGModel.cpp
index b3a65a843f..db17c91566 100644
--- a/contrib/mobile/drawGModel.cpp
+++ b/contrib/mobile/drawGModel.cpp
@@ -49,7 +49,7 @@
#include "drawGModel.h"
-drawGModel::drawGModel(std::string name="None")
+drawGModel::drawGModel()
{
new GModel();
GmshInitialize();
@@ -648,4 +648,4 @@ int onelab_cb(std::string action)
return redraw;
}
-// vim:set ts=2:
\ No newline at end of file
+// vim:set ts=2:
diff --git a/contrib/mobile/drawGModel.h b/contrib/mobile/drawGModel.h
index ce71ef43c9..0421e4ef89 100644
--- a/contrib/mobile/drawGModel.h
+++ b/contrib/mobile/drawGModel.h
@@ -17,7 +17,6 @@ private:
float _scale[3];
int width, height;
double left, right, top, bottom;
- float ratio;
float _rotate[3];
bool _gradiant, // show the background gradiant
_showGeom, // show the Geometry
@@ -30,7 +29,6 @@ private:
public:
drawGModel();
- drawGModel(std::string name);
~drawGModel(){}
void load(std::string filename);
void setTranslation(float tx, float ty, float tz=0);
diff --git a/contrib/mobile/utils/onelab_android.sh b/contrib/mobile/utils/onelab_android.sh
index 465b428e7d..bcf05ce710 100644
--- a/contrib/mobile/utils/onelab_android.sh
+++ b/contrib/mobile/utils/onelab_android.sh
@@ -29,7 +29,7 @@ if [ ! -d "gmsh.android" ]; then mkdir gmsh.android; fi
if [ ! -d "getdp.android" ]; then mkdir getdp.android; fi
if [ ! -d "onelab.android" ]; then mkdir onelab.android; fi
if [ ! -f "petsc.android/libpetsc.so" ] || [ ! -f "petsc.android/libf2clapack.so" ] || [ ! -f "petsc.android/libf2cblas.so" ]; then
- echo "ERROR: petsc.android/lib do not exist or is incomplete (need blas, lapack and petsc)"
+ echo "ERROR: petsc.android do not exist or is incomplete (need blas, lapack and petsc)"
exit 1
fi
--
GitLab