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
C
CGoGN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Hurstel
CGoGN
Commits
f1dab8f5
Commit
f1dab8f5
authored
Mar 17, 2014
by
Pierre Kraemer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
debug restore_shortcuts in GenericMap
parent
409564ae
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
5 deletions
+21
-5
SCHNApps/CMakeLists.txt
SCHNApps/CMakeLists.txt
+7
-0
SCHNApps/include/camera.h
SCHNApps/include/camera.h
+2
-1
SCHNApps/include/view.h
SCHNApps/include/view.h
+1
-0
src/Topology/generic/genericmap.cpp
src/Topology/generic/genericmap.cpp
+11
-4
No files found.
SCHNApps/CMakeLists.txt
View file @
f1dab8f5
...
...
@@ -103,6 +103,13 @@ IF(APPLE)
SET
(
CMAKE_OSX_ARCHITECTURES x86_64
)
ENDIF
(
APPLE
)
if
(
CMAKE_COMPILER_IS_GNUCXX
)
execute_process
(
COMMAND
${
CMAKE_C_COMPILER
}
-dumpversion OUTPUT_VARIABLE GCC_VERSION
)
if
(
GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8
)
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wno-unused-local-typedefs"
)
SET
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-Wno-unused-local-typedefs"
)
endif
(
GCC_VERSION VERSION_GREATER 4.8 OR GCC_VERSION VERSION_EQUAL 4.8
)
endif
(
CMAKE_COMPILER_IS_GNUCXX
)
...
...
SCHNApps/include/camera.h
View file @
f1dab8f5
...
...
@@ -2,7 +2,8 @@
#define _CAMERA_H_
#include "view.h"
#include "QGLViewer/camera.h"
#include <QGLViewer/camera.h>
#include <QGLViewer/manipulatedCameraFrame.h>
namespace
CGoGN
{
...
...
SCHNApps/include/view.h
View file @
f1dab8f5
...
...
@@ -3,6 +3,7 @@
#include <GL/glew.h>
#include <QGLViewer/qglviewer.h>
#include <QGLViewer/manipulatedFrame.h>
#include "schnapps.h"
#include "Utils/gl_matrices.h"
...
...
src/Topology/generic/genericmap.cpp
View file @
f1dab8f5
...
...
@@ -412,12 +412,19 @@ void GenericMap::restore_shortcuts()
}
// restore mark vectors in Dart & Cell Markers
for
(
std
::
vector
<
DartMarkerGen
*>::
iterator
it
=
dartMarkers
.
begin
();
it
!=
dartMarkers
.
end
();
++
it
)
(
*
it
)
->
updateMarkVector
(
m_markTables
[
DART
][(
*
it
)
->
getThread
()]);
for
(
unsigned
int
j
=
0
;
j
<
NB_THREAD
;
++
j
)
{
for
(
std
::
vector
<
DartMarkerGen
*>::
iterator
it
=
dartMarkers
[
j
].
begin
();
it
!=
dartMarkers
[
j
].
end
();
++
it
)
(
*
it
)
->
updateMarkVector
(
m_markTables
[
DART
][(
*
it
)
->
getThread
()]);
for
(
std
::
vector
<
CellMarkerGen
*>::
iterator
it
=
cellMarkers
.
begin
();
it
!=
cellMarkers
.
end
();
++
it
)
(
*
it
)
->
updateMarkVector
(
m_markTables
[(
*
it
)
->
getCell
()][(
*
it
)
->
getThread
()]);
for
(
std
::
vector
<
CellMarkerGen
*>::
iterator
it
=
cellMarkers
[
j
].
begin
();
it
!=
cellMarkers
[
j
].
end
();
++
it
)
(
*
it
)
->
updateMarkVector
(
m_markTables
[(
*
it
)
->
getCell
()][(
*
it
)
->
getThread
()]);
}
// set Attribute handlers invalid
for
(
std
::
multimap
<
AttributeMultiVectorGen
*
,
AttributeHandlerGen
*>::
iterator
it
=
attributeHandlers
.
begin
();
it
!=
attributeHandlers
.
end
();
++
it
)
(
*
it
).
second
->
setInvalid
()
;
attributeHandlers
.
clear
()
;
}
void
GenericMap
::
dumpAttributesAndMarkers
()
...
...
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