Commit 64bd8a46 authored by untereiner's avatar untereiner

Merge cgogn:~cgogn/CGoGN

parents 2d082a87 d5eebb90
cmake_minimum_required(VERSION 2.6)
cmake_minimum_required(VERSION 2.8)
project(examplesD)
......
cmake_minimum_required(VERSION 2.6)
cmake_minimum_required(VERSION 2.8)
project(examples)
......
......@@ -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);
......
cmake_minimum_required(VERSION 2.6)
cmake_minimum_required(VERSION 2.8)
project(Tutos)
......
cmake_minimum_required(VERSION 2.6)
cmake_minimum_required(VERSION 2.8)
project(CGoGN)
......
cmake_minimum_required(VERSION 2.6)
cmake_minimum_required(VERSION 2.8)
project(CGoGNDebug)
......
cmake_minimum_required(VERSION 2.6)
cmake_minimum_required(VERSION 2.8)
project(CGoGNRelease)
......
......@@ -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 ;
......
......@@ -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 ;
......
......@@ -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);
......
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