Commit e7813e24 authored by Jan Möbius's avatar Jan Möbius

Merge branch 'fix-clang4-warnings' into 'master'

Fix some clang++4 warnings + duplciateProperty bug

See merge request !8
parents 9fed59be 49d9092d
......@@ -65,20 +65,20 @@ public:
protected:
virtual void visualizeFaceProp(bool _setDrawMode = true);
virtual void visualizeEdgeProp(bool _setDrawMode = true);
virtual void visualizeHalfedgeProp(bool _setDrawMode = true);
virtual void visualizeVertexProp(bool _setDrawMode = true);
void visualizeFaceProp(bool _setDrawMode = true) override;
void visualizeEdgeProp(bool _setDrawMode = true) override;
void visualizeHalfedgeProp(bool _setDrawMode = true) override;
void visualizeVertexProp(bool _setDrawMode = true) override;
virtual void removeProperty();
virtual void duplicateProperty();
void removeProperty() override;
void duplicateProperty() override;
virtual QString getPropertyText(unsigned int index);
QString getPropertyText(unsigned int index) override;
virtual void setFacePropertyFromText(unsigned int index, QString text);
virtual void setEdgePropertyFromText(unsigned int index, QString text);
virtual void setHalfedgePropertyFromText(unsigned int index, QString text);
virtual void setVertexPropertyFromText(unsigned int index, QString text);
void setFacePropertyFromText(unsigned int index, QString text) override;
void setEdgePropertyFromText(unsigned int index, QString text) override;
void setHalfedgePropertyFromText(unsigned int index, QString text) override;
void setVertexPropertyFromText(unsigned int index, QString text) override;
};
......
......@@ -69,20 +69,20 @@ public:
virtual ~OMPropertyVisualizerDouble(){}
protected:
virtual void visualizeFaceProp(bool _setDrawMode = true);
virtual void visualizeEdgeProp(bool _setDrawMode = true);
virtual void visualizeHalfedgeProp(bool _setDrawMode = true);
virtual void visualizeVertexProp(bool _setDrawMode = true);
void visualizeFaceProp(bool _setDrawMode = true) override;
void visualizeEdgeProp(bool _setDrawMode = true) override;
void visualizeHalfedgeProp(bool _setDrawMode = true) override;
void visualizeVertexProp(bool _setDrawMode = true) override;
virtual void removeProperty();
virtual void duplicateProperty();
void removeProperty() override;
void duplicateProperty() override;
virtual QString getPropertyText(unsigned int index);
QString getPropertyText(unsigned int index) override;
virtual void setFacePropertyFromText(unsigned int index, QString text);
virtual void setEdgePropertyFromText(unsigned int index, QString text);
virtual void setHalfedgePropertyFromText(unsigned int index, QString text);
virtual void setVertexPropertyFromText(unsigned int index, QString text);
void setFacePropertyFromText(unsigned int index, QString text) override;
void setEdgePropertyFromText(unsigned int index, QString text) override;
void setHalfedgePropertyFromText(unsigned int index, QString text) override;
void setVertexPropertyFromText(unsigned int index, QString text) override;
std::unique_ptr<ACG::IColorCoder> buildColorCoder() override;
};
......
......@@ -66,25 +66,25 @@ public:
virtual ~OMPropertyVisualizerInteger(){}
protected:
virtual void visualizeFaceProp(bool _setDrawMode = true);
virtual void visualizeEdgeProp(bool _setDrawMode = true);
virtual void visualizeHalfedgeProp(bool _setDrawMode = true);
virtual void visualizeVertexProp(bool _setDrawMode = true);
void visualizeFaceProp(bool _setDrawMode = true) override;
void visualizeEdgeProp(bool _setDrawMode = true) override;
void visualizeHalfedgeProp(bool _setDrawMode = true) override;
void visualizeVertexProp(bool _setDrawMode = true) override;
virtual void removeProperty();
virtual void duplicateProperty();
void removeProperty() override;
void duplicateProperty() override;
virtual T getValue(OpenMesh::FPropHandleT< T > prop, typename MeshT::FaceIter iter) { return OMPropertyVisualizer<MeshT>::mesh->property(prop, *iter) ; }
virtual T getValue(OpenMesh::EPropHandleT< T > prop, typename MeshT::EdgeIter iter) { return OMPropertyVisualizer<MeshT>::mesh->property(prop, *iter) ; }
virtual T getValue(OpenMesh::HPropHandleT< T > prop, typename MeshT::HalfedgeIter iter) { return OMPropertyVisualizer<MeshT>::mesh->property(prop, *iter) ; }
virtual T getValue(OpenMesh::VPropHandleT< T > prop, typename MeshT::VertexIter iter) { return OMPropertyVisualizer<MeshT>::mesh->property(prop, *iter) ; }
virtual QString getPropertyText(unsigned int index);
QString getPropertyText(unsigned int index) override;
virtual void setFacePropertyFromText(unsigned int index, QString text);
virtual void setEdgePropertyFromText(unsigned int index, QString text);
virtual void setHalfedgePropertyFromText(unsigned int index, QString text);
virtual void setVertexPropertyFromText(unsigned int index, QString text);
void setFacePropertyFromText(unsigned int index, QString text) override;
void setEdgePropertyFromText(unsigned int index, QString text) override;
void setHalfedgePropertyFromText(unsigned int index, QString text) override;
void setVertexPropertyFromText(unsigned int index, QString text) override;
inline int strToT (QString str, int) { return this->strToInt(str); }
inline unsigned int strToT (QString str, unsigned int) { return this->strToUInt(str); }
......
......@@ -69,20 +69,20 @@ public:
protected:
virtual void visualizeFaceProp(bool _setDrawMode = true);
virtual void visualizeEdgeProp(bool _setDrawMode = true);
virtual void visualizeHalfedgeProp(bool _setDrawMode = true);
virtual void visualizeVertexProp(bool _setDrawMode = true);
void visualizeFaceProp(bool _setDrawMode = true) override;
void visualizeEdgeProp(bool _setDrawMode = true) override;
void visualizeHalfedgeProp(bool _setDrawMode = true) override;
void visualizeVertexProp(bool _setDrawMode = true) override;
QString getPropertyText(unsigned int index);
QString getPropertyText(unsigned int index) override;
virtual void setFacePropertyFromText(unsigned int index, QString text);
virtual void setEdgePropertyFromText(unsigned int index, QString text);
virtual void setHalfedgePropertyFromText(unsigned int index, QString text);
virtual void setVertexPropertyFromText(unsigned int index, QString text);
void setFacePropertyFromText(unsigned int index, QString text) override;
void setEdgePropertyFromText(unsigned int index, QString text) override;
void setHalfedgePropertyFromText(unsigned int index, QString text) override;
void setVertexPropertyFromText(unsigned int index, QString text) override;
virtual void removeProperty();
virtual void duplicateProperty();
void removeProperty() override;
void duplicateProperty() override;
};
......
......@@ -69,14 +69,14 @@ public:
OMPropertyVisualizerVector(MeshT* _mesh, int _objectID, PropertyInfo _propertyInfo);
virtual ~OMPropertyVisualizerVector(){clear();}
virtual void clear();
virtual void clear() override;
protected:
virtual void visualizeFaceProp(bool _setDrawMode = true);
virtual void visualizeEdgeProp(bool _setDrawMode = true);
virtual void visualizeHalfedgeProp(bool _setDrawMode = true);
virtual void visualizeVertexProp(bool _setDrawMode = true);
void visualizeFaceProp(bool _setDrawMode = true) override;
void visualizeEdgeProp(bool _setDrawMode = true) override;
void visualizeHalfedgeProp(bool _setDrawMode = true) override;
void visualizeVertexProp(bool _setDrawMode = true) override;
virtual void visualizeFacePropOnEdges();
......@@ -85,15 +85,15 @@ protected:
virtual void visualizeHalfedgePropAsStrokes();
virtual void visualizeVertexPropAsStrokes();
virtual void removeProperty();
virtual void duplicateProperty();
void removeProperty() override;
void duplicateProperty() override;
virtual QString getPropertyText(unsigned int index);
QString getPropertyText(unsigned int index) override;
virtual void setFacePropertyFromText(unsigned int index, QString text);
virtual void setEdgePropertyFromText(unsigned int index, QString text);
virtual void setHalfedgePropertyFromText(unsigned int index, QString text);
virtual void setVertexPropertyFromText(unsigned int index, QString text);
void setFacePropertyFromText(unsigned int index, QString text) override;
void setEdgePropertyFromText(unsigned int index, QString text) override;
void setHalfedgePropertyFromText(unsigned int index, QString text) override;
void setVertexPropertyFromText(unsigned int index, QString text) override;
ACG::SceneGraph::LineNode* lineNode;
......
......@@ -70,14 +70,14 @@ public:
OMPropertyVisualizerVector2(MeshT* _mesh, int _objectID, PropertyInfo _propertyInfo);
virtual ~OMPropertyVisualizerVector2(){clear();}
virtual void clear();
void clear() override;
protected:
virtual void visualizeFaceProp(bool _setDrawMode = true);
virtual void visualizeEdgeProp(bool _setDrawMode = true);
virtual void visualizeHalfedgeProp(bool _setDrawMode = true);
virtual void visualizeVertexProp(bool _setDrawMode = true);
void visualizeFaceProp(bool _setDrawMode = true) override;
void visualizeEdgeProp(bool _setDrawMode = true) override;
void visualizeHalfedgeProp(bool _setDrawMode = true) override;
void visualizeVertexProp(bool _setDrawMode = true) override;
virtual void visualizeFacePropOnEdges();
......@@ -86,15 +86,15 @@ protected:
virtual void visualizeHalfedgePropAsStrokes();
virtual void visualizeVertexPropAsStrokes();
virtual void removeProperty();
virtual void duplicateProperty();
void removeProperty() override;
void duplicateProperty() override;
virtual QString getPropertyText(unsigned int index);
QString getPropertyText(unsigned int index) override;
virtual void setFacePropertyFromText(unsigned int index, QString text);
virtual void setEdgePropertyFromText(unsigned int index, QString text);
virtual void setHalfedgePropertyFromText(unsigned int index, QString text);
virtual void setVertexPropertyFromText(unsigned int index, QString text);
void setFacePropertyFromText(unsigned int index, QString text) override;
void setEdgePropertyFromText(unsigned int index, QString text) override;
void setHalfedgePropertyFromText(unsigned int index, QString text) override;
void setVertexPropertyFromText(unsigned int index, QString text) override;
ACG::SceneGraph::LineNode* lineNode;
};
......
......@@ -69,21 +69,21 @@ public:
OMPropertyVisualizerVectorFieldDifference(MeshT* _mesh, int _objectID, PropertyInfo _propertyInfo1, PropertyInfo _propertyInfo2);
virtual ~OMPropertyVisualizerVectorFieldDifference(){}
virtual QString getName() { return QObject::tr("Combination of %1 and %2").arg(PropertyVisualizer::propertyInfo.propName().c_str()).arg(propertyInfo2.propName().c_str()); }
QString getName() override { return QObject::tr("Combination of %1 and %2").arg(PropertyVisualizer::propertyInfo.propName().c_str()).arg(propertyInfo2.propName().c_str()); }
protected:
virtual void visualizeFaceProp(bool _setDrawMode = true);
virtual void visualizeEdgeProp(bool _setDrawMode = true);
virtual void visualizeHalfedgeProp(bool _setDrawMode = true);
virtual void visualizeVertexProp(bool _setDrawMode = true);
void visualizeFaceProp(bool _setDrawMode = true) override;
void visualizeEdgeProp(bool _setDrawMode = true) override;
void visualizeHalfedgeProp(bool _setDrawMode = true) override;
void visualizeVertexProp(bool _setDrawMode = true) override;
virtual void removeProperty(){} //no need to delete a property
virtual void duplciateProperty(){ emit OMPropertyVisualizer<MeshT>::log("combined properties cannot be duplicated");}
void removeProperty() override {} //no need to delete a property
void duplicateProperty() override { emit OMPropertyVisualizer<MeshT>::log("combined properties cannot be duplicated");}
virtual QString getPropertyText(unsigned int index);
QString getPropertyText(unsigned int index) override;
private:
PropertyInfo propertyInfo2;
......
......@@ -67,24 +67,24 @@ protected:
template <typename PropType, typename EntityIterator>
void visualizeProp(PropType prop, EntityIterator e_begin, EntityIterator e_end);
virtual void duplicateProperty();
void duplicateProperty() override;
virtual void visualizeFaceProp(bool _setDrawMode = true);
virtual void visualizeEdgeProp(bool _setDrawMode = true);
virtual void visualizeHalfedgeProp(bool _setDrawMode = true);
virtual void visualizeVertexProp(bool _setDrawMode = true);
virtual void visualizeCellProp(bool _setDrawMode = true);
virtual void visualizeHalffaceProp(bool _setDrawMode = true);
void visualizeFaceProp(bool _setDrawMode = true) override;
void visualizeEdgeProp(bool _setDrawMode = true) override;
void visualizeHalfedgeProp(bool _setDrawMode = true) override;
void visualizeVertexProp(bool _setDrawMode = true) override;
void visualizeCellProp(bool _setDrawMode = true) override;
void visualizeHalffaceProp(bool _setDrawMode = true) override;
virtual void setCellPropertyFromText(unsigned int index, QString text);
virtual void setFacePropertyFromText(unsigned int index, QString text);
virtual void setHalffacePropertyFromText(unsigned int index, QString text);
virtual void setEdgePropertyFromText(unsigned int index, QString text);
virtual void setHalfedgePropertyFromText(unsigned int index, QString text);
virtual void setVertexPropertyFromText(unsigned int index, QString text);
void setCellPropertyFromText(unsigned int index, QString text) override;
void setFacePropertyFromText(unsigned int index, QString text) override;
void setHalffacePropertyFromText(unsigned int index, QString text) override;
void setEdgePropertyFromText(unsigned int index, QString text) override;
void setHalfedgePropertyFromText(unsigned int index, QString text) override;
void setVertexPropertyFromText(unsigned int index, QString text) override;
virtual QString getPropertyText(unsigned int index);
QString getPropertyText(unsigned int index) override;
};
#if defined(INCLUDE_TEMPLATES) && !defined(OVM_PROPERTY_VISUALIZER_BOOLEAN_CC)
......
......@@ -71,23 +71,23 @@ public:
protected:
template <typename PropType, typename EntityIterator>
void visualizeProp(PropType prop, EntityIterator e_begin, EntityIterator e_end);
virtual void duplicateProperty();
virtual void visualizeFaceProp(bool _setDrawMode = true);
virtual void visualizeEdgeProp(bool _setDrawMode = true);
virtual void visualizeHalfedgeProp(bool _setDrawMode = true);
virtual void visualizeVertexProp(bool _setDrawMode = true);
virtual void visualizeCellProp(bool _setDrawMode = true);
virtual void visualizeHalffaceProp(bool _setDrawMode = true);
virtual QString getPropertyText(unsigned int index);
virtual void setCellPropertyFromText(unsigned int index, QString text);
virtual void setFacePropertyFromText(unsigned int index, QString text);
virtual void setHalffacePropertyFromText(unsigned int index, QString text);
virtual void setEdgePropertyFromText(unsigned int index, QString text);
virtual void setHalfedgePropertyFromText(unsigned int index, QString text);
virtual void setVertexPropertyFromText(unsigned int index, QString text);
void duplicateProperty() override;
void visualizeFaceProp(bool _setDrawMode = true) override;
void visualizeEdgeProp(bool _setDrawMode = true) override;
void visualizeHalfedgeProp(bool _setDrawMode = true) override;
void visualizeVertexProp(bool _setDrawMode = true) override;
void visualizeCellProp(bool _setDrawMode = true) override;
void visualizeHalffaceProp(bool _setDrawMode = true) override;
QString getPropertyText(unsigned int index) override;
void setCellPropertyFromText(unsigned int index, QString text) override;
void setFacePropertyFromText(unsigned int index, QString text) override;
void setHalffacePropertyFromText(unsigned int index, QString text) override;
void setEdgePropertyFromText(unsigned int index, QString text) override;
void setHalfedgePropertyFromText(unsigned int index, QString text) override;
void setVertexPropertyFromText(unsigned int index, QString text) override;
std::unique_ptr<ACG::IColorCoder> buildColorCoder() override;
};
......
......@@ -69,23 +69,23 @@ public:
protected:
template <typename PropType, typename EntityIterator>
void visualizeProp(PropType prop, EntityIterator e_begin, EntityIterator e_end);
virtual void duplicateProperty();
virtual void visualizeFaceProp(bool _setDrawMode = true);
virtual void visualizeEdgeProp(bool _setDrawMode = true);
virtual void visualizeHalfedgeProp(bool _setDrawMode = true);
virtual void visualizeVertexProp(bool _setDrawMode = true);
virtual void visualizeCellProp(bool _setDrawMode = true);
virtual void visualizeHalffaceProp(bool _setDrawMode = true);
virtual QString getPropertyText(unsigned int index);
virtual void setCellPropertyFromText(unsigned int index, QString text);
virtual void setFacePropertyFromText(unsigned int index, QString text);
virtual void setHalffacePropertyFromText(unsigned int index, QString text);
virtual void setEdgePropertyFromText(unsigned int index, QString text);
virtual void setHalfedgePropertyFromText(unsigned int index, QString text);
virtual void setVertexPropertyFromText(unsigned int index, QString text);
void duplicateProperty() override;
void visualizeFaceProp(bool _setDrawMode = true) override;
void visualizeEdgeProp(bool _setDrawMode = true) override;
void visualizeHalfedgeProp(bool _setDrawMode = true) override;
void visualizeVertexProp(bool _setDrawMode = true) override;
void visualizeCellProp(bool _setDrawMode = true) override;
void visualizeHalffaceProp(bool _setDrawMode = true) override;
QString getPropertyText(unsigned int index) override;
void setCellPropertyFromText(unsigned int index, QString text) override;
void setFacePropertyFromText(unsigned int index, QString text) override;
void setHalffacePropertyFromText(unsigned int index, QString text) override;
void setEdgePropertyFromText(unsigned int index, QString text) override;
void setHalfedgePropertyFromText(unsigned int index, QString text) override;
void setVertexPropertyFromText(unsigned int index, QString text) override;
std::unique_ptr<ACG::IColorCoder> buildColorCoder() override;
......
......@@ -69,13 +69,13 @@ public:
OVMPropertyVisualizerVector(MeshT* _mesh, int objectID, PropertyInfo _propertyInfo);
virtual ~OVMPropertyVisualizerVector(){ clear(); }
virtual void clear();
void clear() override;
protected:
template<typename PropType, typename EntityIterator>
void visualizeVectorAsColorForEntity(PropType prop, EntityIterator e_begin, EntityIterator e_end, bool normalized);
virtual void duplicateProperty();
void duplicateProperty() override;
virtual void visualizeFacePropAsStrokes();
virtual void visualizeEdgePropAsStrokes();
......@@ -84,21 +84,21 @@ protected:
virtual void visualizeCellPropAsStrokes();
virtual void visualizeHalffacePropAsStrokes();
virtual void visualizeFaceProp(bool _setDrawMode = true);
virtual void visualizeEdgeProp(bool _setDrawMode = true);
virtual void visualizeHalfedgeProp(bool _setDrawMode = true);
virtual void visualizeVertexProp(bool _setDrawMode = true);
virtual void visualizeCellProp(bool _setDrawMode = true);
virtual void visualizeHalffaceProp(bool _setDrawMode = true);
virtual QString getPropertyText(unsigned int index);
virtual void setCellPropertyFromText(unsigned int index, QString text);
virtual void setFacePropertyFromText(unsigned int index, QString text);
virtual void setHalffacePropertyFromText(unsigned int index, QString text);
virtual void setEdgePropertyFromText(unsigned int index, QString text);
virtual void setHalfedgePropertyFromText(unsigned int index, QString text);
virtual void setVertexPropertyFromText(unsigned int index, QString text);
void visualizeFaceProp(bool _setDrawMode = true) override;
void visualizeEdgeProp(bool _setDrawMode = true) override;
void visualizeHalfedgeProp(bool _setDrawMode = true) override;
void visualizeVertexProp(bool _setDrawMode = true) override;
void visualizeCellProp(bool _setDrawMode = true) override;
void visualizeHalffaceProp(bool _setDrawMode = true) override;
QString getPropertyText(unsigned int index) override;
void setCellPropertyFromText(unsigned int index, QString text) override;
void setFacePropertyFromText(unsigned int index, QString text) override;
void setHalffacePropertyFromText(unsigned int index, QString text) override;
void setEdgePropertyFromText(unsigned int index, QString text) override;
void setHalfedgePropertyFromText(unsigned int index, QString text) override;
void setVertexPropertyFromText(unsigned int index, QString text) override;
ACG::SceneGraph::LineNode* lineNode;
......
......@@ -70,22 +70,22 @@ public:
virtual ~OVMPropertyVisualizerVectorFieldDifference(){}
virtual QString getName() { return QObject::tr("Combination of %1 and %2").arg(PropertyVisualizer::propertyInfo.propName().c_str()).arg(propertyInfo2.propName().c_str()); }
QString getName() override { return QObject::tr("Combination of %1 and %2").arg(PropertyVisualizer::propertyInfo.propName().c_str()).arg(propertyInfo2.propName().c_str()); }
protected:
virtual void visualizeFaceProp(bool _setDrawMode = true);
virtual void visualizeEdgeProp(bool _setDrawMode = true);
virtual void visualizeHalfedgeProp(bool _setDrawMode = true);
virtual void visualizeVertexProp(bool _setDrawMode = true);
virtual void visualizeCellProp(bool _setDrawMode = true);
virtual void visualizeHalffaceProp(bool _setDrawMode = true);
void visualizeFaceProp(bool _setDrawMode = true) override;
void visualizeEdgeProp(bool _setDrawMode = true) override;
void visualizeHalfedgeProp(bool _setDrawMode = true) override;
void visualizeVertexProp(bool _setDrawMode = true) override;
void visualizeCellProp(bool _setDrawMode = true) override;
void visualizeHalffaceProp(bool _setDrawMode = true) override;
virtual void duplciateProperty(){ emit OVMPropertyVisualizer<MeshT>::log("combined properties cannot be duplicated");}
void duplicateProperty() override { emit OVMPropertyVisualizer<MeshT>::log("combined properties cannot be duplicated");}
virtual QString getPropertyText(unsigned int index) { return ""; };
QString getPropertyText(unsigned int index) override { return ""; };
private:
PropertyInfo propertyInfo2;
......
......@@ -101,17 +101,17 @@ class PropertyVisPlugin : public QObject, BaseInterface, LoadSaveInterface, Tool
#endif
signals:
void updateView();
void updatedObject(int, const UpdateType&);
void updateView() override;
void updatedObject(int, const UpdateType&) override;
void log(Logtype, QString);
void log(QString);
void log(Logtype, QString) override;
void log(QString) override;
// ToolboxInterface
void addToolbox( QString _name , QWidget* _widget ,QIcon* _icon);
void addToolbox( QString _name , QWidget* _widget ,QIcon* _icon) override;
//PickingInterface
void addHiddenPickMode( const std::string& _mode );
void addHiddenPickMode( const std::string& _mode ) override;
// Script Interface
void getScriptingEngine( QScriptEngine*& _engine ) override;
......@@ -119,25 +119,25 @@ signals:
private slots:
// BaseInterface
void slotObjectUpdated( int _identifier, const UpdateType& _type );
void slotAllCleared();
void slotObjectUpdated( int _identifier, const UpdateType& _type ) override;
void slotAllCleared() override;
// LoadSaveInterface
void objectDeleted( int _id );
void objectDeleted( int _id ) override;
// initialization functions
void initializePlugin();
void pluginsInitialized();
void initializePlugin() override;
void pluginsInitialized() override;
// toolbox slots
void slotMeshChanged(int _index = -1);
void slotVisualize();
// MouseInterface
void slotMouseEvent( QMouseEvent* _event );
void slotMouseEvent( QMouseEvent* _event ) override;
//PickingInterface
void slotPickModeChanged( const std::string& _mode);
void slotPickModeChanged( const std::string& _mode) override;
void updateGUI();
......@@ -165,8 +165,8 @@ public :
~PropertyVisPlugin() {}
QString name() { return (QString("Property Visualization")); }
QString description( ) { return (QString("Computes the PropertyVis of the the active Mesh")); }
QString name() override { return (QString("Property Visualization")); }
QString description( ) override { return (QString("Computes the PropertyVis of the the active Mesh")); }
private :
......
......@@ -201,7 +201,7 @@ public:
};
static DataType supportedDataTypes()
static inline DataType supportedDataTypes()