Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
David Cazier
CGoGN
Commits
f0b50352
Commit
f0b50352
authored
Feb 04, 2011
by
Pierre Kraemer
Browse files
correction ajout d'un nouveau plongement de cellule a l'instanciation
d'un CellMarker si la cellule n'est pas encore plongee
parent
f73c649f
Changes
4
Hide whitespace changes
Inline
Side-by-side
include/Topology/generic/attribmap.h
View file @
f0b50352
...
...
@@ -33,6 +33,10 @@ namespace CGoGN
class
AttribMap
:
public
GenericMap
{
friend
class
CellMarker
;
friend
class
CellMarkerStore
;
friend
class
CellMarkerNoUnmark
;
template
<
typename
T
>
friend
class
AutoAttributeHandler
;
public:
...
...
include/Topology/generic/cellmarker.h
View file @
f0b50352
...
...
@@ -26,7 +26,7 @@
#define __CELL_MARKER__
#include
"Topology/generic/marker.h"
#include
"Topology/generic/
gene
ri
c
map.h"
#include
"Topology/generic/
att
ri
b
map.h"
#define VERTEX_CELL VERTEX_ORBIT
#define EDGE_CELL EDGE_ORBIT
...
...
@@ -45,7 +45,7 @@ class CellMarker
{
protected:
Marker
m_marker
;
Gene
ri
c
Map
&
m_map
;
Att
ri
b
Map
&
m_map
;
public:
/**
...
...
@@ -54,8 +54,10 @@ public:
* @param cell the type of cell we want to mark VERTEX_CELL, EDGE_CELL,...
* \pre the cell is embedded in the map
*/
CellMarker
(
Gene
ri
c
Map
&
map
,
unsigned
int
cell
)
:
m_map
(
map
)
CellMarker
(
Att
ri
b
Map
&
map
,
unsigned
int
cell
)
:
m_map
(
map
)
{
if
(
!
map
.
isOrbitEmbedded
(
cell
))
map
.
addEmbedding
(
cell
)
;
m_marker
=
map
.
getNewMarker
(
cell
);
}
...
...
@@ -168,7 +170,7 @@ public:
* @param cell the type of cell we want to mark VERTEX_CELL, EDGE_CELL,...
* \pre the cell is embedded in the map
*/
CellMarkerStore
(
Gene
ri
c
Map
&
map
,
unsigned
int
cell
)
:
CellMarker
(
map
,
cell
)
CellMarkerStore
(
Att
ri
b
Map
&
map
,
unsigned
int
cell
)
:
CellMarker
(
map
,
cell
)
{}
protected:
...
...
@@ -217,7 +219,7 @@ public:
* @param cell the type of cell we want to mark VERTEX_CELL, EDGE_CELL,...
* \pre the cell is embedded in the map
*/
CellMarkerNoUnmark
(
Gene
ri
c
Map
&
map
,
unsigned
int
cell
)
:
CellMarker
(
map
,
cell
)
CellMarkerNoUnmark
(
Att
ri
b
Map
&
map
,
unsigned
int
cell
)
:
CellMarker
(
map
,
cell
)
{}
~
CellMarkerNoUnmark
()
...
...
include/Topology/generic/genericmap.h
View file @
f0b50352
...
...
@@ -75,10 +75,6 @@ class GenericMap : public MapBrowser
friend
class
DartMarkerStore
;
friend
class
DartMarkerNoUnmark
;
friend
class
CellMarker
;
friend
class
CellMarkerStore
;
friend
class
CellMarkerNoUnmark
;
template
<
typename
T
>
friend
class
AutoAttributeHandler
;
protected:
...
...
include/Topology/generic/genericmap.hpp
View file @
f0b50352
...
...
@@ -242,7 +242,6 @@ inline AttribMultiVectGen& GenericMap::getMultiVec(unsigned int idAttr)
inline
AttribContainer
&
GenericMap
::
getAttributeContainer
(
unsigned
int
orbit
)
{
// assert(isOrbitEmbedded(orbit) || !"Invalid parameter: orbit not embedded");
return
m_attribs
[
orbit
]
;
}
...
...
@@ -252,7 +251,7 @@ inline AttribContainer& GenericMap::getAttributeContainer(unsigned int orbit)
inline
Marker
GenericMap
::
getNewMarker
(
unsigned
int
cell
)
{
assert
(
isOrbitEmbedded
(
cell
)
||
!
"Try to get a marker on non embedded cell! "
)
;
//
assert(isOrbitEmbedded(cell) || !"Try to get a marker on non embedded cell! ") ;
return
m_orbMarker
[
cell
].
getNewMarker
(
cell
)
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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