From f619bfe2fda758afc8905db543e37391507d9195 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Wed, 28 Dec 2016 12:26:51 +0100 Subject: [PATCH] Splitted OpenVolumemesh into separate type dir --- CMakeLists.txt | 24 +++--------------------- PrimitivesGenerator.cc | 12 ++++++------ PrimitivesGenerator.hh | 6 +++--- TetrahedralCuboidGenerator.cc | 2 +- 4 files changed, 13 insertions(+), 31 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c91a52..6a013da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,24 +1,6 @@ include (plugin) -SET( CURRENT_PLUGIN_DEPS "") - -if (EXISTS ${CMAKE_SOURCE_DIR}/ObjectTypes/PolyhedralMesh) - add_definitions (-DENABLE_OPENVOLUMEMESH_SUPPORT) - add_definitions (-DENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT) - - list( APPEND CURRENT_PLUGIN_DEPS OpenVolumeMesh ) -endif() - -if (EXISTS ${CMAKE_SOURCE_DIR}/ObjectTypes/HexahedralMesh) - add_definitions (-DENABLE_OPENVOLUMEMESH_SUPPORT) - add_definitions (-DENABLE_OPENVOLUMEMESH_HEXAHEDRAL_SUPPORT) - - list( APPEND CURRENT_PLUGIN_DEPS OpenVolumeMesh ) -endif() - -list(REMOVE_DUPLICATES CURRENT_PLUGIN_DEPS ) - -openflipper_plugin ( DEPS ${CURRENT_PLUGIN_DEPS} - INSTALLDATA Icons +openflipper_plugin ( INSTALLDATA Icons + OPTDEPS OpenVolumeMesh TYPES POLYMESH TRIANGLEMESH - OPT_TYPES BSPLINESURFACE BSPLINECURVE) + OPT_TYPES BSPLINESURFACE BSPLINECURVE HEXAHEDRALMESH POLYHEDRALMESH) diff --git a/PrimitivesGenerator.cc b/PrimitivesGenerator.cc index f77e54e..ed7d188 100644 --- a/PrimitivesGenerator.cc +++ b/PrimitivesGenerator.cc @@ -51,7 +51,7 @@ #include "PrimitivesGenerator.hh" -#ifdef ENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT +#ifdef ENABLE_POLYHEDRALMESH_SUPPORT #include "TetrahedralCuboidGenerator.hh" #endif @@ -143,7 +143,7 @@ void PrimitivesGeneratorPlugin::initializePlugin() QString("Center position,Number of control points").split(",")); #endif -#ifdef ENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT +#ifdef ENABLE_POLYHEDRALMESH_SUPPORT emit setSlotDescription("addTetrahedralCube(Vector,double)", tr("Generates a tetrahedral mesh of a cube (ObjectId is returned)"), QString("Position,Length").split(","), @@ -214,7 +214,7 @@ void PrimitivesGeneratorPlugin::pluginsInitialized() { whatsThisGen.setWhatsThis(action,tr("Create a random B-spline surface."),"B-spline surface"); #endif -#ifdef ENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT +#ifdef ENABLE_POLYHEDRALMESH_SUPPORT action = primitivesMenu_->addAction("Cube (Tetrahedral Mesh)" ,this,SLOT(addTetrahedralCube())); action->setIcon(QIcon(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"primitive_cube.png")); whatsThisGen.setWhatsThis(action,tr("Create a Tetrahedral Cube."), "Cube"); @@ -256,7 +256,7 @@ int PrimitivesGeneratorPlugin::addPolyMesh() { } -#ifdef ENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT +#ifdef ENABLE_POLYHEDRALMESH_SUPPORT int PrimitivesGeneratorPlugin::addPolyhedralMesh() { int objectId = -1; @@ -382,7 +382,7 @@ int PrimitivesGeneratorPlugin::addTriangulatedCube(const Vector& _position,const // Tetrahedral cube //======================================================================== -#ifdef ENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT +#ifdef ENABLE_POLYHEDRALMESH_SUPPORT int PrimitivesGeneratorPlugin::addTetrahedralCube(const Vector& _position, const double _length) { @@ -395,7 +395,7 @@ int PrimitivesGeneratorPlugin::addTetrahedralCube(const Vector& _position, const // Tetrahedral Cuboid //======================================================================== -#ifdef ENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT +#ifdef ENABLE_POLYHEDRALMESH_SUPPORT int PrimitivesGeneratorPlugin::addTetrahedralCuboid(const Vector& _position, const Vector& _length, const unsigned int n_x, const unsigned int n_y, const unsigned int n_z) diff --git a/PrimitivesGenerator.hh b/PrimitivesGenerator.hh index 7a47723..67dc31f 100644 --- a/PrimitivesGenerator.hh +++ b/PrimitivesGenerator.hh @@ -61,7 +61,7 @@ #include #include -#ifdef ENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT +#ifdef ENABLE_POLYHEDRALMESH_SUPPORT #include #endif @@ -160,7 +160,7 @@ public slots: int addRandomBSplineSurface(const Vector& _position = Vector(0, 0, 0), int nDiv = 5); #endif -#ifdef ENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT +#ifdef ENABLE_POLYHEDRALMESH_SUPPORT int addTetrahedralCube(const Vector& _position = Vector(0.0,0.0,0.0), const double _length = 2.0); @@ -177,7 +177,7 @@ private: // construct Octahedron in triMesh_ void constructOctahedron(const Vector& _position, const double _length); -#ifdef ENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT +#ifdef ENABLE_POLYHEDRALMESH_SUPPORT int addPolyhedralMesh(); #endif diff --git a/TetrahedralCuboidGenerator.cc b/TetrahedralCuboidGenerator.cc index c9fcc5b..8a4c7fe 100644 --- a/TetrahedralCuboidGenerator.cc +++ b/TetrahedralCuboidGenerator.cc @@ -47,7 +47,7 @@ * * \*===========================================================================*/ -#ifdef ENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT +#ifdef ENABLE_POLYHEDRALMESH_SUPPORT #include "TetrahedralCuboidGenerator.hh" -- 2.22.0