Commit 4b3eabf3 authored by Jan Möbius's avatar Jan Möbius

Python interface for holefiller

parent 27e98d35
include (plugin)
openflipper_plugin ( TRANSLATION_LANGUAGES de_DE
openflipper_plugin ( PYTHONINTERFACE
TRANSLATION_LANGUAGES de_DE
INSTALLDATA Icons VsiMetadata
TYPES POLYMESH TRIANGLEMESH)
......@@ -59,6 +59,7 @@ HoleFillerPlugin::HoleFillerPlugin() :
/// Initialize the toolbox widget
void HoleFillerPlugin::initializePlugin()
{
if ( OpenFlipper::Options::gui()) {
tool_ = new HoleFillerToolbarWidget();
QSize size(300, 300);
tool_->resize(size);
......@@ -73,22 +74,26 @@ void HoleFillerPlugin::initializePlugin()
QIcon* toolIcon = new QIcon(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"holefilling.png");
emit addToolbox( tr("Hole Filler") , tool_ , toolIcon);
}
}
/// add PickModes after initialization
void HoleFillerPlugin::pluginsInitialized()
{
if ( OpenFlipper::Options::gui()) {
emit addPickMode("Separator");
emit addPickMode("Hole Filler");
//build the tableWidget with headers
update_menu();
}
emit setSlotDescription("fillAllHoles(int)", tr("Fill all holes from a given Mesh"),
QString("objectId").split(","), QString("Id of the mesh").split(","));
emit setSlotDescription("fillHole(int,int)", tr("Fill a holes from a given Mesh where edgeHandle is on the boundary"),
QString("objectId,edgeHandle").split(","), QString("Id of the mesh,Handle of one boundary edge of the hole").split(","));
//build the tableWidget with headers
update_menu();
}
void HoleFillerPlugin::getSelectedHoles(std::vector<int>& _holeIds, std::vector<int>& _objIds)
......
......@@ -51,6 +51,7 @@
#include <OpenFlipper/BasePlugin/LoggingInterface.hh>
#include <OpenFlipper/BasePlugin/ScriptInterface.hh>
#include <OpenFlipper/BasePlugin/BackupInterface.hh>
#include <OpenFlipper/BasePlugin/PythonInterface.hh>
#include <OpenFlipper/common/Types.hh>
#include <ObjectTypes/PolyMesh/PolyMesh.hh>
#include <ObjectTypes/TriangleMesh/TriangleMesh.hh>
......@@ -60,7 +61,7 @@
class HoleFillerToolbarWidget;
class HoleFillerPlugin : public QObject, BaseInterface, MouseInterface, PickingInterface, ToolboxInterface, LoggingInterface, ScriptInterface, BackupInterface
class HoleFillerPlugin : public QObject, BaseInterface, MouseInterface, PickingInterface, ToolboxInterface, LoggingInterface, ScriptInterface, BackupInterface, PythonInterface
{
Q_OBJECT
Q_INTERFACES(BaseInterface)
......@@ -70,6 +71,7 @@ class HoleFillerPlugin : public QObject, BaseInterface, MouseInterface, PickingI
Q_INTERFACES(LoggingInterface)
Q_INTERFACES(ScriptInterface)
Q_INTERFACES(BackupInterface)
Q_INTERFACES(PythonInterface)
Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-HoleFilling")
signals:
......@@ -112,7 +114,7 @@ class HoleFillerPlugin : public QObject, BaseInterface, MouseInterface, PickingI
HoleFillerPlugin();
QString name() { return (QString("Hole Filler")); };
QString name() { return (QString("HoleFiller")); };
QString description( ) { return (QString("Fill Holes or connect meshes")); };
private slots:
......@@ -120,6 +122,9 @@ class HoleFillerPlugin : public QObject, BaseInterface, MouseInterface, PickingI
void slotCellDoubleClicked(int _row , int _col);
void slotFillSelection();
void noguiSupported( ) {} ;
private :
void update_menu();
......
/*===========================================================================*\
* *
* 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 <HoleFillerPlugin.hh>
#include <QString>
#include <QChar>
#include <QCoreApplication>
#include <OpenFlipper/BasePlugin/PythonFunctions.hh>
#include <OpenFlipper/PythonInterpreter/PythonTypeConversions.hh>
namespace py = pybind11;
PYBIND11_EMBEDDED_MODULE(HoleFiller, m) {
QObject* pluginPointer = getPluginPointer("HoleFiller");
if (!pluginPointer) {
std::cerr << "Error Getting plugin pointer for Plugin-HoleFilling" << std::endl;
return;
}
HoleFillerPlugin* plugin = qobject_cast<HoleFillerPlugin*>(pluginPointer);
if (!plugin) {
std::cerr << "Error converting plugin pointer for Plugin-HoleFilling" << 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_< HoleFillerPlugin,std::unique_ptr<HoleFillerPlugin, py::nodelete> > hole(m, "HoleFiller");
// 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.
hole.def(py::init([plugin]() { return plugin; }));
hole.def("fillAllHoles", &HoleFillerPlugin::fillAllHoles,
QCoreApplication::translate("PythonDocHoleFiller","Fills all holes of an object").toLatin1().data(),
py::arg(QCoreApplication::translate("PythonDocHoleFiller","Object id").toLatin1().data()) );
hole.def("fillHole", &HoleFillerPlugin::fillHole,
QCoreApplication::translate("PythonDocHoleFiller","Fills a given holes of an object identified by an edge").toLatin1().data(),
py::arg(QCoreApplication::translate("PythonDocHoleFiller","Object id").toLatin1().data()),
py::arg(QCoreApplication::translate("PythonDocHoleFiller","EdgeHandle id at a boundary of a hole").toLatin1().data()) );
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment