Merge branch 'develop' into 'develop'

LSM plugin + plugin dll export symbols



See merge request !87

Apps/Benches/CMakeLists.txt

@@ -10,3 +10,6 @@ target_link_libraries( bench_remesh ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
 
 add_executable(bench_compact bench_compact.cpp )
 target_link_libraries( bench_compact ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
+
+add_executable(bench_import_trav bench_import_trav.cpp )
+target_link_libraries( bench_import_trav ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )

CGoGN/include/Algo/Import/import2tables.h

@@ -62,7 +62,7 @@ class MeshTablesSurface
 public:
 	typedef typename PFP::MAP MAP ;
     typedef typename PFP::VEC3 VEC3 ;
-    typedef typename VEC3::DATA_TYPE DATA_TYPE ;
+	typedef typename VEC3::DATA_TYPE DATA_TYPE ;
 	typedef typename PFP::REAL REAL ;
 
 protected:

SCHNApps/Plugins/CMakeLists.txt

@@ -23,6 +23,7 @@ ADD_SUBDIRECTORY(surface_differentialProperties)
 ADD_SUBDIRECTORY(surface_subdivision)
 ADD_SUBDIRECTORY(surface_selection)
 ADD_SUBDIRECTORY(surface_deformation)
+ADD_SUBDIRECTORY(surface_lsm)
 ADD_SUBDIRECTORY(surface_modelisation)
 ADD_SUBDIRECTORY(surface_radiance)
 ADD_SUBDIRECTORY(surface_distance)

SCHNApps/Plugins/surface_deformation/CMakeLists.txt

@@ -4,6 +4,8 @@ SET( PLUGIN_NAME Surface_Deformation )
 
 SET( PLUGIN_ROOT_DIR ${SCHNApps_ROOT_DIR}/Plugins/surface_deformation )
 
+ADD_DEFINITIONS(-DSURFACE_DEFORMATION_DLL_EXPORT)
+
 INCLUDE_DIRECTORIES(
 	${PLUGIN_ROOT_DIR}/include
 	${CMAKE_CURRENT_BINARY_DIR}

SCHNApps/Plugins/surface_deformation/include/dll.h

+#ifdef WIN32
+#if defined SURFACE_DEFORMATION_DLL_EXPORT
+#define SURFACE_DEFORMATION_API __declspec(dllexport)
+#else
+#define SURFACE_DEFORMATION_API __declspec(dllimport)
+#endif
+#else
+#define SURFACE_DEFORMATION_API
+#endif

SCHNApps/Plugins/surface_deformation/include/surface_deformation.h

 #ifndef _SURFACE_DEFORMATION_PLUGIN_H_
 #define _SURFACE_DEFORMATION_PLUGIN_H_
 
+#include "dll.h"
 #include "plugin_interaction.h"
 #include "surface_deformation_dockTab.h"
 
@@ -46,7 +47,7 @@ struct MapParameters
 	NLContext nlContext;
 };
 
-class Surface_Deformation_Plugin : public PluginInteraction
+class SURFACE_DEFORMATION_API Surface_Deformation_Plugin : public PluginInteraction
 {
 	Q_OBJECT
 	Q_INTERFACES(CGoGN::SCHNApps::Plugin)

SCHNApps/Plugins/surface_differentialProperties/CMakeLists.txt

@@ -4,6 +4,8 @@ SET( PLUGIN_NAME Surface_DifferentialProperties )
 
 SET( PLUGIN_ROOT_DIR ${SCHNApps_ROOT_DIR}/Plugins/surface_differentialProperties )
 
+ADD_DEFINITIONS(-DSURFACE_DIFFERENTIAL_PROPERTIES_DLL_EXPORT)
+
 INCLUDE_DIRECTORIES(
 	${PLUGIN_ROOT_DIR}/include
 	${CMAKE_CURRENT_BINARY_DIR}

SCHNApps/Plugins/surface_differentialProperties/include/dll.h

+#ifdef WIN32
+#if defined SURFACE_DIFFERENTIAL_PROPERTIES_DLL_EXPORT
+#define SURFACE_DIFFERENTIAL_PROPERTIES_API __declspec(dllexport)
+#else
+#define SURFACE_DIFFERENTIAL_PROPERTIES_API __declspec(dllimport)
+#endif
+#else
+#define SURFACE_DIFFERENTIAL_PROPERTIES_API
+#endif

SCHNApps/Plugins/surface_differentialProperties/include/surface_differentialProperties.h

 #ifndef _SURFACE_DIFFERENTIALPROPERTIES_PLUGIN_H_
 #define _SURFACE_DIFFERENTIALPROPERTIES_PLUGIN_H_
 
+#include "dll.h"
 #include "plugin_processing.h"
 
 #include "dialog_computeNormal.h"
@@ -16,7 +17,7 @@ namespace SCHNApps
  * - Normals
  * - Curvatures
  */
-class Surface_DifferentialProperties_Plugin : public PluginProcessing
+class SURFACE_DIFFERENTIAL_PROPERTIES_API Surface_DifferentialProperties_Plugin : public PluginProcessing
 {
 	Q_OBJECT
 	Q_INTERFACES(CGoGN::SCHNApps::Plugin)

SCHNApps/Plugins/surface_distance/CMakeLists.txt

@@ -4,6 +4,8 @@ SET( PLUGIN_NAME Surface_Distance )
 
 SET( PLUGIN_ROOT_DIR ${SCHNApps_ROOT_DIR}/Plugins/surface_distance )
 
+ADD_DEFINITIONS(-DSURFACE_DISTANCE_DLL_EXPORT)
+
 INCLUDE_DIRECTORIES(
 	${PLUGIN_ROOT_DIR}/include
 	${CMAKE_CURRENT_BINARY_DIR}

SCHNApps/Plugins/surface_distance/include/dll.h

+#ifdef WIN32
+#if defined SURFACE_DISTANCE_DLL_EXPORT
+#define SURFACE_DISTANCE_API __declspec(dllexport)
+#else
+#define SURFACE_DISTANCE_API __declspec(dllimport)
+#endif
+#else
+#define SURFACE_DISTANCE_API
+#endif

SCHNApps/Plugins/surface_distance/include/surface_distance.h

 #ifndef _SURFACE_DISTANCE_PLUGIN_H_
 #define _SURFACE_DISTANCE_PLUGIN_H_
 
+#include "dll.h"
 #include "plugin_processing.h"
 
 #include "dialog_computeDistance.h"
@@ -11,7 +12,7 @@ namespace CGoGN
 namespace SCHNApps
 {
 
-class Surface_Distance_Plugin : public PluginProcessing
+class SURFACE_DISTANCE_API Surface_Distance_Plugin : public PluginProcessing
 {
 	Q_OBJECT
 	Q_INTERFACES(CGoGN::SCHNApps::Plugin)

SCHNApps/Plugins/surface_import/CMakeLists.txt

@@ -4,6 +4,8 @@ SET( PLUGIN_NAME Surface_Import )
 
 SET( PLUGIN_ROOT_DIR ${SCHNApps_ROOT_DIR}/Plugins/surface_import )
 
+ADD_DEFINITIONS(-DSURFACE_IMPORT_DLL_EXPORT)
+
 INCLUDE_DIRECTORIES(
 	${PLUGIN_ROOT_DIR}/include
 	${CMAKE_CURRENT_BINARY_DIR}

SCHNApps/Plugins/surface_import/include/dll.h

+#ifdef WIN32
+#if defined SURFACE_IMPORT_DLL_EXPORT
+#define SURFACE_IMPORT_API __declspec(dllexport)
+#else
+#define SURFACE_IMPORT_API __declspec(dllimport)
+#endif
+#else
+#define SURFACE_IMPORT_API
+#endif

SCHNApps/Plugins/surface_import/include/surface_import.h

 #ifndef _SURFACE_IMPORT_PLUGIN_H_
 #define _SURFACE_IMPORT_PLUGIN_H_
 
+#include "dll.h"
 #include "plugin_processing.h"
 
 namespace CGoGN
@@ -13,7 +14,7 @@ namespace SCHNApps
 * The import image function allow the creation of a mesh with a face by pixel.
 * Image format support is given by Qt.
 */
-class Surface_Import_Plugin : public PluginProcessing
+class SURFACE_IMPORT_API Surface_Import_Plugin : public PluginProcessing
 {
 	Q_OBJECT
 	Q_INTERFACES(CGoGN::SCHNApps::Plugin)

SCHNApps/Plugins/surface_lsm/CMakeLists.txt

+cmake_minimum_required(VERSION 2.8)
+
+SET( PLUGIN_NAME Surface_LSM )
+
+SET( PLUGIN_ROOT_DIR ${SCHNApps_ROOT_DIR}/Plugins/surface_lsm )
+
+ADD_DEFINITIONS(-DSURFACE_LSM_DLL_EXPORT)
+
+INCLUDE_DIRECTORIES(
+	${PLUGIN_ROOT_DIR}/include
+	${CMAKE_CURRENT_BINARY_DIR}
+)
+
+file(
+	GLOB_RECURSE
+	PLUGIN_FILES
+	${PLUGIN_ROOT_DIR}/src/*.cpp
+	${PLUGIN_ROOT_DIR}/include/*.h
+	${PLUGIN_ROOT_DIR}/include/*.hpp
+)
+
+file(
+	GLOB_RECURSE
+	PLUGIN_UI_FILES
+	${PLUGIN_ROOT_DIR}/forms/*.ui
+)
+
+SET(
+	PLUGIN_QOBJECT_FILES
+	${PLUGIN_ROOT_DIR}/include/surface_lsm.h
+	${PLUGIN_ROOT_DIR}/include/surface_lsm_dockTab.h
+)
+
+include( ${SCHNApps_ROOT_DIR}/Plugins/plugins_cmake.txt )

SCHNApps/Plugins/surface_lsm/forms/surface_lsm.ui

+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Surface_LSM_TabWidget</class>
+ <widget class="QWidget" name="Surface_LSM_TabWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>216</width>
+    <height>545</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="6" column="0" colspan="2">
+    <widget class="QComboBox" name="combo_freeSelector">
+     <item>
+      <property name="text">
+       <string>- select selector -</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>Position :</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0" colspan="2">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>Free vertices selector :</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QComboBox" name="combo_positionAttribute">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <item>
+      <property name="text">
+       <string>- select attribute -</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="9" column="0" colspan="2">
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="10" column="0" colspan="2">
+    <widget class="QPushButton" name="button_start_stop">
+     <property name="text">
+      <string>Start</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="2">
+    <widget class="QComboBox" name="combo_handleSelector">
+     <item>
+      <property name="text">
+       <string>- select selector -</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="11" column="0" colspan="2">
+    <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>
+   </item>
+   <item row="3" column="0" colspan="2">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Handle vertices selector :</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>combo_positionAttribute</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>

SCHNApps/Plugins/surface_lsm/include/dll.h

+#ifdef WIN32
+#if defined SURFACE_LSM_DLL_EXPORT
+#define SURFACE_LSM_API __declspec(dllexport)
+#else
+#define SURFACE_LSM_API __declspec(dllimport)
+#endif
+#else
+#define SURFACE_LSM_API
+#endif

SCHNApps/Plugins/surface_lsm/include/surface_lsm.h

+#ifndef _SURFACE_DEFORMATION_PLUGIN_H_
+#define _SURFACE_DEFORMATION_PLUGIN_H_
+
+#include "dll.h"
+#include "plugin_interaction.h"
+#include "surface_lsm_dockTab.h"
+
+#include "mapHandler.h"
+
+#include "Container/fakeAttribute.h"
+
+#include "NL/nl.h"
+#include "Algo/LinearSolving/basic.h"
+#include "Eigen/Dense"
+
+namespace CGoGN
+{
+
+namespace SCHNApps
+{
+
+typedef NoTypeNameAttribute<Eigen::Matrix3f> Eigen_Matrix3f;
+
+struct MapParameters
+{
+	MapParameters();
+	~MapParameters();
+
+	void start(MapHandlerGen* mh);
+	void stop(MapHandlerGen* mh);
+
+	VertexAttribute<PFP2::VEC3, PFP2::MAP> positionAttribute;
+
+	CellSelector<PFP2::MAP, VERTEX>* handleSelector;
+	CellSelector<PFP2::MAP, VERTEX>* freeSelector;
+
+	bool initialized;
+
+	VertexAttribute<unsigned int, PFP2::MAP> vIndex;
+	unsigned int nb_vertices;
+
+	NLContext nlContext;
+};
+
+class SURFACE_LSM_API Surface_LSM_Plugin : public PluginInteraction
+{
+	Q_OBJECT
+	Q_INTERFACES(CGoGN::SCHNApps::Plugin)
+#if CGOGN_QT_DESIRED_VERSION == 5
+	Q_PLUGIN_METADATA(IID "CGoGN.SCHNapps.Plugin")
+#endif
+
+	friend class Surface_LSM_DockTab;
+
+public:
+	Surface_LSM_Plugin() :
+		m_draginit(false),
+		m_dragging(false)
+	{}
+
+	~Surface_LSM_Plugin()
+	{}
+
+	virtual bool enable();
+	virtual void disable();
+
+	virtual void draw(View *view);
+	virtual void drawMap(View* view, MapHandlerGen* map) {}
+
+	virtual void keyPress(View* view, QKeyEvent* event);
+	virtual void keyRelease(View* , QKeyEvent* ) {}
+	virtual void mousePress(View* , QMouseEvent* ) {}
+	virtual void mouseRelease(View* , QMouseEvent* ) {}
+	virtual void mouseMove(View* view, QMouseEvent* event);
+	virtual void wheelEvent(View* , QWheelEvent* ) {}
+
+	virtual void viewLinked(View *view) {}
+	virtual void viewUnlinked(View *view) {}
+
+private slots:
+	// slots called from SCHNApps signals
+	void selectedMapChanged(MapHandlerGen* prev, MapHandlerGen* cur);
+	void mapAdded(MapHandlerGen* map);
+	void mapRemoved(MapHandlerGen* map);
+
+	// slots called from MapHandler signals
+	void attributeAdded(unsigned int orbit, const QString& name);
+	void cellSelectorAdded(unsigned int orbit, const QString& name);
+	void cellSelectorRemoved(unsigned int orbit, const QString& name);
+	void selectedCellsChanged(CellSelectorGen *cs);
+
+public slots:
+	// slots for Python calls
+	void changePositionAttribute(const QString& map, const QString& name);
+	void changeHandleSelector(const QString& map, const QString& name);
+	void changeFreeSelector(const QString& map, const QString& name);
+
+protected:
+	void toggleMapDeformation(MapHandlerGen* map);
+	void lsm(MapHandlerGen* map);
+
+protected:
+	Surface_LSM_DockTab* m_dockTab;
+	QHash<MapHandlerGen*, MapParameters> h_parameterSet;
+
+	bool m_draginit;
+	bool m_dragging;
+	PFP2::REAL m_dragZ;
+	qglviewer::Vec m_dragPrevious;
+};
+
+} // namespace SCHNApps
+
+} // namespace CGoGN
+
+#endif

SCHNApps/Plugins/surface_lsm/include/surface_lsm_dockTab.h

+#ifndef _SURFACE_DEFORMATION_DOCK_TAB_H_
+#define _SURFACE_DEFORMATION_DOCK_TAB_H_
+
+#include "ui_surface_lsm.h"
+
+namespace CGoGN
+{
+
+namespace SCHNApps
+{
+
+class SCHNApps;
+class Surface_LSM_Plugin;
+struct MapParameters;
+
+class Surface_LSM_DockTab : public QWidget, public Ui::Surface_LSM_TabWidget
+{
+	Q_OBJECT
+
+	friend class Surface_LSM_Plugin;
+
+public:
+	Surface_LSM_DockTab(SCHNApps* s, Surface_LSM_Plugin* p);
+
+private:
+	SCHNApps* m_schnapps;
+	Surface_LSM_Plugin* m_plugin;
+	bool b_updatingUI;
+
+private slots:
+	void positionAttributeChanged(int index);
+	void handleSelectorChanged(int index);
+	void freeSelectorChanged(int index);
+	void startStopButtonClicked();
+
+private:
+	void addVertexAttribute(const QString& nameAttr);
+	void addVertexSelector(const QString& name);
+	void removeVertexSelector(const QString& name);
+
+	void mapParametersInitialized(bool b);
+
+	void updateMapParameters();
+};
+
+} // namespace SCHNApps
+
+} // namespace CGoGN
+
+#endif

SCHNApps/Plugins/surface_lsm/src/surface_lsm_dockTab.cpp

+#include "surface_lsm_dockTab.h"
+
+#include "surface_lsm.h"
+#include "schnapps.h"
+#include "mapHandler.h"
+
+namespace CGoGN
+{
+
+namespace SCHNApps
+{
+
+Surface_LSM_DockTab::Surface_LSM_DockTab(SCHNApps* s, Surface_LSM_Plugin* p) :
+	m_schnapps(s),
+	m_plugin(p),
+	b_updatingUI(false)
+{
+	setupUi(this);
+
+	connect(combo_positionAttribute, SIGNAL(currentIndexChanged(int)), this, SLOT(positionAttributeChanged(int)));
+	connect(combo_handleSelector, SIGNAL(currentIndexChanged(int)), this, SLOT(handleSelectorChanged(int)));
+	connect(combo_freeSelector, SIGNAL(currentIndexChanged(int)), this, SLOT(freeSelectorChanged(int)));
+	connect(button_start_stop, SIGNAL(clicked()), this, SLOT(startStopButtonClicked()));
+}
+
+
+
+
+
+void Surface_LSM_DockTab::positionAttributeChanged(int index)
+{
+	if(!b_updatingUI)
+	{
+		MapHandlerGen* map = m_schnapps->getSelectedMap();
+		if(map)
+		{
+			if(index == 0)
+				;
+			else
+			{
+				MapHandler<PFP2>* mh = static_cast<MapHandler<PFP2>*>(map);
+				m_plugin->h_parameterSet[map].positionAttribute = mh->getAttribute<PFP2::VEC3, VERTEX>(combo_positionAttribute->currentText());
+				m_plugin->pythonRecording("changePositionVBO", "", map->getName(), combo_positionAttribute->currentText());
+			}
+		}
+	}
+}
+
+void Surface_LSM_DockTab::handleSelectorChanged(int index)
+{
+	if(!b_updatingUI)
+	{
+		MapHandlerGen* map = m_schnapps->getSelectedMap();
+		if(map)
+		{
+			MapHandler<PFP2>* mh = static_cast<MapHandler<PFP2>*>(map);
+			m_plugin->h_parameterSet[map].handleSelector = mh->getCellSelector<VERTEX>(combo_handleSelector->currentText());
+			m_plugin->pythonRecording("changeHandleSelector", "", map->getName(), combo_handleSelector->currentText());
+
+		}
+	}
+}
+
+void Surface_LSM_DockTab::freeSelectorChanged(int index)
+{
+	if(!b_updatingUI)
+	{
+		MapHandlerGen* map = m_schnapps->getSelectedMap();
+		if(map)
+		{
+			MapHandler<PFP2>* mh = static_cast<MapHandler<PFP2>*>(map);
+			m_plugin->h_parameterSet[map].freeSelector = mh->getCellSelector<VERTEX>(combo_freeSelector->currentText());
+			m_plugin->pythonRecording("changeFreeSelector", "", map->getName(), combo_freeSelector->currentText());
+		}
+	}
+}
+
+void Surface_LSM_DockTab::startStopButtonClicked()
+{
+	if(!b_updatingUI)
+	{
+		MapHandlerGen* map = m_schnapps->getSelectedMap();
+		if(map)
+			m_plugin->toggleMapDeformation(map);
+	}
+}
+
+
+
+
+
+void Surface_LSM_DockTab::addVertexAttribute(const QString& name)
+{
+	b_updatingUI = true;
+	QString vec3TypeName = QString::fromStdString(nameOfType(PFP2::VEC3()));
+	const QString& typeAttr = m_schnapps->getSelectedMap()->getAttributeTypeName(VERTEX, name);
+	if(typeAttr == vec3TypeName)
+		combo_positionAttribute->addItem(name);
+	b_updatingUI = false;
+}
+
+void Surface_LSM_DockTab::addVertexSelector(const QString& name)
+{
+	b_updatingUI = true;
+	combo_handleSelector->addItem(name);
+	combo_freeSelector->addItem(name);
+	b_updatingUI = false;
+}
+
+void Surface_LSM_DockTab::removeVertexSelector(const QString& name)
+{
+	b_updatingUI = true;
+	int curIndex = combo_handleSelector->currentIndex();
+	int index = combo_handleSelector->findText(name, Qt::MatchExactly);
+	if(curIndex == index)
+		combo_handleSelector->setCurrentIndex(0);
+	combo_handleSelector->removeItem(index);
+
+	curIndex = combo_freeSelector->currentIndex();
+	index = combo_freeSelector->findText(name, Qt::MatchExactly);
+	if(curIndex == index)
+		combo_freeSelector->setCurrentIndex(0);
+	combo_freeSelector->removeItem(index);
+	b_updatingUI = false;
+}
+
+void Surface_LSM_DockTab::mapParametersInitialized(bool b)
+{
+	b_updatingUI = true;
+	combo_positionAttribute->setEnabled(!b);
+	combo_handleSelector->setEnabled(!b);
+	combo_freeSelector->setEnabled(!b);
+	if(b) button_start_stop->setText("Stop");
+	else button_start_stop->setText("Start");
+	b_updatingUI = false;
+}
+
+void Surface_LSM_DockTab::updateMapParameters()
+{
+	b_updatingUI = true;
+
+	combo_positionAttribute->clear();
+	combo_positionAttribute->addItem("- select attribute -");
+	combo_handleSelector->clear();
+	combo_handleSelector->addItem("- select selector -");
+	combo_freeSelector->clear();
+	combo_freeSelector->addItem("- select selector -");
+
+	MapHandlerGen* map = m_schnapps->getSelectedMap();
+
+	if(map)
+	{
+		const MapParameters& p = m_plugin->h_parameterSet[map];
+
+		QString vec3TypeName = QString::fromStdString(nameOfType(PFP2::VEC3()));
+
+		unsigned int i = 1;