Commit d507ae2b authored by Martin Heistermann's avatar Martin Heistermann
Browse files

Fix ODR (and property name) conflict with Plugin-Smoother

parent 9eeed579
...@@ -49,24 +49,24 @@ ...@@ -49,24 +49,24 @@
#include "SmootherPlugin.hh" #include "SimpleSmootherPlugin.hh"
#include <ObjectTypes/PolyMesh/PolyMesh.hh> #include <ObjectTypes/PolyMesh/PolyMesh.hh>
#include <ObjectTypes/TriangleMesh/TriangleMesh.hh> #include <ObjectTypes/TriangleMesh/TriangleMesh.hh>
SmootherPlugin::SmootherPlugin() : SimpleSmootherPlugin::SimpleSmootherPlugin() :
iterationsSpinbox_(0) iterationsSpinbox_(0)
{ {
} }
SmootherPlugin::~SmootherPlugin() SimpleSmootherPlugin::~SimpleSmootherPlugin()
{ {
} }
void SmootherPlugin::initializePlugin() void SimpleSmootherPlugin::initializePlugin()
{ {
// Create the Toolbox Widget // Create the Toolbox Widget
QWidget* toolBox = new QWidget(); QWidget* toolBox = new QWidget();
...@@ -99,7 +99,7 @@ void SmootherPlugin::initializePlugin() ...@@ -99,7 +99,7 @@ void SmootherPlugin::initializePlugin()
emit addToolbox( tr("Simple Smoother") , toolBox, toolIcon ); emit addToolbox( tr("Simple Smoother") , toolBox, toolIcon );
} }
void SmootherPlugin::pluginsInitialized() { void SimpleSmootherPlugin::pluginsInitialized() {
// Emit slot description // Emit slot description
emit setSlotDescription(tr("simpleLaplace(int)"), tr("Smooth mesh using the Laplace operator with uniform weights."), emit setSlotDescription(tr("simpleLaplace(int)"), tr("Smooth mesh using the Laplace operator with uniform weights."),
...@@ -111,7 +111,7 @@ void SmootherPlugin::pluginsInitialized() { ...@@ -111,7 +111,7 @@ void SmootherPlugin::pluginsInitialized() {
* Smooth mesh using the Laplace operator * Smooth mesh using the Laplace operator
* with uniform weights. * with uniform weights.
*/ */
void SmootherPlugin::simpleLaplace() { void SimpleSmootherPlugin::simpleLaplace() {
int iterations = 1; int iterations = 1;
...@@ -129,7 +129,7 @@ void SmootherPlugin::simpleLaplace() { ...@@ -129,7 +129,7 @@ void SmootherPlugin::simpleLaplace() {
* *
* @param _iterations Number of iterations * @param _iterations Number of iterations
*/ */
void SmootherPlugin::simpleLaplace(int _iterations) { void SimpleSmootherPlugin::simpleLaplace(int _iterations) {
for ( PluginFunctions::ObjectIterator o_it(PluginFunctions::TARGET_OBJECTS) ; o_it != PluginFunctions::objectsEnd(); ++o_it) { for ( PluginFunctions::ObjectIterator o_it(PluginFunctions::TARGET_OBJECTS) ; o_it != PluginFunctions::objectsEnd(); ++o_it) {
...@@ -144,7 +144,7 @@ void SmootherPlugin::simpleLaplace(int _iterations) { ...@@ -144,7 +144,7 @@ void SmootherPlugin::simpleLaplace(int _iterations) {
OpenMesh::VPropHandleT< TriMesh::Point > origPositions; OpenMesh::VPropHandleT< TriMesh::Point > origPositions;
// Add a property to the mesh to store original vertex positions // Add a property to the mesh to store original vertex positions
mesh->add_property( origPositions, "SmootherPlugin_Original_Positions" ); mesh->add_property( origPositions, "SimpleSmootherPlugin_Original_Positions" );
for ( int i = 0 ; i < _iterations ; ++i ) { for ( int i = 0 ; i < _iterations ; ++i ) {
...@@ -213,7 +213,7 @@ void SmootherPlugin::simpleLaplace(int _iterations) { ...@@ -213,7 +213,7 @@ void SmootherPlugin::simpleLaplace(int _iterations) {
OpenMesh::VPropHandleT< TriMesh::Point > origPositions; OpenMesh::VPropHandleT< TriMesh::Point > origPositions;
// Add a property to the mesh to store original vertex positions // Add a property to the mesh to store original vertex positions
mesh->add_property( origPositions, "SmootherPlugin_Original_Positions" ); mesh->add_property( origPositions, "SimpleSmootherPlugin_Original_Positions" );
for ( int i = 0 ; i < _iterations ; ++i ) { for ( int i = 0 ; i < _iterations ; ++i ) {
...@@ -287,7 +287,7 @@ void SmootherPlugin::simpleLaplace(int _iterations) { ...@@ -287,7 +287,7 @@ void SmootherPlugin::simpleLaplace(int _iterations) {
#if QT_VERSION < 0x050000 #if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2( smootherplugin , SmootherPlugin ); Q_EXPORT_PLUGIN2( smootherplugin , SimpleSmootherPlugin );
#endif #endif
......
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
#include <OpenFlipper/BasePlugin/BackupInterface.hh> #include <OpenFlipper/BasePlugin/BackupInterface.hh>
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
class SmootherPlugin : public QObject, BaseInterface, ToolboxInterface, LoggingInterface, ScriptInterface, BackupInterface class SimpleSmootherPlugin : public QObject, BaseInterface, ToolboxInterface, LoggingInterface, ScriptInterface, BackupInterface
{ {
Q_OBJECT Q_OBJECT
Q_INTERFACES(BaseInterface) Q_INTERFACES(BaseInterface)
...@@ -95,8 +95,8 @@ class SmootherPlugin : public QObject, BaseInterface, ToolboxInterface, LoggingI ...@@ -95,8 +95,8 @@ class SmootherPlugin : public QObject, BaseInterface, ToolboxInterface, LoggingI
public: public:
SmootherPlugin(); SimpleSmootherPlugin();
~SmootherPlugin(); ~SimpleSmootherPlugin();
// BaseInterface // BaseInterface
QString name() { return (QString("Simple Smoother")); }; QString name() { return (QString("Simple Smoother")); };
......
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