Commit 4266a0c6 authored by Pierre Kraemer's avatar Pierre Kraemer

add plugin surface_differentialProperties

parent 79d7fc0c
...@@ -80,7 +80,7 @@ To compile CGoGN: ...@@ -80,7 +80,7 @@ To compile CGoGN:
WITH_QT (T) WITH_QT (T)
-> to minimize dependencies and compilation time -> to minimize dependencies and compilation time
FORCE_MR (1) FORCE_MR (0)
-> allows the compilation in 2 modes: mono-resolution(0), multi-resolution(1) -> allows the compilation in 2 modes: mono-resolution(0), multi-resolution(1)
ONELIB (F) ONELIB (F)
......
...@@ -2,3 +2,4 @@ cmake_minimum_required(VERSION 2.8) ...@@ -2,3 +2,4 @@ cmake_minimum_required(VERSION 2.8)
ADD_SUBDIRECTORY(surface_import) ADD_SUBDIRECTORY(surface_import)
ADD_SUBDIRECTORY(surface_render) ADD_SUBDIRECTORY(surface_render)
ADD_SUBDIRECTORY(surface_differentialProperties)
...@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8) ...@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8)
SET( PLUGIN_NAME DifferentialProperties ) SET( PLUGIN_NAME DifferentialProperties )
SET( PLUGIN_ROOT_DIR ${SCHNApps_ROOT_DIR}/Plugins/differentialProperties ) SET( PLUGIN_ROOT_DIR ${SCHNApps_ROOT_DIR}/Plugins/surface_differentialProperties )
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${PLUGIN_ROOT_DIR}/include ${PLUGIN_ROOT_DIR}/include
...@@ -25,9 +25,9 @@ file( ...@@ -25,9 +25,9 @@ file(
SET( SET(
PLUGIN_QOBJECT_FILES PLUGIN_QOBJECT_FILES
${PLUGIN_ROOT_DIR}/include/differentialProperties.h ${PLUGIN_ROOT_DIR}/include/surface_differentialProperties.h
${PLUGIN_ROOT_DIR}/include/computeNormalDialog.h ${PLUGIN_ROOT_DIR}/include/dialog_computeNormal.h
${PLUGIN_ROOT_DIR}/include/computeCurvatureDialog.h ${PLUGIN_ROOT_DIR}/include/dialog_computeCurvature.h
) )
include( ${SCHNApps_ROOT_DIR}/Plugins/plugins_cmake.txt ) include( ${SCHNApps_ROOT_DIR}/Plugins/plugins_cmake.txt )
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>ComputeCurvatureDialog</class> <class>Dialog_ComputeCurvature</class>
<widget class="QDialog" name="ComputeCurvatureDialog"> <widget class="QDialog" name="Dialog_ComputeCurvature">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QListWidget" name="mapList"/> <widget class="QListWidget" name="list_maps"/>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
...@@ -321,7 +321,7 @@ ...@@ -321,7 +321,7 @@
<connection> <connection>
<sender>button_ok</sender> <sender>button_ok</sender>
<signal>clicked()</signal> <signal>clicked()</signal>
<receiver>ComputeCurvatureDialog</receiver> <receiver>Dialog_ComputeCurvature</receiver>
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
...@@ -337,7 +337,7 @@ ...@@ -337,7 +337,7 @@
<connection> <connection>
<sender>button_cancel</sender> <sender>button_cancel</sender>
<signal>clicked()</signal> <signal>clicked()</signal>
<receiver>ComputeCurvatureDialog</receiver> <receiver>Dialog_ComputeCurvature</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>ComputeNormalDialog</class> <class>Dialog_ComputeNormal</class>
<widget class="QDialog" name="ComputeNormalDialog"> <widget class="QDialog" name="Dialog_ComputeNormal">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<widget class="QListWidget" name="mapList"/> <widget class="QListWidget" name="list_maps"/>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
<connection> <connection>
<sender>button_ok</sender> <sender>button_ok</sender>
<signal>clicked()</signal> <signal>clicked()</signal>
<receiver>ComputeNormalDialog</receiver> <receiver>Dialog_ComputeNormal</receiver>
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
<connection> <connection>
<sender>button_cancel</sender> <sender>button_cancel</sender>
<signal>clicked()</signal> <signal>clicked()</signal>
<receiver>ComputeNormalDialog</receiver> <receiver>Dialog_ComputeNormal</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
......
#ifndef _COMPUTECURVATURE_DIALOG_H_ #ifndef _DIALOG_COMPUTECURVATURE_H_
#define _COMPUTECURVATURE_DIALOG_H_ #define _DIALOG_COMPUTECURVATURE_H_
#include "ui_computeCurvatureDialog.h" #include "ui_dialog_computeCurvature.h"
namespace CGoGN namespace CGoGN
{ {
...@@ -9,18 +9,18 @@ namespace CGoGN ...@@ -9,18 +9,18 @@ namespace CGoGN
namespace SCHNApps namespace SCHNApps
{ {
class Window; class SCHNApps;
class MapHandlerGen; class MapHandlerGen;
class ComputeCurvatureDialog : public QDialog, public Ui::ComputeCurvatureDialog class Dialog_ComputeCurvature : public QDialog, public Ui::Dialog_ComputeCurvature
{ {
Q_OBJECT Q_OBJECT
public: public:
ComputeCurvatureDialog(Window* w); Dialog_ComputeCurvature(SCHNApps* s);
private: private:
Window* m_window; SCHNApps* m_schnapps;
MapHandlerGen* m_selectedMap; MapHandlerGen* m_selectedMap;
public slots: public slots:
......
#ifndef _COMPUTENORMAL_DIALOG_H_ #ifndef _DIALOG_COMPUTENORMAL_H_
#define _COMPUTENORMAL_DIALOG_H_ #define _DIALOG_COMPUTENORMAL_H_
#include "ui_computeNormalDialog.h" #include "ui_dialog_computeNormal.h"
namespace CGoGN namespace CGoGN
{ {
...@@ -9,18 +9,18 @@ namespace CGoGN ...@@ -9,18 +9,18 @@ namespace CGoGN
namespace SCHNApps namespace SCHNApps
{ {
class Window; class SCHNApps;
class MapHandlerGen; class MapHandlerGen;
class ComputeNormalDialog : public QDialog, public Ui::ComputeNormalDialog class Dialog_ComputeNormal : public QDialog, public Ui::Dialog_ComputeNormal
{ {
Q_OBJECT Q_OBJECT
public: public:
ComputeNormalDialog(Window* w); Dialog_ComputeNormal(SCHNApps* s);
private: private:
Window* m_window; SCHNApps* m_schnapps;
MapHandlerGen* m_selectedMap; MapHandlerGen* m_selectedMap;
public slots: public slots:
......
#ifndef _DIFFERENTIALPROPERTIES_PLUGIN_H_ #ifndef _SURFACE_DIFFERENTIALPROPERTIES_PLUGIN_H_
#define _DIFFERENTIALPROPERTIES_PLUGIN_H_ #define _SURFACE_DIFFERENTIALPROPERTIES_PLUGIN_H_
#include "plugin.h" #include "plugin_processing.h"
#include "computeNormalDialog.h" #include "dialog_computeNormal.h"
#include "computeCurvatureDialog.h" #include "dialog_computeCurvature.h"
namespace CGoGN
{
using namespace CGoGN; namespace SCHNApps
using namespace SCHNApps; {
class DifferentialPropertiesPlugin : public Plugin class Surface_DifferentialProperties_Plugin : public PluginProcessing
{ {
Q_OBJECT Q_OBJECT
Q_INTERFACES(CGoGN::SCHNApps::Plugin) Q_INTERFACES(CGoGN::SCHNApps::Plugin)
public: public:
DifferentialPropertiesPlugin() Surface_DifferentialProperties_Plugin()
{ {}
setProvidesRendering(false);
}
~DifferentialPropertiesPlugin() ~Surface_DifferentialProperties_Plugin()
{} {}
virtual bool enable(); virtual bool enable();
virtual void disable() {} virtual void disable() {}
virtual void redraw(View *view) {} private slots:
virtual void keyPress(View* view, QKeyEvent* event) {}
virtual void keyRelease(View* view, QKeyEvent* event) {}
virtual void mousePress(View* view, QMouseEvent* event) {}
virtual void mouseRelease(View* view, QMouseEvent* event) {}
virtual void mouseMove(View* view, QMouseEvent* event) {}
virtual void wheelEvent(View* view, QWheelEvent* event) {}
public slots:
void mapAdded(MapHandlerGen* map); void mapAdded(MapHandlerGen* map);
void mapRemoved(MapHandlerGen* map); void mapRemoved(MapHandlerGen* map);
void attributeModified(unsigned int orbit, QString nameAttr); void attributeModified(unsigned int orbit, QString nameAttr);
...@@ -48,6 +38,7 @@ public slots: ...@@ -48,6 +38,7 @@ public slots:
void computeNormalFromDialog(); void computeNormalFromDialog();
void computeCurvatureFromDialog(); void computeCurvatureFromDialog();
public slots:
void computeNormal(const QString& mapName, void computeNormal(const QString& mapName,
const QString& positionAttributeName = "position", const QString& positionAttributeName = "position",
const QString& normalAttributeName = "normal", const QString& normalAttributeName = "normal",
...@@ -68,8 +59,8 @@ public slots: ...@@ -68,8 +59,8 @@ public slots:
); );
private: private:
ComputeNormalDialog* m_computeNormalDialog; Dialog_ComputeNormal* m_computeNormalDialog;
ComputeCurvatureDialog* m_computeCurvatureDialog; Dialog_ComputeCurvature* m_computeCurvatureDialog;
QAction* m_computeNormalAction; QAction* m_computeNormalAction;
QAction* m_computeCurvatureAction; QAction* m_computeCurvatureAction;
...@@ -111,4 +102,8 @@ private: ...@@ -111,4 +102,8 @@ private:
QHash<QString, ComputeCurvatureParameters> computeCurvatureLastParameters; QHash<QString, ComputeCurvatureParameters> computeCurvatureLastParameters;
}; };
} // namespace SCHNApps
} // namespace CGoGN
#endif #endif
#include "computeCurvatureDialog.h" #include "dialog_computeCurvature.h"
#include "differentialProperties.h" #include "surface_differentialProperties.h"
#include "window.h" #include "schnapps.h"
#include "mapHandler.h" #include "mapHandler.h"
namespace CGoGN namespace CGoGN
...@@ -10,8 +10,8 @@ namespace CGoGN ...@@ -10,8 +10,8 @@ namespace CGoGN
namespace SCHNApps namespace SCHNApps
{ {
ComputeCurvatureDialog::ComputeCurvatureDialog(Window* w) : Dialog_ComputeCurvature::Dialog_ComputeCurvature(SCHNApps* s) :
m_window(w), m_schnapps(s),
m_selectedMap(NULL) m_selectedMap(NULL)
{ {
setupUi(this); setupUi(this);
...@@ -22,25 +22,24 @@ ComputeCurvatureDialog::ComputeCurvatureDialog(Window* w) : ...@@ -22,25 +22,24 @@ ComputeCurvatureDialog::ComputeCurvatureDialog(Window* w) :
kminAttributeName->setText("kmin"); kminAttributeName->setText("kmin");
KnormalAttributeName->setText("Knormal"); KnormalAttributeName->setText("Knormal");
connect(m_window, SIGNAL(mapAdded(MapHandlerGen*)), this, SLOT(addMapToList(MapHandlerGen*))); connect(m_schnapps, SIGNAL(mapAdded(MapHandlerGen*)), this, SLOT(addMapToList(MapHandlerGen*)));
connect(m_window, SIGNAL(mapRemoved(MapHandlerGen*)), this, SLOT(removeMapFromList(MapHandlerGen*))); connect(m_schnapps, SIGNAL(mapRemoved(MapHandlerGen*)), this, SLOT(removeMapFromList(MapHandlerGen*)));
connect(mapList, SIGNAL(itemSelectionChanged()), this, SLOT(selectedMapChanged())); connect(list_maps, SIGNAL(itemSelectionChanged()), this, SLOT(selectedMapChanged()));
const QList<MapHandlerGen*>& maps = m_window->getMapsList(); foreach(MapHandlerGen* map, m_schnapps->getMapSet().values())
foreach(MapHandlerGen* map, maps)
{ {
QListWidgetItem* item = new QListWidgetItem(map->getName(), mapList); QListWidgetItem* item = new QListWidgetItem(map->getName(), list_maps);
item->setCheckState(Qt::Unchecked); item->setCheckState(Qt::Unchecked);
} }
} }
void ComputeCurvatureDialog::selectedMapChanged() void Dialog_ComputeCurvature::selectedMapChanged()
{ {
if(m_selectedMap) if(m_selectedMap)
disconnect(m_selectedMap, SIGNAL(attributeAdded(unsigned int, const QString&)), this, SLOT(addAttributeToList(unsigned int, const QString&))); disconnect(m_selectedMap, SIGNAL(attributeAdded(unsigned int, const QString&)), this, SLOT(addAttributeToList(unsigned int, const QString&)));
QList<QListWidgetItem*> currentItems = mapList->selectedItems(); QList<QListWidgetItem*> currentItems = list_maps->selectedItems();
if(!currentItems.empty()) if(!currentItems.empty())
{ {
combo_positionAttribute->clear(); combo_positionAttribute->clear();
...@@ -52,49 +51,30 @@ void ComputeCurvatureDialog::selectedMapChanged() ...@@ -52,49 +51,30 @@ void ComputeCurvatureDialog::selectedMapChanged()
combo_kminAttribute->clear(); combo_kminAttribute->clear();
const QString& mapname = currentItems[0]->text(); const QString& mapname = currentItems[0]->text();
MapHandlerGen* mh = m_window->getMap(mapname); MapHandlerGen* mh = m_schnapps->getMap(mapname);
QString vec3TypeName = QString::fromStdString(nameOfType(PFP2::VEC3())); QString vec3TypeName = QString::fromStdString(nameOfType(PFP2::VEC3()));
QString realTypeName = QString::fromStdString(nameOfType(PFP2::REAL())); QString realTypeName = QString::fromStdString(nameOfType(PFP2::REAL()));
unsigned int j = 0; unsigned int j = 0;
unsigned int k = 0; unsigned int k = 0;
const AttributeHash& attribs = mh->getAttributesList(VERTEX); const AttributeSet& attribs = mh->getAttributeSet(VERTEX);
for(AttributeHash::const_iterator i = attribs.constBegin(); i != attribs.constEnd(); ++i) for(AttributeSet::const_iterator i = attribs.constBegin(); i != attribs.constEnd(); ++i)
{ {
if(i.value() == vec3TypeName) if(i.value() == vec3TypeName)
{ {
combo_positionAttribute->addItem(i.key()); combo_positionAttribute->addItem(i.key());
if(i.key() == "position") // try to select a position attribute named "position"
combo_positionAttribute->setCurrentIndex(j);
combo_normalAttribute->addItem(i.key()); combo_normalAttribute->addItem(i.key());
if(i.key() == "normal") // try to select a normal attribute named "normal"
combo_normalAttribute->setCurrentIndex(j);
combo_KmaxAttribute->addItem(i.key()); combo_KmaxAttribute->addItem(i.key());
if(i.key() == "Kmax") // try to select a normal attribute named "Kmax"
combo_KmaxAttribute->setCurrentIndex(j);
combo_KminAttribute->addItem(i.key()); combo_KminAttribute->addItem(i.key());
if(i.key() == "Kmin") // try to select a normal attribute named "Kmin"
combo_KminAttribute->setCurrentIndex(j);
combo_KnormalAttribute->addItem(i.key()); combo_KnormalAttribute->addItem(i.key());
if(i.key() == "Knormal") // try to select a normal attribute named "Knormal"
combo_KnormalAttribute->setCurrentIndex(j);
++j; ++j;
} }
else if(i.value() == realTypeName) else if(i.value() == realTypeName)
{ {
combo_kmaxAttribute->addItem(i.key()); combo_kmaxAttribute->addItem(i.key());
if(i.key() == "kmax") // try to select a normal attribute named "kmax"
combo_kmaxAttribute->setCurrentIndex(k);
combo_kminAttribute->addItem(i.key()); combo_kminAttribute->addItem(i.key());
if(i.key() == "kmin") // try to select a normal attribute named "kmin"
combo_kminAttribute->setCurrentIndex(k);
++k; ++k;
} }
...@@ -107,15 +87,15 @@ void ComputeCurvatureDialog::selectedMapChanged() ...@@ -107,15 +87,15 @@ void ComputeCurvatureDialog::selectedMapChanged()
m_selectedMap = NULL; m_selectedMap = NULL;
} }
void ComputeCurvatureDialog::addMapToList(MapHandlerGen* m) void Dialog_ComputeCurvature::addMapToList(MapHandlerGen* m)
{ {
QListWidgetItem* item = new QListWidgetItem(m->getName(), mapList); QListWidgetItem* item = new QListWidgetItem(m->getName(), list_maps);
item->setCheckState(Qt::Unchecked); item->setCheckState(Qt::Unchecked);
} }
void ComputeCurvatureDialog::removeMapFromList(MapHandlerGen* m) void Dialog_ComputeCurvature::removeMapFromList(MapHandlerGen* m)
{ {
QList<QListWidgetItem*> items = mapList->findItems(m->getName(), Qt::MatchExactly); QList<QListWidgetItem*> items = list_maps->findItems(m->getName(), Qt::MatchExactly);
if(!items.empty()) if(!items.empty())
delete items[0]; delete items[0];
...@@ -126,7 +106,7 @@ void ComputeCurvatureDialog::removeMapFromList(MapHandlerGen* m) ...@@ -126,7 +106,7 @@ void ComputeCurvatureDialog::removeMapFromList(MapHandlerGen* m)
} }
} }
void ComputeCurvatureDialog::addAttributeToList(unsigned int orbit, const QString& nameAttr) void Dialog_ComputeCurvature::addAttributeToList(unsigned int orbit, const QString& nameAttr)
{ {
QString vec3TypeName = QString::fromStdString(nameOfType(PFP2::VEC3())); QString vec3TypeName = QString::fromStdString(nameOfType(PFP2::VEC3()));
QString realTypeName = QString::fromStdString(nameOfType(PFP2::REAL())); QString realTypeName = QString::fromStdString(nameOfType(PFP2::REAL()));
......
#include "computeNormalDialog.h" #include "dialog_computeNormal.h"
#include "differentialProperties.h" #include "surface_differentialProperties.h"
#include "window.h" #include "schnapps.h"
#include "mapHandler.h" #include "mapHandler.h"
namespace CGoGN namespace CGoGN
...@@ -10,56 +10,50 @@ namespace CGoGN ...@@ -10,56 +10,50 @@ namespace CGoGN
namespace SCHNApps namespace SCHNApps
{ {
ComputeNormalDialog::ComputeNormalDialog(Window* w) : Dialog_ComputeNormal::Dialog_ComputeNormal(SCHNApps* s) :
m_window(w), m_schnapps(s),
m_selectedMap(NULL) m_selectedMap(NULL)
{ {
setupUi(this); setupUi(this);
normalAttributeName->setText("normal"); normalAttributeName->setText("normal");
connect(m_window, SIGNAL(mapAdded(MapHandlerGen*)), this, SLOT(addMapToList(MapHandlerGen*))); connect(m_schnapps, SIGNAL(mapAdded(MapHandlerGen*)), this, SLOT(addMapToList(MapHandlerGen*)));
connect(m_window, SIGNAL(mapRemoved(MapHandlerGen*)), this, SLOT(removeMapFromList(MapHandlerGen*))); connect(m_schnapps, SIGNAL(mapRemoved(MapHandlerGen*)), this, SLOT(removeMapFromList(MapHandlerGen*)));
connect(mapList, SIGNAL(itemSelectionChanged()), this, SLOT(selectedMapChanged())); connect(list_maps, SIGNAL(itemSelectionChanged()), this, SLOT(selectedMapChanged()));
const QList<MapHandlerGen*>& maps = m_window->getMapsList(); foreach(MapHandlerGen* map, m_schnapps->getMapSet().values())
foreach(MapHandlerGen* map, maps)
{ {
QListWidgetItem* item = new QListWidgetItem(map->getName(), mapList); QListWidgetItem* item = new QListWidgetItem(map->getName(), list_maps);
item->setCheckState(Qt::Unchecked); item->setCheckState(Qt::Unchecked);
} }
} }
void ComputeNormalDialog::selectedMapChanged() void Dialog_ComputeNormal::selectedMapChanged()
{ {
if(m_selectedMap) if(m_selectedMap)
disconnect(m_selectedMap, SIGNAL(attributeAdded(unsigned int, const QString&)), this, SLOT(addAttributeToList(unsigned int, const QString&))); disconnect(m_selectedMap, SIGNAL(attributeAdded(unsigned int, const QString&)), this, SLOT(addAttributeToList(unsigned int, const QString&)));
QList<QListWidgetItem*> currentItems = mapList->selectedItems(); QList<QListWidgetItem*> currentItems = list_maps->selectedItems();
if(!currentItems.empty()) if(!currentItems.empty())
{ {
combo_positionAttribute->clear(); combo_positionAttribute->clear();
combo_normalAttribute->clear(); combo_normalAttribute->clear();
const QString& mapname = currentItems[0]->text(); const QString& mapname = currentItems[0]->text();
MapHandlerGen* mh = m_window->getMap(mapname); MapHandlerGen* mh = m_schnapps->getMap(mapname);
QString vec3TypeName = QString::fromStdString(nameOfType(PFP2::VEC3())); QString vec3TypeName = QString::fromStdString(nameOfType(PFP2::VEC3()));
unsigned int j = 0; unsigned int j = 0;
const AttributeHash& attribs = mh->getAttributesList(VERTEX); const AttributeSet& attribs = mh->getAttributeSet(VERTEX);
for(AttributeHash::const_iterator i = attribs.constBegin(); i != attribs.constEnd(); ++i) for(AttributeSet::const_iterator i = attribs.constBegin(); i != attribs.constEnd(); ++i)
{ {
if(i.value() == vec3TypeName) if(i.value() == vec3TypeName)
{ {
combo_positionAttribute->addItem(i.key()); combo_positionAttribute->addItem(i.key());
if(i.key() == "position") // try to select a position attribute named "position"
combo_positionAttribute->setCurrentIndex(j);
combo_normalAttribute->addItem(i.key()); combo_normalAttribute->addItem(i.key());
if(i.key() == "normal") // try to select a normal attribute named "normal"
combo_normalAttribute->setCurrentIndex(j);
++j; ++j;
} }
...@@ -72,15 +66,15 @@ void ComputeNormalDialog::selectedMapChanged() ...@@ -72,15 +66,15 @@ void ComputeNormalDialog::selectedMapChanged()
m_selectedMap = NULL; m_selectedMap = NULL;
} }
void ComputeNormalDialog::addMapToList(MapHandlerGen* m) void Dialog_ComputeNormal::addMapToList(MapHandlerGen* m)
{ {
QListWidgetItem* item = new QListWidgetItem(m->getName(), mapList); QListWidgetItem* item = new QListWidgetItem(m->getName(), list_maps);
item->setCheckState(Qt::Unchecked); item->setCheckState(Qt::Unchecked);
} }
void ComputeNormalDialog::removeMapFromList(MapHandlerGen* m) void Dialog_ComputeNormal::removeMapFromList(MapHandlerGen* m)
{ {
QList<QListWidgetItem*> items = mapList->findItems(m->getName(), Qt::MatchExactly); QList<QListWidgetItem*> items = list_maps</