Commit 862933e9 authored by Martin Heistermann's avatar Martin Heistermann

resolve ODR violation with Plugin-Remesher

parent dd1b47bb
......@@ -53,7 +53,7 @@
#include <QObject>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
class ProgressEmitter : public QObject
class IsoRemesherProgressEmitter : public QObject
{
Q_OBJECT
......@@ -62,7 +62,7 @@ class ProgressEmitter : public QObject
void changeDescription(QString _jobId, QString _description);
public:
explicit ProgressEmitter(QString _jobId) : jobId_(_jobId) {}
explicit IsoRemesherProgressEmitter(QString _jobId) : jobId_(_jobId) {}
void sendProgressSignal(double _percent) {
emit signalJobState(jobId_, (int)_percent);
......
......@@ -104,7 +104,7 @@ void IsotropicRemesherPlugin::slotRemesh(){
if ( o_it->dataType(DATA_TRIANGLE_MESH) ) {
TriMesh* mesh = PluginFunctions::triMesh(o_it);
ProgressEmitter prgEmt(name() + "IsotropicRemesh");
IsoRemesherProgressEmitter prgEmt(name() + "IsotropicRemesh");
connect (&prgEmt, SIGNAL(changeDescription(QString,QString)), this, SIGNAL(setJobDescription(QString,QString)) );
connect (&prgEmt, SIGNAL(signalJobState(QString,int)), this, SIGNAL(setJobState(QString,int)) );
IsotropicRemesher< TriMesh > remesher(&prgEmt);
......
......@@ -62,7 +62,7 @@
#include <ObjectTypes/TriangleMesh/TriangleMesh.hh>
#include "IsotropicRemesherToolbox.hh"
#include "ProgressEmitter.hh"
#include "IsoRemesherProgressEmitter.hh"
#if QT_VERSION >= 0x050000
#include <QtWidgets>
......
......@@ -49,7 +49,7 @@
#ifndef ISOTROPICREMESHER_HH
#define ISOTROPICREMESHER_HH
#include "ProgressEmitter.hh"
#include "IsoRemesherProgressEmitter.hh"
template< class MeshT >
......@@ -57,7 +57,7 @@ class IsotropicRemesher{
public:
explicit IsotropicRemesher(ProgressEmitter* _prgEmt = NULL) : prgEmt_(_prgEmt) {};
explicit IsotropicRemesher(IsoRemesherProgressEmitter* _prgEmt = NULL) : prgEmt_(_prgEmt) {};
~IsotropicRemesher() {};
void remesh( MeshT& _mesh, const double _targetEdgeLength );
......@@ -95,7 +95,7 @@ private:
bool isFeature( MeshT& _mesh, const typename MeshT::VertexHandle& _vh);
private:
ProgressEmitter* prgEmt_;
IsoRemesherProgressEmitter* prgEmt_;
};
//=============================================================================
......
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