Commit a4c79bc6 authored by Martin Schultz's avatar Martin Schultz

fixed missing Types in CMakeLists of Merge plugin.

 fixed cppCheck issues in Merge Plugin
parent 683299e9
include (plugin)
if (WIN32)
openflipper_plugin (DEPS CGAL Boost GMM LAPACK BLAS)
openflipper_plugin (TYPES TRIANGLEMESH POLYMESH DEPS CGAL Boost GMM LAPACK BLAS)
else ()
openflipper_plugin (DEPS GMM LAPACK BLAS)
openflipper_plugin (TYPES TRIANGLEMESH POLYMESH DEPS GMM LAPACK BLAS)
endif ()
......@@ -139,7 +139,7 @@ void MergePlugin::pluginsInitialized()
QString(" vector of BaseObjectData* containing Poly or TriMeshes to be merged, name for the merged object, flag to remove separated objects default is true").split(","));
}
int MergePlugin::mergeObjects(const std::vector< BaseObjectData* > _objects, QString _name, bool _deleteSeparateObjects)
int MergePlugin::mergeObjects(const std::vector< BaseObjectData* > & _objects, QString _name, bool _deleteSeparateObjects)
{
int result = -1;
if (_objects.size() < 2)
......@@ -147,7 +147,6 @@ int MergePlugin::mergeObjects(const std::vector< BaseObjectData* > _objects, QSt
objects = _objects;
//check dataType
DataType type = checkType(objects);
......@@ -161,7 +160,6 @@ int MergePlugin::mergeObjects(const std::vector< BaseObjectData* > _objects, QSt
TriMesh* triMergePtr;
PolyMesh* polyMergePtr;
emit addEmptyObject(DATA_POLY_MESH, polyMergeID);
PluginFunctions::getMesh(polyMergeID, polyMergePtr);
polyMeshes.push_back(polyMergePtr);
......
......@@ -61,6 +61,7 @@ signals:
public :
MergePlugin() {};
~MergePlugin() {};
QString name() { return (QString("Merge")); };
......@@ -80,7 +81,7 @@ public slots:
void pluginsInitialized();
void mergeObjects();
int mergeObjects(const std::vector< BaseObjectData* > _objects, QString _name = "merged object", bool _deleteSeparateObjects = true);
int mergeObjects(const std::vector< BaseObjectData* > & _objects, QString _name = "merged object", bool _deleteSeparateObjects = true);
void slotCleanup(DataType _type, bool _deleteSeparateObjects);
//template functions
......
......@@ -6,6 +6,6 @@ class MergeToolBox : public QWidget, public Ui::MergeTool
Q_OBJECT
public:
MergeToolBox(QWidget *parent = 0);
explicit MergeToolBox(QWidget *parent = 0);
};
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