Merge cgogn:~cgogn/CGoGN

Apps/Examples/Debug/CMakeLists.txt

-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8)
 
 project(examplesD)
 

Apps/Examples/Release/CMakeLists.txt

-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8)
 
 project(examples)
 

Apps/Examples/clipping.cpp

@@ -186,10 +186,7 @@ void Clipping::slot_spinBox_GridResolution(int i)
 
 void Clipping::slot_pushButton_changePlanesColor()
 {
-	QColor NewColor;
-	QColorDialog ColDialog;
-
-	NewColor = ColDialog.getColor();
+	QColor NewColor = QColorDialog::getColor();
 
 	int r, g, b;
 	NewColor.getRgb(&r, &g, &b);

Apps/Tuto/CMakeLists.txt

-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8)
 
 project(Tutos)
 

build/CMakeLists.txt

-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8)
 
 project(CGoGN)
 

build/Debug/CMakeLists.txt

-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8)
 
 project(CGoGNDebug)
 

build/Release/CMakeLists.txt

-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8)
 
 project(CGoGNRelease)
 

include/Algo/ImplicitHierarchicalMesh/ihm.h

@@ -25,8 +25,7 @@
 #ifndef __IMPLICIT_HIERARCHICAL_MAP__
 #define __IMPLICIT_HIERARCHICAL_MAP__
 
-#include "Topology/map/map2.h"
-#include "Topology/generic/embeddedMap2.h"
+#include "Topology/map/embeddedMap2.h"
 
 namespace CGoGN
 {
@@ -39,7 +38,7 @@ namespace IHM
 
 template<typename T> class AttributeHandler_IHM ;
 
-class ImplicitHierarchicalMap : public EmbeddedMap2<Map2>
+class ImplicitHierarchicalMap : public EmbeddedMap2
 {
 	template<typename T> friend class AttributeHandler_IHM ;
 

include/Algo/ImplicitHierarchicalMesh/ihm.hpp

@@ -253,7 +253,7 @@ inline bool ImplicitHierarchicalMap::foreach_dart_of_cc(Dart d, FunctorType& f,
 
 inline void ImplicitHierarchicalMap::splitFace(Dart d, Dart e)
 {
-	EmbeddedMap2<Map2>::splitFace(d, e) ;
+	EmbeddedMap2::splitFace(d, e) ;
 	if(isOrbitEmbedded(FACE))
 	{
 		unsigned int cur = m_curLevel ;

src/Utils/qtgl.cpp

@@ -336,8 +336,8 @@ void GLWidget::keyPressEvent(QKeyEvent* event)
 	m_state_modifier = event->modifiers();
 
 	int k = event->key();
-//	if ( (k >= 65) && (k <= 91) && !(event->modifiers() & Qt::ShiftModifier) )
-//		k += 32;
+	if ( (k >= 65) && (k <= 91) && !(event->modifiers() & Qt::ShiftModifier) )
+		k += 32;
 
 	if (m_cbs)
 		m_cbs->cb_keyPress(k);