Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gmsh
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Larry Price
gmsh
Commits
86e90e3d
Commit
86e90e3d
authored
10 years ago
by
Christophe Geuzaine
Browse files
Options
Downloads
Patches
Plain Diff
small fixes
parent
faa3a63c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
contrib/mobile/Android/AndroidManifest.xml
+4
-3
4 additions, 3 deletions
contrib/mobile/Android/AndroidManifest.xml
contrib/mobile/drawContext.cpp
+22
-2
22 additions, 2 deletions
contrib/mobile/drawContext.cpp
with
26 additions
and
5 deletions
contrib/mobile/Android/AndroidManifest.xml
+
4
−
3
View file @
86e90e3d
<manifest
xmlns:android=
"http://schemas.android.com/apk/res/android"
package=
"org.geuz.onelab"
android:versionCode=
"
7
"
android:versionName=
"1.0.
8
"
android:versionCode=
"
8
"
android:versionName=
"1.0.
9
"
android:installLocation=
"auto"
>
<uses-sdk
android:minSdkVersion=
"14"
...
...
@@ -16,7 +16,8 @@
android:logo=
"@drawable/ic_launcher"
android:allowBackup=
"true"
>
<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>
<action
android:name=
"android.intent.action.MAIN"
/>
<category
android:name=
"android.intent.category.LAUNCHER"
/>
...
...
This diff is collapsed.
Click to expand it.
contrib/mobile/drawContext.cpp
+
22
−
2
View file @
86e90e3d
...
...
@@ -46,8 +46,8 @@ drawContext::drawContext(float fontFactor, bool retina)
static
void
checkGlError
(
const
char
*
op
)
{
for
(
GLint
error
=
glGetError
();
error
;
error
=
glGetError
())
Msg
::
Error
(
"%s: glError (0x%x)"
,
op
,
error
);
//
for (GLint error = glGetError(); error; error = glGetError())
//
Msg::Error("%s: glError (0x%x)",op,error);
}
void
drawContext
::
load
(
std
::
string
filename
)
...
...
@@ -623,6 +623,25 @@ void drawContext::drawText2d()
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
()
{
OrthofFromGModel
();
...
...
@@ -755,6 +774,7 @@ void drawContext::drawView()
drawScale
();
checkGlError
(
"Draw scales"
);
drawAxes
();
checkGlError
(
"Draw axes"
);
drawText2d
();
checkGlError
(
"Draw text2d"
);
drawGraph2d
();
checkGlError
(
"Draw graph2d"
);
}
std
::
vector
<
std
::
string
>
commandToVector
(
const
std
::
string
cmd
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment