convert subdivideSurface Plugin from dockTab to Dialog

SCHNApps/CMakeLists.txt

@@ -14,17 +14,6 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fPIC")
 SET(CGoGN_ROOT_DIR ${CMAKE_SOURCE_DIR}/.. CACHE STRING "CGoGN root dir")
 INCLUDE(${CGoGN_ROOT_DIR}/apps_cmake.txt)
 
-find_package(Qt4 REQUIRED)
-
-
-#=======QGLViewer=========#
-find_package(QGLViewer REQUIRED)
-
-
-#=======Python=========#
-find_package(PythonLibs REQUIRED)
-
-
 
 #======SCHNApps=======#
 SET(SCHNApps_ROOT_DIR ${CGoGN_ROOT_DIR}/SCHNApps)
@@ -38,12 +27,12 @@ ENDIF (NOT WIN32)
 
 
 #======Documentation=======#
-find_package(Doxygen)
-if(DOXYGEN_FOUND)
-configure_file(${CMAKE_SOURCE_DIR}/doc/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
-add_custom_target(doc
-	${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
-	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/Doc
-	COMMENT "Generating API documentation with Doxygen" VERBATIM
-)
-endif(DOXYGEN_FOUND)
+#find_package(Doxygen)
+#if(DOXYGEN_FOUND)
+#configure_file(${CMAKE_SOURCE_DIR}/doc/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
+#add_custom_target(doc
+#	${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+#	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/Doc
+#	COMMENT "Generating API documentation with Doxygen" VERBATIM
+#)
+#endif(DOXYGEN_FOUND)

SCHNApps/Plugins/differentialProperties/include/differentialProperties.h

@@ -55,8 +55,8 @@ private:
 	ComputeNormalDialog* m_computeNormalDialog;
 	ComputeCurvatureDialog* m_computeCurvatureDialog;
 
-	QAction* computeNormalAction;
-	QAction* computeCurvatureAction;
+	QAction* m_computeNormalAction;
+	QAction* m_computeCurvatureAction;
 };
 
 #endif

SCHNApps/Plugins/differentialProperties/src/differentialProperties.cpp

@@ -11,14 +11,14 @@ bool DifferentialPropertiesPlugin::enable()
 	m_computeNormalDialog = new ComputeNormalDialog(m_window);
 	m_computeCurvatureDialog = new ComputeCurvatureDialog(m_window);
 
-	computeNormalAction = new QAction("Compute Normal", this);
-	computeCurvatureAction = new QAction("Compute Curvature", this);
+	m_computeNormalAction = new QAction("Compute Normal", this);
+	m_computeCurvatureAction = new QAction("Compute Curvature", this);
 
-	addMenuAction("Surface;Differential Properties;Compute Normal", computeNormalAction);
-	addMenuAction("Surface;Differential Properties;Compute Curvature", computeCurvatureAction);
+	addMenuAction("Surface;Differential Properties;Compute Normal", m_computeNormalAction);
+	addMenuAction("Surface;Differential Properties;Compute Curvature", m_computeCurvatureAction);
 
-	connect(computeNormalAction, SIGNAL(triggered()), this, SLOT(cb_openComputeNormalDialog()));
-	connect(computeCurvatureAction, SIGNAL(triggered()), this, SLOT(cb_openComputeCurvatureDialog()));
+	connect(m_computeNormalAction, SIGNAL(triggered()), this, SLOT(cb_openComputeNormalDialog()));
+	connect(m_computeCurvatureAction, SIGNAL(triggered()), this, SLOT(cb_openComputeCurvatureDialog()));
 
 	connect(m_computeNormalDialog, SIGNAL(accepted()), this, SLOT(cb_computeNormal()));
 	connect(m_computeNormalDialog->button_apply, SIGNAL(clicked()), this, SLOT(cb_computeNormal()));
@@ -56,6 +56,7 @@ void DifferentialPropertiesPlugin::cb_computeNormal()
 			normalName = m_computeNormalDialog->combo_normalAttribute->currentText().toUtf8().constData();
 		else
 			normalName = m_computeNormalDialog->normalAttributeName->text().toUtf8().constData();
+
 		VertexAttribute<PFP2::VEC3> position = map->getAttribute<PFP2::VEC3, VERTEX>(positionName);
 		VertexAttribute<PFP2::VEC3> normal = map->getAttribute<PFP2::VEC3, VERTEX>(normalName);
 		if(!normal.isValid())

SCHNApps/Plugins/importSurface/importSurface.cpp

@@ -11,15 +11,13 @@ bool ImportSurfacePlugin::enable()
 {
 	importAction = new QAction("import", this);
 	addMenuAction("Surface;Import", importAction);
-	connect(importAction, SIGNAL(triggered()), this, SLOT(cb_import()));
+	connect(importAction, SIGNAL(triggered()), this, SLOT(importFromFileDialog()));
 	return true;
 }
 
-void ImportSurfacePlugin::cb_import()
+void ImportSurfacePlugin::importFromFile(const QString& fileName)
 {
-	QString fileName = QFileDialog::getOpenFileName(m_window, "Import file", m_window->getAppPath(), "Mesh Files (*.ply *.off *.trian)");
 	QFileInfo fi(fileName);
-
 	if(fi.exists())
 	{
 		GenericMap* m = m_window->createMap(2);
@@ -47,6 +45,12 @@ void ImportSurfacePlugin::cb_import()
 	}
 }
 
+void ImportSurfacePlugin::importFromFileDialog()
+{
+	QString fileName = QFileDialog::getOpenFileName(m_window, "Import file", m_window->getAppPath(), "Mesh Files (*.ply *.off *.trian)");
+	importFromFile(fileName);
+}
+
 #ifndef DEBUG
 Q_EXPORT_PLUGIN2(ImportSurfacePlugin, ImportSurfacePlugin)
 #else

SCHNApps/Plugins/importSurface/importSurface.h

@@ -42,7 +42,8 @@ public:
 	virtual void mapUnlinked(View* view, MapHandlerGen* m) {}
 
 public slots:
-	void cb_import();
+	void importFromFile(const QString& fileName);
+	void importFromFileDialog();
 
 private:
 	QAction* importAction;

SCHNApps/Plugins/render/render.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>174</width>
-    <height>553</height>
+    <height>547</height>
    </rect>
   </property>
   <property name="windowTitle">

SCHNApps/Plugins/subdivideSurface/CMakeLists.txt

@@ -2,20 +2,22 @@ cmake_minimum_required(VERSION 2.8)
 
 INCLUDE_DIRECTORIES(
 	${SCHNApps_ROOT_DIR}/include
-	${SCHNApps_ROOT_DIR}/Plugins/subdivideSurface
+	${SCHNApps_ROOT_DIR}/Plugins/subdivideSurface/include
 	${CMAKE_CURRENT_BINARY_DIR}
 )
 
 SET( PLUGIN_SRC
-    ${SCHNApps_ROOT_DIR}/Plugins/subdivideSurface/subdivideSurface.cpp
+    ${SCHNApps_ROOT_DIR}/Plugins/subdivideSurface/src/subdivideSurface.cpp
+    ${SCHNApps_ROOT_DIR}/Plugins/subdivideSurface/src/subdivideSurfaceDialog.cpp
 )
 
 SET( PLUGIN_H
-    ${SCHNApps_ROOT_DIR}/Plugins/subdivideSurface/subdivideSurface.h
+    ${SCHNApps_ROOT_DIR}/Plugins/subdivideSurface/include/subdivideSurface.h
+    ${SCHNApps_ROOT_DIR}/Plugins/subdivideSurface/include/subdivideSurfaceDialog.h
 )
 
 SET( PLUGIN_FORM
-	${SCHNApps_ROOT_DIR}/Plugins/subdivideSurface/subdivideSurface.ui
+	${SCHNApps_ROOT_DIR}/Plugins/subdivideSurface/forms/subdivideSurfaceDialog.ui
 )
 
 IF( ${CMAKE_BUILD_TYPE} STREQUAL Debug )

SCHNApps/Plugins/subdivideSurface/subdivideSurface.ui → SCHNApps/Plugins/subdivideSurface/forms/subdivideSurfaceDialog.ui

 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>SubdivideSurfaceWidget</class>
- <widget class="QWidget" name="SubdivideSurfaceWidget">
+ <class>SubdivideSurfaceDialog</class>
+ <widget class="QDialog" name="SubdivideSurfaceDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>176</width>
-    <height>427</height>
+    <width>314</width>
+    <height>230</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string>Subdivide surface</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
@@ -22,14 +22,14 @@
      <item>
       <widget class="QLabel" name="label_2">
        <property name="text">
-        <string>Position :</string>
+        <string>Position attribute :</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QComboBox" name="combo_positionAttribute">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -39,38 +39,54 @@
     </layout>
    </item>
    <item>
-    <widget class="QPushButton" name="button_loopSubdivision">
-     <property name="text">
-      <string>Loop subdivision</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QPushButton" name="button_CCSubdivision">
-     <property name="text">
-      <string>Catmull-Clark subdivision</string>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QPushButton" name="button_trianguleFaces">
-     <property name="text">
-      <string>Triangule Faces</string>
-     </property>
-    </widget>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QRadioButton" name="radio_Loop">
+       <property name="text">
+        <string>Loop</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QRadioButton" name="radio_CC">
+       <property name="text">
+        <string>Catmull-Clark</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QRadioButton" name="radio_trianguleFaces">
+       <property name="text">
+        <string>Triangule faces</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
    <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>156</width>
-       <height>161</height>
-      </size>
-     </property>
-    </spacer>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <widget class="QPushButton" name="button_cancel">
+       <property name="text">
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="button_apply">
+       <property name="text">
+        <string>Apply</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="button_ok">
+       <property name="text">
+        <string>OK</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>

SCHNApps/Plugins/subdivideSurface/subdivideSurface.h → SCHNApps/Plugins/subdivideSurface/include/subdivideSurface.h

@@ -2,20 +2,14 @@
 #define _SUBDIVIDESURFACE_PLUGIN_H_
 
 #include "plugin.h"
-#include "ui_subdivideSurface.h"
+
+#include "subdivideSurfaceDialog.h"
 
 
 using namespace CGoGN;
 using namespace SCHNApps;
 
 
-class SubdivideSurfaceDockTab : public QWidget, public Ui::SubdivideSurfaceWidget
-{
-public:
-	SubdivideSurfaceDockTab() { setupUi(this); }
-};
-
-
 class SubdivideSurfacePlugin : public Plugin
 {
 	Q_OBJECT
@@ -49,17 +43,18 @@ public:
 	virtual void mapLinked(View* view, MapHandlerGen* m) {}
 	virtual void mapUnlinked(View* view, MapHandlerGen* m) {}
 
-protected:
-	SubdivideSurfaceDockTab* m_dockTab;
-
 public slots:
-	void cb_addMapToList(MapHandlerGen* m);
-	void cb_removeMapFromList(MapHandlerGen* m);
-	void cb_selectedMapChanged();
+	void cb_openSubdivideSurfaceDialog();
+	void cb_subdivideSurface();
+
+	void loopSubdivision(PFP2::MAP* map, VertexAttribute<PFP2::VEC3>& position);
+	void CCSubdivision(PFP2::MAP* map, VertexAttribute<PFP2::VEC3>& position);
+	void trianguleFaces(PFP2::MAP* map, VertexAttribute<PFP2::VEC3>& position);
+
+private:
+	SubdivideSurfaceDialog* m_subdivideSurfaceDialog;
 
-	void cb_loopSubdivision();
-	void cb_CCSubdivision();
-	void cb_trianguleFaces();
+	QAction* m_subdivideSurfaceAction;
 };
 
 #endif

SCHNApps/Plugins/subdivideSurface/include/subdivideSurfaceDialog.h

+#ifndef _SUBDIVIDESURFACE_DIALOG_H_
+#define _SUBDIVIDESURFACE_DIALOG_H_
+
+#include "ui_subdivideSurfaceDialog.h"
+
+namespace CGoGN
+{
+
+namespace SCHNApps
+{
+
+class Window;
+
+class SubdivideSurfaceDialog : public QDialog, public Ui::SubdivideSurfaceDialog
+{
+	Q_OBJECT
+
+public:
+	SubdivideSurfaceDialog(Window* w);
+	void init();
+
+public slots:
+	void cb_selectedMapChanged();
+
+private:
+	Window* m_window;
+};
+
+} // namespace SCHNApps
+
+} // namespace CGoGN
+
+#endif

SCHNApps/Plugins/subdivideSurface/src/subdivideSurface.cpp

+#include "subdivideSurface.h"
+
+#include "mapHandler.h"
+
+#include "Algo/Modelisation/subdivision.h"
+
+bool SubdivideSurfacePlugin::enable()
+{
+	m_subdivideSurfaceDialog = new SubdivideSurfaceDialog(m_window);
+
+	m_subdivideSurfaceAction = new QAction("Subdivide surface", this);
+
+	addMenuAction("Surface;Subdivide", m_subdivideSurfaceAction);
+
+	connect(m_subdivideSurfaceAction, SIGNAL(triggered()), this, SLOT(cb_openSubdivideSurfaceDialog()));
+
+	connect(m_subdivideSurfaceDialog, SIGNAL(accepted()), this, SLOT(cb_subdivideSurface()));
+	connect(m_subdivideSurfaceDialog->button_apply, SIGNAL(clicked()), this, SLOT(cb_subdivideSurface()));
+
+	return true;
+}
+
+void SubdivideSurfacePlugin::cb_openSubdivideSurfaceDialog()
+{
+	m_subdivideSurfaceDialog->init();
+	m_subdivideSurfaceDialog->show();
+}
+
+void SubdivideSurfacePlugin::cb_subdivideSurface()
+{
+	QList<QListWidgetItem*> currentItems = m_subdivideSurfaceDialog->mapList->selectedItems();
+	if(!currentItems.empty())
+	{
+		const QString& mapname = currentItems[0]->text();
+		MapHandler<PFP2>* mh = static_cast<MapHandler<PFP2>*>(m_window->getMap(mapname));
+		PFP2::MAP* map = mh->getMap();
+
+		std::string positionName = m_subdivideSurfaceDialog->combo_positionAttribute->currentText().toUtf8().constData();
+		VertexAttribute<PFP2::VEC3> position = map->getAttribute<PFP2::VEC3, VERTEX>(positionName);
+
+		if(m_subdivideSurfaceDialog->radio_Loop->isChecked())
+			loopSubdivision(map, position);
+		else if(m_subdivideSurfaceDialog->radio_CC->isChecked())
+			CCSubdivision(map, position);
+		else if(m_subdivideSurfaceDialog->radio_trianguleFaces->isChecked())
+			trianguleFaces(map, position);
+
+		mh->updatePrimitives(Algo::Render::GL2::POINTS);
+		mh->updatePrimitives(Algo::Render::GL2::LINES);
+		mh->updatePrimitives(Algo::Render::GL2::TRIANGLES);
+		mh->updateVBO(position);
+
+		QList<View*> views = mh->getLinkedViews();
+		foreach(View* view, views)
+			view->updateGL();
+	}
+}
+
+void SubdivideSurfacePlugin::loopSubdivision(PFP2::MAP* map, VertexAttribute<PFP2::VEC3>& position)
+{
+	Algo::Surface::Modelisation::LoopSubdivision<PFP2>(*map, position);
+}
+
+void SubdivideSurfacePlugin::CCSubdivision(PFP2::MAP* map, VertexAttribute<PFP2::VEC3>& position)
+{
+	Algo::Surface::Modelisation::CatmullClarkSubdivision<PFP2>(*map, position);
+}
+
+void SubdivideSurfacePlugin::trianguleFaces(PFP2::MAP* map, VertexAttribute<PFP2::VEC3>& position)
+{
+	Algo::Surface::Modelisation::trianguleFaces<PFP2>(*map, position);
+}
+
+#ifndef DEBUG
+Q_EXPORT_PLUGIN2(SubdivideSurfacePlugin, SubdivideSurfacePlugin)
+#else
+Q_EXPORT_PLUGIN2(SubdivideSurfacePluginD, SubdivideSurfacePlugin)
+#endif

SCHNApps/Plugins/subdivideSurface/src/subdivideSurfaceDialog.cpp

+#include "subdivideSurfaceDialog.h"
+
+#include "subdivideSurface.h"
+#include "window.h"
+#include "mapHandler.h"
+
+namespace CGoGN
+{
+
+namespace SCHNApps
+{
+
+SubdivideSurfaceDialog::SubdivideSurfaceDialog(Window* w) : m_window(w)
+{
+	setupUi(this);
+	connect(mapList, SIGNAL(itemSelectionChanged()), this, SLOT(cb_selectedMapChanged()));
+}
+
+void SubdivideSurfaceDialog::init()
+{
+	mapList->clear();
+	combo_positionAttribute->clear();
+	const QList<MapHandlerGen*>& maps = m_window->getMapsList();
+	foreach(MapHandlerGen* map, maps)
+		mapList->addItem(map->getName());
+}
+
+void SubdivideSurfaceDialog::cb_selectedMapChanged()
+{
+	QList<QListWidgetItem*> currentItems = mapList->selectedItems();
+	if(!currentItems.empty())
+	{
+		combo_positionAttribute->clear();
+		const QString& mapname = currentItems[0]->text();
+		MapHandlerGen* mh = m_window->getMap(mapname);
+		GenericMap* map = mh->getGenericMap();
+		AttributeContainer& cont = map->getAttributeContainer<VERTEX>();
+
+		std::vector<std::string> names;
+		std::vector<std::string> types;
+		cont.getAttributesNames(names);
+		cont.getAttributesTypes(types);
+		std::string vec3TypeName = nameOfType(PFP2::VEC3());
+		unsigned int j = 0;
+		for(unsigned int i = 0; i < names.size(); ++i)
+		{
+			if(types[i] == vec3TypeName)
+			{
+				combo_positionAttribute->addItem(QString::fromStdString(names[i]));
+				if(names[i] == "position") // try to select a position attribute named "position"
+					combo_positionAttribute->setCurrentIndex(j);
+
+				++j;
+			}
+		}
+	}
+}
+
+} // namespace SCHNApps
+
+} // namespace CGoGN

SCHNApps/Plugins/subdivideSurface/subdivideSurface.cpp

-#include "subdivideSurface.h"
-
-#include "mapHandler.h"
-
-#include "Algo/Modelisation/subdivision.h"
-
-bool SubdivideSurfacePlugin::enable()
-{
-	m_dockTab = new SubdivideSurfaceDockTab();
-	addTabInDock(m_dockTab, "SubdivideSurface");
-
-	connect(m_window, SIGNAL(mapAdded(MapHandlerGen*)), this, SLOT(cb_addMapToList(MapHandlerGen*)));
-	connect(m_window, SIGNAL(mapRemoved(MapHandlerGen*)), this, SLOT(cb_removeMapFromList(MapHandlerGen*)));
-
-	connect(m_dockTab->mapList, SIGNAL(itemSelectionChanged()), this, SLOT(cb_selectedMapChanged()));
-
-	connect(m_dockTab->button_trianguleFaces, SIGNAL(clicked()), this, SLOT(cb_trianguleFaces()));
-	connect(m_dockTab->button_loopSubdivision, SIGNAL(clicked()), this, SLOT(cb_loopSubdivision()));
-	connect(m_dockTab->button_CCSubdivision, SIGNAL(clicked()), this, SLOT(cb_CCSubdivision()));
-
-	QList<MapHandlerGen*> maps = m_window->getMapsList();
-	foreach(MapHandlerGen* m, maps)
-		m_dockTab->mapList->addItem(m->getName());
-
-	return true;
-}
-
-void SubdivideSurfacePlugin::cb_addMapToList(MapHandlerGen* m)
-{
-	m_dockTab->mapList->addItem(m->getName());
-}
-
-void SubdivideSurfacePlugin::cb_removeMapFromList(MapHandlerGen* m)
-{
-	for(int i = 0; i < m_dockTab->mapList->count(); ++i)
-	{
-		if(m_dockTab->mapList->item(i)->text() == m->getName())
-		{
-			delete m_dockTab->mapList->item(i);
-			return;
-		}
-	}
-}
-
-void SubdivideSurfacePlugin::cb_selectedMapChanged()
-{
-	QList<QListWidgetItem*> currentItems = m_dockTab->mapList->selectedItems();
-	if(!currentItems.empty())
-	{
-		m_dockTab->combo_positionAttribute->clear();
-		const QString& mapname = currentItems[0]->text();
-		MapHandlerGen* mh = m_window->getMap(mapname);
-		GenericMap* map = mh->getGenericMap();
-		AttributeContainer& cont = map->getAttributeContainer<VERTEX>();
-		std::vector<std::string> names;
-		std::vector<std::string> types;
-		cont.getAttributesNames(names);
-		cont.getAttributesTypes(types);
-		std::string vec3TypeName = nameOfType(PFP2::VEC3());
-		unsigned int j = 0;
-		for(unsigned int i = 0; i < names.size(); ++i)
-		{
-			if(types[i] == vec3TypeName)
-			{
-				m_dockTab->combo_positionAttribute->addItem(QString::fromStdString(names[i]));
-				if(names[i] == "position") // try to select an attribute named "position"
-					m_dockTab->combo_positionAttribute->setCurrentIndex(j);
-				++j;
-			}
-		}
-	}
-}
-
-void SubdivideSurfacePlugin::cb_loopSubdivision()
-{