Commit f1dab8f5 authored by Pierre Kraemer's avatar Pierre Kraemer

debug restore_shortcuts in GenericMap

parent 409564ae
......@@ -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)
......
......@@ -2,7 +2,8 @@
#define _CAMERA_H_
#include "view.h"
#include "QGLViewer/camera.h"
#include <QGLViewer/camera.h>
#include <QGLViewer/manipulatedCameraFrame.h>
namespace CGoGN
{
......
......@@ -3,6 +3,7 @@
#include <GL/glew.h>
#include <QGLViewer/qglviewer.h>
#include <QGLViewer/manipulatedFrame.h>
#include "schnapps.h"
#include "Utils/gl_matrices.h"
......
......@@ -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()
......
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