diff --git a/SCHNApps/CMakeLists.txt b/SCHNApps/CMakeLists.txt index 5505de2587421e2f4907e7acd14789cfedb4058d..ca14e4a3cc8b6aad531e396b391dfca7829e71b6 100644 --- a/SCHNApps/CMakeLists.txt +++ b/SCHNApps/CMakeLists.txt @@ -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) diff --git a/include/Topology/generic/genericmap.hpp b/include/Topology/generic/genericmap.hpp index 8b95811ac9b30ac4425f1366372e58d6d910f69d..1fb4425c45d5eb41ca06a9c754a03b3d624ccdfb 100644 --- a/include/Topology/generic/genericmap.hpp +++ b/include/Topology/generic/genericmap.hpp @@ -538,12 +538,16 @@ void GenericMap::addEmbedding() m_embeddings[ORBIT] = amv ; FunctorInitEmb fsetemb(*this); - TraversorCell t(*this, allDarts, true) ; - for(Dart d = t.begin(); d != t.end(); d = t.next()) + DartMarker dm(*this); + for(Dart d = this->begin(); d != this->end(); this->next(d)) { - unsigned int em = newCell(); - fsetemb.changeEmb(em); - foreach_dart_of_orbit(d, fsetemb); + if(!dm.isMarked(d)) + { + dm.markOrbit(d); + unsigned int em = newCell(); + fsetemb.changeEmb(em); + foreach_dart_of_orbit(d, fsetemb); + } } } diff --git a/src/Topology/generic/genericmap.cpp b/src/Topology/generic/genericmap.cpp index 6873803b8a3307d557602e61c8cac717a0730012..3567458c1d473c2509bdaa19bd7601ee1afa73d3 100644 --- a/src/Topology/generic/genericmap.cpp +++ b/src/Topology/generic/genericmap.cpp @@ -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; // register all known types