Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
vite
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
5
Issues
5
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
solverstack
vite
Commits
4dd07482
Commit
4dd07482
authored
Jun 02, 2014
by
Mathieu Faverge
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add branch for Thibault
parent
fb3f8597
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
252 additions
and
251 deletions
+252
-251
CMakeLists.txt
CMakeLists.txt
+20
-11
src/interface/Interval_select.cpp
src/interface/Interval_select.cpp
+232
-235
src/render/Render_opengl.cpp
src/render/Render_opengl.cpp
+0
-5
No files found.
CMakeLists.txt
View file @
4dd07482
...
...
@@ -32,24 +32,33 @@ include (CMakeDependentOption)
### Required Packages
# Try to find Qt5 : http://forum.openscenegraph.org/viewtopic.php?t=11431
set
(
USE_QT5 OFF
)
# QUIET option disables messages if the package cannot be found.
find_package
(
Qt5Widgets QUIET
)
if
(
Qt5Widgets_FOUND
)
# CMake 2.8.8 or greater required for qt5 use
if
(
"
${
CMAKE_VERSION
}
"
VERSION_GREATER 2.8.7
)
set
(
USE_QT5 ON
)
endif
()
endif
()
option
(
USE_QT5
"Use QT5 instead of QT4"
OFF
)
if
(
USE_QT5
)
# QUIET option disables messages if the package cannot be found.
find_package
(
Qt5Widgets QUIET
)
if
(
Qt5Widgets_FOUND
)
# CMake 2.8.8 or greater required for qt5 use
if
(
"
${
CMAKE_VERSION
}
"
VERSION_GREATER 2.8.7
)
set
(
USE_QT5 ON
)
endif
()
endif
()
if
(
USE_QT5
)
set
(
CMAKE_AUTOMOC ON
)
find_package
(
Qt5 COMPONENTS Core Xml Widgets OpenGL UiTools REQUIRED
)
find_package
(
Qt5Core REQUIRED
)
find_package
(
Qt5Xml REQUIRED
)
find_package
(
Qt5Widgets REQUIRED
)
find_package
(
Qt5OpenGL REQUIRED
)
# find_package(Qt5UiTools REQUIRED)
else
(
USE_QT5
)
# Try Qt4
find_package
(
Qt4 COMPONENTS QtCore QtGui QtXml REQUIRED
)
set
(
QT_USE_QTUITOOLS ON
)
set
(
QT_USE_QTOPENGL ON
)
include
(
${
QT_USE_FILE
}
)
endif
(
USE_QT5
)
#find_package(OpenGL)
...
...
src/interface/Interval_select.cpp
View file @
4dd07482
This diff is collapsed.
Click to expand it.
src/render/Render_opengl.cpp
View file @
4dd07482
...
...
@@ -363,20 +363,15 @@ void Render_opengl::paintGL(){
glFlush
();
/* Check the errors */
GLenum
glerror
;
glerror
=
glGetError
();
if
(
glerror
!=
GL_NO_ERROR
)
message
<<
tr
(
"Render area : the following OpengGL error occured: "
).
toStdString
()
<<
(
char
*
)
gluErrorString
(
glerror
)
<<
Message
::
endw
;
if
(
DRAWING_STATE_WAITING
==
_state
)
/* A wait is drawn, do not take car about the ruler drawing */
return
;
QFont
arial_font
=
QFont
(
"Arial"
,
10
);
qglColor
(
Qt
::
white
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment