Extra dir for Models

CMakeLists.txt

@@ -8,7 +8,7 @@ if(APPLE)
 endif()
 
 openflipper_plugin (INSTALLDATA Icons  
-                    DIRS OpenMesh OpenVolumeMesh Widgets ScriptObjects Toolbars
+                    DIRS OpenMesh OpenVolumeMesh Widgets ScriptObjects Toolbars Models PropertyVisualizer
                     DEPS OpenMesh 
                     OPTDEPS OpenVolumeMesh
                     OPT_TYPES SKELETON BSPLINECURVE POLYHEDRALMESH HEXAHEDRALMESH TETRAHEDRALMESH

MultiObjectPropertyModel.cc → Models/MultiObjectPropertyModel.cc

@@ -56,6 +56,8 @@
 #include "OpenVolumeMesh/OVMPropertyModelT.hh"
 #endif
 
+#include "OpenFlipper/common/DataTypes.hh"
+
 MultiObjectPropertyModel::MultiObjectPropertyModel(const QStringList& res, QObject *parent) :
     PropertyModel(parent), restriction(res), datatypes(supportedDataTypes()), widget(0)
 {

MultiObjectPropertyModel.hh → Models/MultiObjectPropertyModel.hh

@@ -51,9 +51,10 @@
 #define MULTI_OBJECT_PROPERTY_MODEL_H
 
 #include "PropertyModel.hh"
-#include "OpenFlipper/common/DataTypes.hh"
+
 
 class PropertyVisualizer;
+class DataType;
 
 class MultiObjectPropertyModel: public PropertyModel
 {

ObjectListItemModel.cc → Models/ObjectListItemModel.cc

@@ -50,6 +50,7 @@
 #include "ObjectListItemModel.hh"
 
 #include <OpenFlipper/BasePlugin/PluginFunctions.hh>
+#include <OpenFlipper/common/DataTypes.hh>
 
 ObjectListItemModel::ObjectListItemModel() {
 }

ObjectListItemModel.hh → Models/ObjectListItemModel.hh

@@ -51,7 +51,8 @@
 #define OBJECTLISTITEMMODEL_HH_
 
 #include <QAbstractItemModel>
-#include <OpenFlipper/common/DataTypes.hh>
+
+class DataType;
 
 class ObjectListItemModel: public QAbstractListModel {
     public:

SingleObjectPropertyModel.hh → Models/SingleObjectPropertyModel.hh

@@ -50,8 +50,8 @@
 #ifndef SINGLE_OBJECT_PROPERTY_MODEL_H
 #define SINGLE_OBJECT_PROPERTY_MODEL_H
 
-#include "PropertyModel.hh"
-#include "PropertyVisualizer.hh"
+#include "Models/PropertyModel.hh"
+#include "PropertyVisualizer/PropertyVisualizer.hh"
 
 #include <OpenFlipper/BasePlugin/BaseInterface.hh>
 #include <OpenFlipper/BasePlugin/PickingInterface.hh>

OpenMesh/OMPropertyModel.hh

@@ -50,7 +50,7 @@
 #ifndef OM_PROPERTY_MODEL_H
 #define OM_PROPERTY_MODEL_H
 
-#include "SingleObjectPropertyModel.hh"
+#include "Models/SingleObjectPropertyModel.hh"
 #include "OMPropertyVisualizer.hh"
 
 #include "Widgets/LoadSaveWidget.hh"

OpenMesh/OMPropertyVisualizer.hh

@@ -50,7 +50,7 @@
 #ifndef OM_PROPERTY_VISUALIZER_HH
 #define OM_PROPERTY_VISUALIZER_HH
 
-#include "../PropertyVisualizer.hh"
+#include "PropertyVisualizer/PropertyVisualizer.hh"
 
 #include <ObjectTypes/TriangleMesh/TriangleMesh.hh>
 #include <ObjectTypes/PolyMesh/PolyMesh.hh>

OpenVolumeMesh/OVMPropertyModelSubclass.hh

@@ -50,7 +50,7 @@
 
 #pragma once
 
-#include "SingleObjectPropertyModel.hh"
+#include "Models/SingleObjectPropertyModel.hh"
 
 
 /* This class adds signal/slot support for OVMPropertyModelSubclass. This needs

OpenVolumeMesh/OVMPropertyVisualizer.hh

@@ -51,7 +51,7 @@
 #ifndef OVM_PROPERTY_VISUALIZER_HH
 #define OVM_PROPERTY_VISUALIZER_HH
 
-#include "../PropertyVisualizer.hh"
+#include "PropertyVisualizer/PropertyVisualizer.hh"
 
 #include <ObjectTypes/VolumeMeshObject/VolumeMeshObject.hh>
 

PropertyVisPlugin.cc

@@ -57,8 +57,8 @@
 
 #include "PropertyVisPlugin.hh"
 
-#include "PropertyModelFactory.hh"
-#include "SingleObjectPropertyModel.hh"
+#include "Models/PropertyModelFactory.hh"
+#include "Models/SingleObjectPropertyModel.hh"
 
 #ifdef ENABLE_POLYHEDRALMESH_SUPPORT
     #include <ObjectTypes/PolyhedralMesh/PolyhedralMesh.hh>

PropertyVisPlugin.hh

@@ -78,9 +78,9 @@
 #include <OpenFlipper/BasePlugin/LoggingInterface.hh>
 
 #include "Toolbars/PropertyVisToolbar.hh"
-#include "ObjectListItemModel.hh"
+#include "Models/ObjectListItemModel.hh"
 
-#include "PropertyModel.hh"
+#include "Models/PropertyModel.hh"
 
 //== CLASS DEFINITION =========================================================