Commit cb1a55c0 authored by Max Lyon's avatar Max Lyon

Merge branch 'master' into TetrahedralMeshSupport

Conflicts:
	Plugin-PropertyVis/PropertyVisPlugin.cc
	libs_required/OpenVolumeMesh
parents 6b476b72 d1a3190f
......@@ -52,9 +52,6 @@
#include "PropertyModelFactory.hh"
#include "OpenMesh/OMPropertyModel.hh"
#include "OpenVolumeMesh/OVMPropertyModel.hh"
#include "OpenVolumeMesh/Mesh/HexahedralMesh.hh"
#include "Utils.hh"
MultiObjectPropertyModel::MultiObjectPropertyModel(const QStringList& res, QObject *parent) :
PropertyModel(parent), restriction(res), datatypes(supportedDataTypes()), widget(0)
......
......@@ -49,8 +49,6 @@
#include "ObjectListItemModel.hh"
#include <algorithm>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
ObjectListItemModel::ObjectListItemModel() {
......
......@@ -49,23 +49,17 @@
#include "PropertyModelFactory.hh"
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include "MultiObjectPropertyModel.hh"
#include "OpenMesh/OMPropertyModel.hh"
#include <ObjectTypes/TriangleMesh/TriangleMesh.hh>
#include <ObjectTypes/PolyMesh/PolyMesh.hh>
#ifdef ENABLE_OPENVOLUMEMESH_SUPPORT
#include "OpenVolumeMesh/OVMPropertyModel.hh"
#endif /* ENABLE_OPENVOLUMEMESH_SUPPORT */
#ifdef ENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT
#include <ObjectTypes/PolyhedralMesh/PolyhedralMesh.hh>
#endif /* ENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT */
#ifdef ENABLE_OPENVOLUMEMESH_HEXAHEDRAL_SUPPORT
#include <ObjectTypes/HexahedralMesh/HexahedralMesh.hh>
#endif /* ENABLE_OPENVOLUMEMESH_HEXAHEDRAL_SUPPORT */
#ifdef ENABLE_OPENVOLUMEMESH_TETRAHEDRAL_SUPPORT
......
......@@ -52,9 +52,7 @@
#include <OpenMesh/Core/Utils/Property.hh>
#include <ACG/Math/VectorT.hh>
#include <map>
#include <iostream>
#include <vector>
const PropertyNameListModel::TypeInfoWrapper PropertyNameListModel::proptype_bool =
PropertyNameListModel::TypeInfoWrapper(typeid(OpenMesh::PropertyT<bool>), "bool");
......
......@@ -57,24 +57,8 @@
#include "PropertyVisPlugin.hh"
#include <Qt>
#include <QSpacerItem>
#include <QFileDialog>
#include <iostream>
#include <vector>
#include <algorithm>
#include <cmath>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <ACG/Utils/ColorCoder.hh>
#include "PropertyModelFactory.hh"
#include <ObjectTypes/TriangleMesh/TriangleMesh.hh>
#include <ObjectTypes/PolyMesh/PolyMesh.hh>
#ifdef ENABLE_OPENVOLUMEMESH_POLYHEDRAL_SUPPORT
#include <ObjectTypes/PolyhedralMesh/PolyhedralMesh.hh>
#endif
......
......@@ -49,10 +49,6 @@
#include "PropertyVisualizer.hh"
#include <iostream>
#include <QStringList>
/*! \brief Visualizes the property
*
* This method should be implemented by a subclass that specializes on visualizing
......
......@@ -49,8 +49,6 @@
#include "SingleObjectPropertyModel.hh"
#include <algorithm>
SingleObjectPropertyModel::SingleObjectPropertyModel(QObject *parent)
: PropertyModel(parent),
widgets(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