Commit df74bad6 authored by Pierre Kraemer's avatar Pierre Kraemer

correction bug creation de cellules lors du addEmbedding<ORBIT>

parent 44890c80
...@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 2.8) ...@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 2.8)
project(SCHNApps) project(SCHNApps)
SET( QT_USE_QTOPENGL TRUE )
SET( QT_USE_QTXML TRUE ) SET( QT_USE_QTXML TRUE )
SET( QT_USE_QTDESIGNER TRUE ) SET( QT_USE_QTDESIGNER TRUE )
SET( QT_USE_QTGUI TRUE ) SET( QT_USE_QTGUI TRUE )
...@@ -11,6 +12,7 @@ SET( QT_USE_QTPLUGIN TRUE ) ...@@ -11,6 +12,7 @@ SET( QT_USE_QTPLUGIN TRUE )
SET(CGoGN_ROOT_DIR ${CMAKE_SOURCE_DIR}/.. CACHE STRING "CGoGN root dir") SET(CGoGN_ROOT_DIR ${CMAKE_SOURCE_DIR}/.. CACHE STRING "CGoGN root dir")
INCLUDE(${CGoGN_ROOT_DIR}/apps_cmake.txt) INCLUDE(${CGoGN_ROOT_DIR}/apps_cmake.txt)
find_package(Qt4 REQUIRED)
#=======QGLViewer=========# #=======QGLViewer=========#
find_package(QGLViewer REQUIRED) find_package(QGLViewer REQUIRED)
......
...@@ -538,12 +538,16 @@ void GenericMap::addEmbedding() ...@@ -538,12 +538,16 @@ void GenericMap::addEmbedding()
m_embeddings[ORBIT] = amv ; m_embeddings[ORBIT] = amv ;
FunctorInitEmb<GenericMap, ORBIT> fsetemb(*this); FunctorInitEmb<GenericMap, ORBIT> fsetemb(*this);
TraversorCell<GenericMap, ORBIT> t(*this, allDarts, true) ; DartMarker dm(*this);
for(Dart d = t.begin(); d != t.end(); d = t.next()) for(Dart d = this->begin(); d != this->end(); this->next(d))
{ {
unsigned int em = newCell<ORBIT>(); if(!dm.isMarked(d))
fsetemb.changeEmb(em); {
foreach_dart_of_orbit<ORBIT>(d, fsetemb); dm.markOrbit<ORBIT>(d);
unsigned int em = newCell<ORBIT>();
fsetemb.changeEmb(em);
foreach_dart_of_orbit<ORBIT>(d, fsetemb);
}
} }
} }
......
...@@ -40,8 +40,6 @@ GenericMap::GenericMap() : m_nbThreads(1) ...@@ -40,8 +40,6 @@ GenericMap::GenericMap() : m_nbThreads(1)
{ {
if(m_attributes_registry_map == NULL) if(m_attributes_registry_map == NULL)
{ {
std::cout << "INITIALIZE REGISTRY MAP" << std::endl;
m_attributes_registry_map = new std::map<std::string, RegisteredBaseAttribute*>; m_attributes_registry_map = new std::map<std::string, RegisteredBaseAttribute*>;
// register all known types // register all known types
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment