Skip to content
Snippets Groups Projects
Commit 86e90e3d authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

small fixes

parent faa3a63c
Branches
Tags
No related merge requests found
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.geuz.onelab" package="org.geuz.onelab"
android:versionCode="7" android:versionCode="8"
android:versionName="1.0.8" android:versionName="1.0.9"
android:installLocation="auto" > android:installLocation="auto" >
<uses-sdk android:minSdkVersion="14" <uses-sdk android:minSdkVersion="14"
...@@ -16,7 +16,8 @@ ...@@ -16,7 +16,8 @@
android:logo="@drawable/ic_launcher" android:logo="@drawable/ic_launcher"
android:allowBackup="true" > android:allowBackup="true" >
<activity android:name=".SplashScreen" <activity android:name=".SplashScreen"
android:label="@string/title_activity_main"> android:label="@string/title_activity_main"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
......
...@@ -46,8 +46,8 @@ drawContext::drawContext(float fontFactor, bool retina) ...@@ -46,8 +46,8 @@ drawContext::drawContext(float fontFactor, bool retina)
static void checkGlError(const char* op) static void checkGlError(const char* op)
{ {
for (GLint error = glGetError(); error; error = glGetError()) //for (GLint error = glGetError(); error; error = glGetError())
Msg::Error("%s: glError (0x%x)",op,error); // Msg::Error("%s: glError (0x%x)",op,error);
} }
void drawContext::load(std::string filename) void drawContext::load(std::string filename)
...@@ -623,6 +623,25 @@ void drawContext::drawText2d() ...@@ -623,6 +623,25 @@ void drawContext::drawText2d()
glPopMatrix(); glPopMatrix();
} }
void drawGraph2d()
{
glPushMatrix();
glLoadIdentity();
std::vector<PView*> graphs;
for(unsigned int i = 0; i < PView::list.size(); i++){
PViewData *data = PView::list[i]->getData();
PViewOptions *opt = PView::list[i]->getOptions();
if(!data->getDirty() && opt->visible && opt->type != PViewOptions::Plot3D)
graphs.push_back(PView::list[i]);
}
if(graphs.empty()) return;
// FIXME: draw 2d graph(s)
glPopMatrix();
}
void drawContext::drawView() void drawContext::drawView()
{ {
OrthofFromGModel(); OrthofFromGModel();
...@@ -755,6 +774,7 @@ void drawContext::drawView() ...@@ -755,6 +774,7 @@ void drawContext::drawView()
drawScale(); checkGlError("Draw scales"); drawScale(); checkGlError("Draw scales");
drawAxes(); checkGlError("Draw axes"); drawAxes(); checkGlError("Draw axes");
drawText2d(); checkGlError("Draw text2d"); drawText2d(); checkGlError("Draw text2d");
drawGraph2d(); checkGlError("Draw graph2d");
} }
std::vector<std::string> commandToVector(const std::string cmd) std::vector<std::string> commandToVector(const std::string cmd)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment