Commit 0996dc3e authored by Thomas's avatar Thomas

Merge branch 'master' of cgogn.u-strasbg.fr:~untereiner/CGoGN

parents 7f4059ea 64bd8a46
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.8)
project(examplesD) project(examplesD)
......
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.8)
project(examples) project(examples)
......
...@@ -186,10 +186,7 @@ void Clipping::slot_spinBox_GridResolution(int i) ...@@ -186,10 +186,7 @@ void Clipping::slot_spinBox_GridResolution(int i)
void Clipping::slot_pushButton_changePlanesColor() void Clipping::slot_pushButton_changePlanesColor()
{ {
QColor NewColor; QColor NewColor = QColorDialog::getColor();
QColorDialog ColDialog;
NewColor = ColDialog.getColor();
int r, g, b; int r, g, b;
NewColor.getRgb(&r, &g, &b); NewColor.getRgb(&r, &g, &b);
......
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.8)
project(Tutos) project(Tutos)
......
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.8)
project(CGoGN) project(CGoGN)
......
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.8)
project(CGoGNDebug) project(CGoGNDebug)
......
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.8)
project(CGoGNRelease) project(CGoGNRelease)
......
...@@ -25,8 +25,7 @@ ...@@ -25,8 +25,7 @@
#ifndef __IMPLICIT_HIERARCHICAL_MAP__ #ifndef __IMPLICIT_HIERARCHICAL_MAP__
#define __IMPLICIT_HIERARCHICAL_MAP__ #define __IMPLICIT_HIERARCHICAL_MAP__
#include "Topology/map/map2.h" #include "Topology/map/embeddedMap2.h"
#include "Topology/generic/embeddedMap2.h"
namespace CGoGN namespace CGoGN
{ {
...@@ -39,7 +38,7 @@ namespace IHM ...@@ -39,7 +38,7 @@ namespace IHM
template<typename T> class AttributeHandler_IHM ; template<typename T> class AttributeHandler_IHM ;
class ImplicitHierarchicalMap : public EmbeddedMap2<Map2> class ImplicitHierarchicalMap : public EmbeddedMap2
{ {
template<typename T> friend class AttributeHandler_IHM ; template<typename T> friend class AttributeHandler_IHM ;
......
...@@ -253,7 +253,7 @@ inline bool ImplicitHierarchicalMap::foreach_dart_of_cc(Dart d, FunctorType& f, ...@@ -253,7 +253,7 @@ inline bool ImplicitHierarchicalMap::foreach_dart_of_cc(Dart d, FunctorType& f,
inline void ImplicitHierarchicalMap::splitFace(Dart d, Dart e) inline void ImplicitHierarchicalMap::splitFace(Dart d, Dart e)
{ {
EmbeddedMap2<Map2>::splitFace(d, e) ; EmbeddedMap2::splitFace(d, e) ;
if(isOrbitEmbedded(FACE)) if(isOrbitEmbedded(FACE))
{ {
unsigned int cur = m_curLevel ; unsigned int cur = m_curLevel ;
......
...@@ -875,11 +875,12 @@ bool Map3::foreach_dart_of_vertex(Dart d, FunctorType& f, unsigned int thread) ...@@ -875,11 +875,12 @@ bool Map3::foreach_dart_of_vertex(Dart d, FunctorType& f, unsigned int thread)
DartMarkerStore mv(*this,thread); // Lock a marker DartMarkerStore mv(*this,thread); // Lock a marker
bool found = false; // Last functor return value bool found = false; // Last functor return value
std::list<Dart> darts_list; //Darts that are traversed std::vector<Dart> darts_list; //Darts that are traversed
darts_list.reserve(512);
darts_list.push_back(d); //Start with the dart d darts_list.push_back(d); //Start with the dart d
mv.mark(d); mv.mark(d);
for(std::list<Dart>::iterator darts = darts_list.begin(); !found && darts != darts_list.end() ; ++darts) for(std::vector<Dart>::iterator darts = darts_list.begin(); !found && darts != darts_list.end() ; ++darts)
{ {
Dart dc = *darts; Dart dc = *darts;
......
...@@ -336,8 +336,8 @@ void GLWidget::keyPressEvent(QKeyEvent* event) ...@@ -336,8 +336,8 @@ void GLWidget::keyPressEvent(QKeyEvent* event)
m_state_modifier = event->modifiers(); m_state_modifier = event->modifiers();
int k = event->key(); int k = event->key();
// if ( (k >= 65) && (k <= 91) && !(event->modifiers() & Qt::ShiftModifier) ) if ( (k >= 65) && (k <= 91) && !(event->modifiers() & Qt::ShiftModifier) )
// k += 32; k += 32;
if (m_cbs) if (m_cbs)
m_cbs->cb_keyPress(k); m_cbs->cb_keyPress(k);
......
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