Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Hurstel
CGoGN
Commits
df74bad6
Commit
df74bad6
authored
Nov 20, 2012
by
Pierre Kraemer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
correction bug creation de cellules lors du addEmbedding<ORBIT>
parent
44890c80
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
7 deletions
+11
-7
SCHNApps/CMakeLists.txt
SCHNApps/CMakeLists.txt
+2
-0
include/Topology/generic/genericmap.hpp
include/Topology/generic/genericmap.hpp
+9
-5
src/Topology/generic/genericmap.cpp
src/Topology/generic/genericmap.cpp
+0
-2
No files found.
SCHNApps/CMakeLists.txt
View file @
df74bad6
...
...
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 2.8)
project
(
SCHNApps
)
SET
(
QT_USE_QTOPENGL TRUE
)
SET
(
QT_USE_QTXML TRUE
)
SET
(
QT_USE_QTDESIGNER TRUE
)
SET
(
QT_USE_QTGUI TRUE
)
...
...
@@ -11,6 +12,7 @@ SET( QT_USE_QTPLUGIN TRUE )
SET
(
CGoGN_ROOT_DIR
${
CMAKE_SOURCE_DIR
}
/.. CACHE STRING
"CGoGN root dir"
)
INCLUDE
(
${
CGoGN_ROOT_DIR
}
/apps_cmake.txt
)
find_package
(
Qt4 REQUIRED
)
#=======QGLViewer=========#
find_package
(
QGLViewer REQUIRED
)
...
...
include/Topology/generic/genericmap.hpp
View file @
df74bad6
...
...
@@ -538,12 +538,16 @@ void GenericMap::addEmbedding()
m_embeddings
[
ORBIT
]
=
amv
;
FunctorInitEmb
<
GenericMap
,
ORBIT
>
fsetemb
(
*
this
);
TraversorCell
<
GenericMap
,
ORBIT
>
t
(
*
this
,
allDarts
,
true
)
;
for
(
Dart
d
=
t
.
begin
();
d
!=
t
.
end
();
d
=
t
.
next
())
DartMarker
dm
(
*
this
)
;
for
(
Dart
d
=
t
his
->
begin
();
d
!=
t
his
->
end
();
this
->
next
(
d
))
{
unsigned
int
em
=
newCell
<
ORBIT
>
();
fsetemb
.
changeEmb
(
em
);
foreach_dart_of_orbit
<
ORBIT
>
(
d
,
fsetemb
);
if
(
!
dm
.
isMarked
(
d
))
{
dm
.
markOrbit
<
ORBIT
>
(
d
);
unsigned
int
em
=
newCell
<
ORBIT
>
();
fsetemb
.
changeEmb
(
em
);
foreach_dart_of_orbit
<
ORBIT
>
(
d
,
fsetemb
);
}
}
}
...
...
src/Topology/generic/genericmap.cpp
View file @
df74bad6
...
...
@@ -40,8 +40,6 @@ GenericMap::GenericMap() : m_nbThreads(1)
{
if
(
m_attributes_registry_map
==
NULL
)
{
std
::
cout
<<
"INITIALIZE REGISTRY MAP"
<<
std
::
endl
;
m_attributes_registry_map
=
new
std
::
map
<
std
::
string
,
RegisteredBaseAttribute
*>
;
// register all known types
...
...
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