Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CGoGN
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Etienne Schmitt
CGoGN
Commits
279b47b7
Commit
279b47b7
authored
Feb 19, 2014
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug GMap + bug traversor2EEaF
parent
db712eaf
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
43 additions
and
19 deletions
+43
-19
Apps/SandBox/CMakeLists.txt
Apps/SandBox/CMakeLists.txt
+6
-0
CMakeLists.txt
CMakeLists.txt
+8
-1
include/Topology/generic/traversor2.hpp
include/Topology/generic/traversor2.hpp
+17
-7
src/Topology/gmap/embeddedGMap2.cpp
src/Topology/gmap/embeddedGMap2.cpp
+12
-11
No files found.
Apps/SandBox/CMakeLists.txt
View file @
279b47b7
...
...
@@ -30,6 +30,12 @@ QT4_WRAP_CPP(tilings_moc tilings.h)
add_executable
(
tilings tilings.cpp
${
tilings_moc
}
)
target_link_libraries
(
tilings
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
QT4_WRAP_UI
(
test_traversor2_ui test_traversor2.ui
)
QT4_WRAP_CPP
(
test_traversor2_moc test_traversor2.h
)
add_executable
(
test_traversor2 test_traversor2.cpp
${
test_traversor2_ui
}
${
test_traversor2_moc
}
)
target_link_libraries
(
test_traversor2
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
# Example with Qt
#
#QT4_WRAP_CPP(tuto1_moc tuto1.h)
...
...
CMakeLists.txt
View file @
279b47b7
...
...
@@ -151,8 +151,15 @@ IF(WIN32)
# set(CMAKE_CONFIGURATION_TYPES "Release Debug" CACHE STRING "Only Release or Debug" FORCE)
ELSE
(
WIN32
)
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wall -Wextra -fPIC"
)
# SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wclobbered -Wempty-body -Wignored-qualifiers -Wmissing-field-initializers -Wsign-compare -Wtype-limits -Wuninitialized -fPIC")
SET
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-Wall -Woverride-init -fPIC"
)
# remove the 60000+ "no unused local typedefs" warnings with GCC4.8+
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
)
add_subdirectory
(
Release
)
add_subdirectory
(
Debug
)
add_subdirectory
(
${
CGoGN_ROOT_DIR
}
/Apps Apps
)
...
...
include/Topology/generic/traversor2.hpp
View file @
279b47b7
...
...
@@ -414,7 +414,8 @@ Dart Traversor2EEaV<MAP>::next()
// Traversor2EEaF
template
<
typename
MAP
>
Traversor2EEaF
<
MAP
>::
Traversor2EEaF
(
const
MAP
&
map
,
Dart
dart
)
:
m
(
map
),
m_QLT
(
NULL
)
Traversor2EEaF
<
MAP
>::
Traversor2EEaF
(
const
MAP
&
map
,
Dart
dart
)
:
m
(
map
),
m_QLT
(
NULL
)
{
const
AttributeMultiVector
<
NoTypeNameAttribute
<
std
::
vector
<
Dart
>
>
>*
quickTraversal
=
map
.
template
getQuickAdjacentTraversal
<
EDGE
,
FACE
>
()
;
if
(
quickTraversal
!=
NULL
)
...
...
@@ -423,9 +424,12 @@ Traversor2EEaF<MAP>::Traversor2EEaF(const MAP& map, Dart dart) : m(map),m_QLT(NU
}
else
{
start
=
m
.
phi1
(
dart
)
;
stop1
=
dart
;
stop2
=
m
.
phi2
(
dart
)
;
if
(
m
.
isBoundaryMarked2
(
dart
))
stop1
=
m
.
phi2
(
dart
);
else
stop1
=
dart
;
stop2
=
m
.
phi2
(
stop1
)
;
start
=
m
.
phi1
(
stop1
);
}
}
...
...
@@ -458,10 +462,16 @@ Dart Traversor2EEaF<MAP>::next()
if
(
current
!=
NIL
)
{
current
=
m
.
phi1
(
current
)
;
if
(
current
==
stop1
)
current
=
m
.
phi1
(
stop2
)
;
else
if
(
current
==
stop2
)
if
(
current
==
stop1
)
{
if
(
!
m
.
isBoundaryMarked2
(
stop2
))
current
=
m
.
phi1
(
stop2
)
;
else
current
=
NIL
;
}
else
if
(
current
==
stop2
)
current
=
NIL
;
}
return
current
;
}
...
...
src/Topology/gmap/embeddedGMap2.cpp
View file @
279b47b7
...
...
@@ -57,19 +57,20 @@ Dart EmbeddedGMap2::newFace(unsigned int nbEdges, bool withBoundary)
initOrbitEmbeddingNewCell
<
FACE
>
(
phi2
(
d
))
;
}
}
else
{
if
(
isOrbitEmbedded
<
VERTEX
>
())
{
Traversor2FV
<
EmbeddedGMap2
>
t
(
*
this
,
d
);
for
(
Dart
it
=
t
.
begin
();
it
!=
t
.
end
();
it
=
t
.
next
())
initOrbitEmbeddingNewCell
<
VERTEX
>
(
it
)
;
}
if
(
isOrbitEmbedded
<
FACE
>
())
initOrbitEmbeddingNewCell
<
FACE
>
(
d
)
;
// else
// {
// if (isOrbitEmbedded<VERTEX>())
// {
// Traversor2FV<EmbeddedGMap2> t(*this, d);
// for(Dart it = t.begin(); it != t.end(); it = t.next())
// initOrbitEmbeddingNewCell<VERTEX>(it) ;
// }
}
// if(isOrbitEmbedded<FACE>())
// initOrbitEmbeddingNewCell<FACE>(d) ;
// }
return
d
;
}
...
...
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