Merge branch 'master' of...

Merge branch 'master' of https://www.graphics.rwth-aachen.de:9000/OpenFlipper-Free/Plugin-Subdivider

CMakeLists.txt

 include (plugin)
-openflipper_plugin (INSTALLDATA VsiMetadata Icons
+openflipper_plugin (PYTHONINTERFACE
+                    INSTALLDATA VsiMetadata Icons
                     TYPES POLYMESH TRIANGLEMESH)

PythonInterface/Python.cc

+/*===========================================================================*\
+*                                                                            *
+*                              OpenFlipper                                   *
+ *           Copyright (c) 2001-2015, RWTH-Aachen University                 *
+ *           Department of Computer Graphics and Multimedia                  *
+ *                          All rights reserved.                             *
+ *                            www.openflipper.org                            *
+ *                                                                           *
+ *---------------------------------------------------------------------------*
+ * This file is part of OpenFlipper.                                         *
+ *---------------------------------------------------------------------------*
+ *                                                                           *
+ * Redistribution and use in source and binary forms, with or without        *
+ * modification, are permitted provided that the following conditions        *
+ * are met:                                                                  *
+ *                                                                           *
+ * 1. Redistributions of source code must retain the above copyright notice, *
+ *    this list of conditions and the following disclaimer.                  *
+ *                                                                           *
+ * 2. Redistributions in binary form must reproduce the above copyright      *
+ *    notice, this list of conditions and the following disclaimer in the    *
+ *    documentation and/or other materials provided with the distribution.   *
+ *                                                                           *
+ * 3. Neither the name of the copyright holder nor the names of its          *
+ *    contributors may be used to endorse or promote products derived from   *
+ *    this software without specific prior written permission.               *
+ *                                                                           *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS       *
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED *
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A           *
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER *
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,  *
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,       *
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR        *
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF    *
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING      *
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS        *
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.              *
+*                                                                            *
+\*===========================================================================*/
+
+
+#include <pybind11/include/pybind11/pybind11.h>
+#include <pybind11/include/pybind11/embed.h>
+
+
+#include <SubdividerPlugin.hh>
+#include <OpenFlipper/BasePlugin/PythonFunctions.hh>
+#include <OpenFlipper/PythonInterpreter/PythonTypeConversions.hh>
+
+namespace py = pybind11;
+
+PYBIND11_EMBEDDED_MODULE(Subdivider, m) {
+
+  QObject* pluginPointer = getPluginPointer("Subdivider");
+
+  if (!pluginPointer) {
+     std::cerr << "Error Getting plugin pointer for Plugin-Subdivider" << std::endl;
+     return;
+   }
+
+    SubdividerPlugin* plugin = qobject_cast<SubdividerPlugin*>(pluginPointer);
+
+  if (!plugin) {
+    std::cerr << "Error converting plugin pointer for Plugin-Subdivider" << std::endl;
+    return;
+  }
+
+  // Export our core. Make sure that the c++ worlds core object is not deleted if
+  // the python side gets deleted!!
+
+  py::class_< SubdividerPlugin,std::unique_ptr<SubdividerPlugin, py::nodelete> > sub(m, "Subdivider");
+
+  // On the c++ side we will just return the existing core instance
+  // and prevent the system to recreate a new core as we need
+  // to work on the existing one.
+    sub.def(py::init([plugin]() { return plugin; }));
+
+    sub.def("subdivide",   &SubdividerPlugin::subdivide,
+            QCoreApplication::translate("PythonDocSub","Subdivides the specified object").toLatin1().data(),
+            py::arg(QCoreApplication::translate("PythonDocSub","ObjectID").toLatin1().data()),
+            py::arg(QCoreApplication::translate("PythonDocSub","Algorithm - possible values: loop,sqrt3,interpolating_sqrt3,modifiedButterfly").toLatin1().data()),
+            py::arg(QCoreApplication::translate("PythonDocSub","Steps").toLatin1().data()),
+            py::arg(QCoreApplication::translate("PythonDocSub","Update points").toLatin1().data()));
+
+    sub.def("simpleSubdivide",   &SubdividerPlugin::simpleSubdivide,
+            QCoreApplication::translate("PythonDocSub","Subdivides the specified object").toLatin1().data(),
+            py::arg(QCoreApplication::translate("PythonDocSub","ObjectID").toLatin1().data()),
+            py::arg(QCoreApplication::translate("PythonDocSub","Algorithm - possible values: longest").toLatin1().data()),
+            py::arg(QCoreApplication::translate("PythonDocSub","Steps").toLatin1().data()),
+            py::arg(QCoreApplication::translate("PythonDocSub","Additional Parameter").toLatin1().data()),
+            py::arg(QCoreApplication::translate("PythonDocSub","Update points").toLatin1().data()));
+
+}

SubdividerPlugin.hh

@@ -54,14 +54,14 @@
 #include <OpenFlipper/BasePlugin/BackupInterface.hh>
 #include <OpenFlipper/BasePlugin/ScriptInterface.hh>
 #include <OpenFlipper/BasePlugin/LoadSaveInterface.hh>
-#include <OpenFlipper/BasePlugin/BackupInterface.hh>
+#include <OpenFlipper/BasePlugin/PythonInterface.hh>
 #include <OpenFlipper/common/Types.hh>
 #include <ObjectTypes/TriangleMesh/TriangleMesh.hh>
 #include <ObjectTypes/PolyMesh/PolyMesh.hh>
 
 #include "subdividerToolbar.hh"
 
-class SubdividerPlugin : public QObject, BaseInterface , ToolboxInterface, LoggingInterface, LoadSaveInterface, ScriptInterface, BackupInterface
+class SubdividerPlugin : public QObject, BaseInterface , ToolboxInterface, LoggingInterface, LoadSaveInterface, ScriptInterface, BackupInterface, PythonInterface
 {
   Q_OBJECT
   Q_INTERFACES(BaseInterface)
@@ -70,6 +70,7 @@ class SubdividerPlugin : public QObject, BaseInterface , ToolboxInterface, Loggi
   Q_INTERFACES(LoadSaveInterface)
   Q_INTERFACES(ScriptInterface)
   Q_INTERFACES(BackupInterface)
+  Q_INTERFACES(PythonInterface)
 
   Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-Subdivider")
 

VsiMetadata/subdivider.xml

@@ -24,7 +24,7 @@
       </input>
     </inputs>
     <code>
-      subdivider.subdivide([input="obj"],"loop",[input="steps"],[input="update"]);
+      Subdivider.Subdivider().subdivide([input="obj"],"loop",[input="steps"],[input="update"]);
     </code>
   </element>
   <element name="sqrt3_subdivider">
@@ -52,7 +52,7 @@
       </input>
     </inputs>
     <code>
-      subdivider.subdivide([input="obj"],"sqrt3",[input="steps"],[input="update"]);
+      Subdivider.Subdivider().subdivide([input="obj"],"sqrt3",[input="steps"],[input="update"]);
     </code>
   </element>
   <element name="interpolating_sqrt3_subdivider">
@@ -80,7 +80,7 @@
       </input>     
     </inputs>
     <code>
-      subdivider.subdivide([input="obj"],"interpolating_sqrt3",[input="steps"],[input="update"]);
+      Subdivider.Subdivider().subdivide([input="obj"],"interpolating_sqrt3",[input="steps"],[input="update"]);
     </code>
   </element>  
   <element name="modifiedButterfly_subdivider">
@@ -108,7 +108,7 @@
       </input>     
     </inputs>
     <code>
-      subdivider.subdivide([input="obj"],"modifiedButterfly",[input="steps"],[input="update"]);
+      Subdivider.Subdivider().subdivide([input="obj"],"modifiedButterfly",[input="steps"],[input="update"]);
     </code>
   </element>     
      <element name="longestEdgeSplit_subdivider">
@@ -141,7 +141,7 @@
       </input>     
     </inputs>
     <code>
-      subdivider.simpleSubdivide([input="obj"],"longest",[input="steps"],[input="max_length"],[input="update"]);
+      Subdivider.Subdivider().simpleSubdivide([input="obj"],"longest",[input="steps"],[input="max_length"],[input="update"]);
     </code>
   </element>  
 </OpenFlipper>