Skip to content
GitLab
Commit 49d9092d authored by Martin Heistermann's avatar Martin Heistermann
Browse files

Add override annotations where appropriate, fix uncovered typo (duplciateProperty)

parent 527f12c4
Hide whitespace changes
Inline Side-by-side
OpenMesh/OMPropertyVisualizerBoolean.hh
View file @ 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;
};
......
OpenMesh/OMPropertyVisualizerDouble.hh
View file @ 49d9092d
......@@ -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;
};
......
OpenMesh/OMPropertyVisualizerInteger.hh
View file @ 49d9092d
......@@ -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); }
......
OpenMesh/OMPropertyVisualizerSkinWeights.hh
View file @ 49d9092d
......@@ -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;
};
......
OpenMesh/OMPropertyVisualizerVector.hh
View file @ 49d9092d
......@@ -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;
......
OpenMesh/OMPropertyVisualizerVector2.hh
View file @ 49d9092d
......@@ -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;
};
......
OpenMesh/OMPropertyVisualizerVectorFieldDifference.hh
View file @ 49d9092d
......@@ -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;
......
OpenVolumeMesh/OVMPropertyVisualizerBoolean.hh
View file @ 49d9092d
......@@ -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)
......
OpenVolumeMesh/OVMPropertyVisualizerDouble.hh
View file @ 49d9092d
......@@ -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;
};
......
OpenVolumeMesh/OVMPropertyVisualizerInteger.hh
View file @ 49d9092d
......@@ -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;
......
OpenVolumeMesh/OVMPropertyVisualizerVector.hh
View file @ 49d9092d
......@@ -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;
......
OpenVolumeMesh/OVMPropertyVisualizerVectorFieldDifference.hh
View file @ 49d9092d
......@@ -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;
......
Supports Markdown
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