Skip to content
Snippets Groups Projects
Commit 119e2d64 authored by Maxime Graulich's avatar Maxime Graulich
Browse files

Fixes and removal of useless stuff

parent fe4d3e67
Branches
Tags
No related merge requests found
<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" >
......
contrib/mobile/Android/res/drawable-mdpi/model.png

1.09 KiB

contrib/mobile/Android/res/drawable-mdpi/param.png

3.29 KiB

......@@ -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;
......
......@@ -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)
......
......@@ -49,7 +49,7 @@
#include "drawGModel.h"
drawGModel::drawGModel(std::string name="None")
drawGModel::drawGModel()
{
new GModel();
GmshInitialize();
......
......@@ -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);
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment