add surface deformation (not finished)

SCHNApps/Plugins/surface_deformation/forms/surface_deformation.ui

+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Surface_Deformation_TabWidget</class>
+ <widget class="QWidget" name="Surface_Deformation_TabWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>180</width>
+    <height>545</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>Position :</string>
+     </property>
+    </widget>
+   </item>
+   <item row="9" 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_3">
+     <property name="text">
+      <string>Locked selector :</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0" colspan="2">
+    <widget class="QComboBox" name="combo_lockedSelector">
+     <item>
+      <property name="text">
+       <string>- select selector -</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="5" column="0" colspan="2">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Handle selector :</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="0" colspan="2">
+    <widget class="QComboBox" name="combo_handleSelector">
+     <item>
+      <property name="text">
+       <string>- select selector -</string>
+      </property>
+     </item>
+    </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="7" column="0" colspan="2">
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="8" column="0" colspan="2">
+    <widget class="QPushButton" name="button_start_stop">
+     <property name="text">
+      <string>Start</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>combo_positionAttribute</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>

SCHNApps/Plugins/surface_deformation/include/surface_deformation.h

+#ifndef _SURFACE_DEFORMATION_PLUGIN_H_
+#define _SURFACE_DEFORMATION_PLUGIN_H_
+
+#include "plugin_interaction.h"
+#include "surface_deformation_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> positionAttribute;
+
+	CellSelector<VERTEX>* lockedSelector;
+	CellSelector<VERTEX>* handleSelector;
+
+	bool initialized;
+
+	VertexAttribute<PFP2::VEC3> positionInit;
+	VertexAttribute<PFP2::VEC3> diffCoord;
+	VertexAttribute<Eigen_Matrix3f> vertexRotationMatrix;
+	VertexAttribute<PFP2::VEC3> rotatedDiffCoord;
+
+	VertexAttribute<unsigned int> vIndex;
+	unsigned int nb_vertices;
+
+	NLContext nlContext;
+};
+
+class Surface_Deformation_Plugin : public PluginInteraction
+{
+	Q_OBJECT
+	Q_INTERFACES(CGoGN::SCHNApps::Plugin)
+
+	friend class Surface_Deformation_DockTab;
+
+public:
+	Surface_Deformation_Plugin() :
+		m_dragging(false)
+	{}
+
+	~Surface_Deformation_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* 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) {}
+
+	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();
+
+public slots:
+	// slots for Python calls
+	void changePositionAttribute(const QString& map, const QString& name);
+	void changeLockedSelector(const QString& map, const QString& name);
+	void changeHandleSelector(const QString& map, const QString& name);
+
+protected:
+	void toggleMapDeformation(MapHandlerGen* map);
+	void matchDiffCoord(MapHandlerGen* map);
+	void asRigidAsPossible(MapHandlerGen* map);
+
+protected:
+	Surface_Deformation_DockTab* m_dockTab;
+	QHash<MapHandlerGen*, MapParameters> h_parameterSet;
+
+	bool m_dragging;
+	PFP2::REAL m_dragZ;
+	qglviewer::Vec m_dragPrevious;
+};
+
+} // namespace SCHNApps
+
+} // namespace CGoGN
+
+#endif

SCHNApps/Plugins/surface_deformation/include/surface_deformation_dockTab.h

+#ifndef _SURFACE_DEFORMATION_DOCK_TAB_H_
+#define _SURFACE_DEFORMATION_DOCK_TAB_H_
+
+#include "ui_surface_deformation.h"
+
+namespace CGoGN
+{
+
+namespace SCHNApps
+{
+
+class SCHNApps;
+class Surface_Deformation_Plugin;
+struct MapParameters;
+
+class Surface_Deformation_DockTab : public QWidget, public Ui::Surface_Deformation_TabWidget
+{
+	Q_OBJECT
+
+	friend class Surface_Deformation_Plugin;
+
+public:
+	Surface_Deformation_DockTab(SCHNApps* s, Surface_Deformation_Plugin* p);
+
+private:
+	SCHNApps* m_schnapps;
+	Surface_Deformation_Plugin* m_plugin;
+	bool b_updatingUI;
+
+private slots:
+	void positionAttributeChanged(int index);
+	void lockedSelectorChanged(int index);
+	void handleSelectorChanged(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_deformation/src/surface_deformation.cpp

+#include "surface_deformation.h"
+
+#include "Algo/Geometry/normal.h"
+#include "Algo/Geometry/laplacian.h"
+
+#include <QKeyEvent>
+#include <QMouseEvent>
+
+namespace CGoGN
+{
+
+namespace SCHNApps
+{
+
+MapParameters::MapParameters() :
+	lockedSelector(NULL),
+	handleSelector(NULL),
+	initialized(false),
+	nlContext(NULL)
+{}
+
+MapParameters::~MapParameters()
+{
+	if(nlContext)
+		nlDeleteContext(nlContext);
+}
+
+void MapParameters::start(MapHandlerGen* mh)
+{
+	if(!initialized)
+	{
+		if(positionAttribute.isValid() && lockedSelector && handleSelector)
+		{
+			positionInit = mh->getAttribute<PFP2::VEC3, VERTEX>("positionInit", false);
+			if(!positionInit.isValid())
+				positionInit = mh->addAttribute<PFP2::VEC3, VERTEX>("positionInit", false);
+
+			diffCoord = mh->getAttribute<PFP2::VEC3, VERTEX>("diffCoord", false);
+			if(!diffCoord.isValid())
+				diffCoord = mh->addAttribute<PFP2::VEC3, VERTEX>("diffCoord", false);
+
+			vertexRotationMatrix = mh->getAttribute<Eigen_Matrix3f, VERTEX>("vertexRotationMatrix", false);
+			if(!vertexRotationMatrix.isValid())
+				vertexRotationMatrix = mh->addAttribute<Eigen_Matrix3f, VERTEX>("vertexRotationMatrix", false);
+
+			rotatedDiffCoord = mh->getAttribute<PFP2::VEC3, VERTEX>("rotatedDiffCoord", false);
+			if(!rotatedDiffCoord.isValid())
+				rotatedDiffCoord = mh->addAttribute<PFP2::VEC3, VERTEX>("rotatedDiffCoord", false);
+
+			vIndex = mh->getAttribute<unsigned int, VERTEX>("vIndex", false);
+			if(!vIndex.isValid())
+				vIndex = mh->addAttribute<unsigned int, VERTEX>("vIndex", false);
+
+			PFP2::MAP* map = static_cast<MapHandler<PFP2>*>(mh)->getMap();
+
+			map->copyAttribute(positionInit, positionAttribute);
+
+			Algo::Surface::Geometry::computeLaplacianTopoVertices<PFP2>(*map, positionAttribute, diffCoord);
+
+			for(unsigned int i = vertexRotationMatrix.begin(); i != vertexRotationMatrix.end(); vertexRotationMatrix.next(i))
+				vertexRotationMatrix[i] = Eigen::Matrix3f::Identity();
+
+			nb_vertices = static_cast<AttribMap*>(map)->computeIndexCells<VERTEX>(vIndex);
+
+			if(nlContext)
+				nlDeleteContext(nlContext);
+			nlContext = nlNewContext();
+			nlSolverParameteri(NL_NB_VARIABLES, nb_vertices);
+			nlSolverParameteri(NL_LEAST_SQUARES, NL_TRUE);
+			nlSolverParameteri(NL_SOLVER, NL_CHOLMOD_EXT);
+
+			initialized = true;
+		}
+	}
+}
+
+void MapParameters::stop(MapHandlerGen* mh)
+{
+	if(initialized)
+	{
+//		if(positionInit.isValid())
+//			mh->removeAttribute(positionInit);
+
+//		if(diffCoord.isValid())
+//			mh->removeAttribute(diffCoord);
+
+//		if(vertexRotationMatrix.isValid())
+//			mh->removeAttribute(vertexRotationMatrix);
+
+//		if(rotatedDiffCoord.isValid())
+//			mh->removeAttribute(rotatedDiffCoord);
+
+//		if(vIndex.isValid())
+//			mh->removeAttribute(vIndex);
+
+		if(nlContext)
+			nlDeleteContext(nlContext);
+
+		initialized = false;
+	}
+}
+
+
+
+
+
+bool Surface_Deformation_Plugin::enable()
+{
+	m_dockTab = new Surface_Deformation_DockTab(m_schnapps, this);
+	m_schnapps->addPluginDockTab(this, m_dockTab, "Surface_Deformation");
+
+	connect(m_schnapps, SIGNAL(selectedMapChanged(MapHandlerGen*, MapHandlerGen*)), this, SLOT(selectedMapChanged(MapHandlerGen*, MapHandlerGen*)));
+	connect(m_schnapps, SIGNAL(mapAdded(MapHandlerGen*)), this, SLOT(mapAdded(MapHandlerGen*)));
+	connect(m_schnapps, SIGNAL(mapRemoved(MapHandlerGen*)), this, SLOT(mapRemoved(MapHandlerGen*)));
+
+	foreach(MapHandlerGen* map, m_schnapps->getMapSet().values())
+		mapAdded(map);
+
+	m_dockTab->updateMapParameters();
+
+	return true;
+}
+
+void Surface_Deformation_Plugin::disable()
+{
+	disconnect(m_schnapps, SIGNAL(selectedMapChanged(MapHandlerGen*, MapHandlerGen*)), this, SLOT(selectedMapChanged(MapHandlerGen*, MapHandlerGen*)));
+}
+
+void Surface_Deformation_Plugin::keyPress(View* view, QKeyEvent* event)
+{
+	switch(event->key())
+	{
+		case Qt::Key_D : {
+			MapHandlerGen* mh = m_schnapps->getSelectedMap();
+			const MapParameters& p = h_parameterSet[mh];
+			if(p.handleSelector && !p.handleSelector->getSelectedCells().empty())
+				m_dragging = !m_dragging;
+			break;
+		}
+		case Qt::Key_R : {
+//			ParameterSet* params = h_viewParams[view];
+//			MapHandlerGen* map = params->selectedMap;
+//			if(map)
+//			{
+//				asRigidAsPossible(view, map);
+//				PerMapParameterSet* perMap = params->perMap[map->getName()];
+//				params->selectedMap->notifyAttributeModification(perMap->positionAttribute);
+//				view->updateGL();
+//			}
+			break;
+		}
+	}
+}
+
+void Surface_Deformation_Plugin::mousePress(View* view, QMouseEvent* event)
+{
+	if(event->button() == Qt::LeftButton && m_dragging)
+	{
+		MapHandlerGen* mh = m_schnapps->getSelectedMap();
+		const MapParameters& p = h_parameterSet[mh];
+		const std::vector<Dart>& handle = p.handleSelector->getSelectedCells();
+
+		m_dragZ = 0;
+		for(std::vector<Dart>::const_iterator it = handle.begin(); it != handle.end(); ++it)
+		{
+			const PFP2::VEC3& pp = p.positionAttribute[*it];
+			qglviewer::Vec q = view->camera()->projectedCoordinatesOf(qglviewer::Vec(pp[0],pp[1],pp[2]));
+			m_dragZ += q.z;
+		}
+		m_dragZ /= handle.size();
+
+		qglviewer::Vec pp(event->x(), event->y(), m_dragZ);
+		m_dragPrevious = view->camera()->unprojectedCoordinatesOf(pp);
+	}
+}
+
+void Surface_Deformation_Plugin::mouseMove(View* view, QMouseEvent* event)
+{
+	if(m_dragging)
+	{
+		MapHandlerGen* mh = m_schnapps->getSelectedMap();
+		MapParameters& p = h_parameterSet[mh];
+		const std::vector<Dart>& handle = p.handleSelector->getSelectedCells();
+
+		qglviewer::Vec pp(event->x(), event->y(), m_dragZ);
+		qglviewer::Vec qq = view->camera()->unprojectedCoordinatesOf(pp);
+
+		qglviewer::Vec vec = qq - m_dragPrevious;
+		PFP2::VEC3 t(vec.x, vec.y, vec.z);
+		for(std::vector<Dart>::const_iterator it = handle.begin(); it != handle.end(); ++it)
+			p.positionAttribute[*it] += t;
+
+		m_dragPrevious = qq;
+
+//		matchDiffCoord(mh);
+//		asRigidAsPossible(mh);
+
+		mh->notifyAttributeModification(p.positionAttribute);
+
+		view->updateGL();
+	}
+}
+
+
+
+
+
+void Surface_Deformation_Plugin::selectedMapChanged(MapHandlerGen *prev, MapHandlerGen *cur)
+{
+	m_dockTab->updateMapParameters();
+}
+
+void Surface_Deformation_Plugin::mapAdded(MapHandlerGen* map)
+{
+	connect(map, SIGNAL(attributeAdded(unsigned int, const QString&)), this, SLOT(attributeAdded(unsigned int, const QString&)));
+	connect(map, SIGNAL(cellSelectorAdded(unsigned int, const QString&)), this, SLOT(cellSelectorAdded(unsigned int, const QString&)));
+	connect(map, SIGNAL(cellSelectorRemoved(unsigned int, const QString&)), this, SLOT(cellSelectorRemoved(unsigned int, const QString&)));
+}
+
+void Surface_Deformation_Plugin::mapRemoved(MapHandlerGen* map)
+{
+	disconnect(map, SIGNAL(attributeAdded(unsigned int, const QString&)), this, SLOT(attributeAdded(unsigned int, const QString&)));
+	disconnect(map, SIGNAL(cellSelectorAdded(unsigned int, const QString&)), this, SLOT(cellSelectorAdded(unsigned int, const QString&)));
+	disconnect(map, SIGNAL(cellSelectorRemoved(unsigned int, const QString&)), this, SLOT(cellSelectorRemoved(unsigned int, const QString&)));
+}
+
+
+
+
+
+void Surface_Deformation_Plugin::attributeAdded(unsigned int orbit, const QString& name)
+{
+	MapHandlerGen* map = static_cast<MapHandlerGen*>(QObject::sender());
+	if(orbit == VERTEX && map->isSelectedMap())
+		m_dockTab->addVertexAttribute(name);
+}
+
+void Surface_Deformation_Plugin::cellSelectorAdded(unsigned int orbit, const QString& name)
+{
+	MapHandlerGen* map = static_cast<MapHandlerGen*>(QObject::sender());
+
+	if(orbit == VERTEX && map->isSelectedMap())
+		m_dockTab->addVertexSelector(name);
+}
+
+void Surface_Deformation_Plugin::cellSelectorRemoved(unsigned int orbit, const QString& name)
+{
+	MapHandlerGen* map = static_cast<MapHandlerGen*>(QObject::sender());
+
+	if(orbit == VERTEX && map->isSelectedMap())
+		m_dockTab->removeVertexSelector(name);
+
+	MapParameters& p = h_parameterSet[map];
+	if(p.lockedSelector->getName() == name)
+	{
+		p.stop(map);
+		if(!p.initialized && map->isSelectedMap())
+			m_dockTab->mapParametersInitialized(false);
+		p.lockedSelector = NULL;
+	}
+	if(p.handleSelector->getName() == name)
+	{
+		p.stop(map);
+		if(!p.initialized && map->isSelectedMap())
+			m_dockTab->mapParametersInitialized(false);
+		p.handleSelector = NULL;
+	}
+}
+
+void Surface_Deformation_Plugin::selectedCellsChanged()
+{
+//	nlMakeCurrent(perMap->nlContext) ;
+//	nlReset(NL_FALSE) ;
+
+}
+
+
+
+
+
+void Surface_Deformation_Plugin::changePositionAttribute(const QString& map, const QString& name)
+{
+	MapHandlerGen* m = m_schnapps->getMap(map);
+	if(m)
+	{
+		MapParameters& p = h_parameterSet[m];
+		if(!p.initialized)
+		{
+			p.positionAttribute = m->getAttribute<PFP2::VEC3, VERTEX>(name);
+			if(m->isSelectedMap())
+				m_dockTab->updateMapParameters();
+		}
+	}
+}
+
+void Surface_Deformation_Plugin::changeLockedSelector(const QString& map, const QString& name)
+{
+	MapHandlerGen* m = m_schnapps->getMap(map);
+	if(m)
+	{
+		MapParameters& p = h_parameterSet[m];
+		if(!p.initialized)
+		{
+			p.lockedSelector = m->getCellSelector<VERTEX>(name);
+			if(m->isSelectedMap())
+				m_dockTab->updateMapParameters();
+		}
+	}