From f1dab8f58f0b1f7d7cbb6e571090b68f7f45c3d7 Mon Sep 17 00:00:00 2001
From: Pierre Kraemer <kraemer@unistra.fr>
Date: Mon, 17 Mar 2014 16:14:35 +0100
Subject: [PATCH] debug restore_shortcuts in GenericMap

---
 SCHNApps/CMakeLists.txt             |  7 +++++++
 SCHNApps/include/camera.h           |  3 ++-
 SCHNApps/include/view.h             |  1 +
 src/Topology/generic/genericmap.cpp | 15 +++++++++++----
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/SCHNApps/CMakeLists.txt b/SCHNApps/CMakeLists.txt
index 0348f495..5d839bec 100644
--- a/SCHNApps/CMakeLists.txt
+++ b/SCHNApps/CMakeLists.txt
@@ -103,6 +103,13 @@ IF(APPLE)
 	SET(CMAKE_OSX_ARCHITECTURES x86_64)
 ENDIF(APPLE)
 
+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)
 
 
 
diff --git a/SCHNApps/include/camera.h b/SCHNApps/include/camera.h
index d4ce2e81..09b9ac47 100644
--- a/SCHNApps/include/camera.h
+++ b/SCHNApps/include/camera.h
@@ -2,7 +2,8 @@
 #define _CAMERA_H_
 
 #include "view.h"
-#include "QGLViewer/camera.h"
+#include <QGLViewer/camera.h>
+#include <QGLViewer/manipulatedCameraFrame.h>
 
 namespace CGoGN
 {
diff --git a/SCHNApps/include/view.h b/SCHNApps/include/view.h
index 2f0ca278..3500ded3 100644
--- a/SCHNApps/include/view.h
+++ b/SCHNApps/include/view.h
@@ -3,6 +3,7 @@
 
 #include <GL/glew.h>
 #include <QGLViewer/qglviewer.h>
+#include <QGLViewer/manipulatedFrame.h>
 
 #include "schnapps.h"
 #include "Utils/gl_matrices.h"
diff --git a/src/Topology/generic/genericmap.cpp b/src/Topology/generic/genericmap.cpp
index 3628b275..dbff311c 100644
--- a/src/Topology/generic/genericmap.cpp
+++ b/src/Topology/generic/genericmap.cpp
@@ -412,12 +412,19 @@ void GenericMap::restore_shortcuts()
 	}
 
 	// restore mark vectors in Dart & Cell Markers
-	for (std::vector<DartMarkerGen*>::iterator it = dartMarkers.begin(); it != dartMarkers.end(); ++it)
-		(*it)->updateMarkVector(m_markTables[DART][(*it)->getThread()]);
+	for (unsigned int j = 0; j < NB_THREAD; ++j)
+	{
+		for (std::vector<DartMarkerGen*>::iterator it = dartMarkers[j].begin(); it != dartMarkers[j].end(); ++it)
+			(*it)->updateMarkVector(m_markTables[DART][(*it)->getThread()]);
 
-	for (std::vector<CellMarkerGen*>::iterator it = cellMarkers.begin(); it != cellMarkers.end(); ++it)
-		(*it)->updateMarkVector(m_markTables[(*it)->getCell()][(*it)->getThread()]);
+		for (std::vector<CellMarkerGen*>::iterator it = cellMarkers[j].begin(); it != cellMarkers[j].end(); ++it)
+			(*it)->updateMarkVector(m_markTables[(*it)->getCell()][(*it)->getThread()]);
+	}
 
+	// set Attribute handlers invalid
+	for(std::multimap<AttributeMultiVectorGen*, AttributeHandlerGen*>::iterator it = attributeHandlers.begin(); it != attributeHandlers.end(); ++it)
+		(*it).second->setInvalid() ;
+	attributeHandlers.clear() ;
 }
 
 void GenericMap::dumpAttributesAndMarkers()
-- 
GitLab