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
996669d5
Commit
996669d5
authored
Aug 26, 2014
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add warning when clean remove markers
parent
9f90b980
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
35 additions
and
0 deletions
+35
-0
include/Container/attributeContainer.h
include/Container/attributeContainer.h
+5
-0
include/Topology/generic/cellmarker.h
include/Topology/generic/cellmarker.h
+4
-0
include/Topology/generic/dartmarker.h
include/Topology/generic/dartmarker.h
+4
-0
src/Container/attributeContainer.cpp
src/Container/attributeContainer.cpp
+15
-0
src/Topology/generic/genericmap.cpp
src/Topology/generic/genericmap.cpp
+7
-0
No files found.
include/Container/attributeContainer.h
View file @
996669d5
...
...
@@ -223,6 +223,11 @@ public:
*/
inline
bool
used
(
unsigned
int
index
)
const
;
/**
* @brief check if container contain marker attribute
*/
bool
hasMarkerAttribute
()
const
;
/**************************************
* CONTAINER TRAVERSAL *
**************************************/
...
...
include/Topology/generic/cellmarker.h
View file @
996669d5
...
...
@@ -103,6 +103,10 @@ public:
m_map
.
template
releaseMarkVector
<
CELL
>
(
m_markVector
,
m_thread
);
}
/**
* @brief update: realloc the marker in map
* @warning call only after map cleaning
*/
void
update
()
{
if
(
!
m_map
.
template
isOrbitEmbedded
<
CELL
>
())
...
...
include/Topology/generic/dartmarker.h
View file @
996669d5
...
...
@@ -96,6 +96,10 @@ public:
}
/**
* @brief update: realloc the marker in map
* @warning call only after map cleaning
*/
inline
void
update
()
{
m_markVector
=
m_map
.
template
askMarkVector
<
DART
>
(
m_thread
);
...
...
src/Container/attributeContainer.cpp
View file @
996669d5
...
...
@@ -211,6 +211,21 @@ void AttributeContainer::clear(bool removeAttrib)
}
}
bool
AttributeContainer
::
hasMarkerAttribute
()
const
{
for
(
auto
it
=
m_tableAttribs
.
begin
();
it
!=
m_tableAttribs
.
end
();
++
it
)
{
if
((
*
it
)
!=
NULL
)
{
std
::
string
strMarker
=
(
*
it
)
->
getName
().
substr
(
0
,
6
);
if
(
strMarker
==
"marker"
)
return
true
;
}
}
return
false
;
}
void
AttributeContainer
::
compact
(
std
::
vector
<
unsigned
int
>&
mapOldNew
)
{
mapOldNew
.
clear
();
...
...
src/Topology/generic/genericmap.cpp
View file @
996669d5
...
...
@@ -231,7 +231,14 @@ void GenericMap::init(bool addBoundaryMarkers)
void
GenericMap
::
clear
(
bool
removeAttrib
)
{
if
(
removeAttrib
)
{
#ifndef NDEBUG
for
(
unsigned
int
i
=
0
;
i
<
NB_ORBITS
;
++
i
)
if
(
m_attribs
[
i
].
hasMarkerAttribute
())
CGoGNout
<<
"Warning removing marker attribute on orbit, need update ? "
<<
orbitName
(
i
)
<<
CGoGNendl
;
#endif
init
();
}
else
{
for
(
unsigned
int
i
=
0
;
i
<
NB_ORBITS
;
++
i
)
...
...
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