0031687: Draw Harness, ViewerTest - extend command vrenderparams with option updating...

[occt.git] / src / XSDRAWSTLVRML / XSDRAWSTLVRML_DataSource.hxx

diff --git a/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DataSource.hxx b/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DataSource.hxx
index 521cbc5..2e478b2 100644 (file)
--- a/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DataSource.hxx
+++ b/src/XSDRAWSTLVRML/XSDRAWSTLVRML_DataSource.hxx
@@ -30,7 +30,7 @@
 #include <Standard_Address.hxx>
 #include <TColStd_Array1OfInteger.hxx>
 #include <Standard_Real.hxx>
-class StlMesh_Mesh;
+#include <Poly_Triangulation.hxx>
 
 
 class XSDRAWSTLVRML_DataSource;
@@ -44,29 +44,29 @@ public:
 
   
   //! Constructor
-  Standard_EXPORT XSDRAWSTLVRML_DataSource(const Handle(StlMesh_Mesh)& aMesh);
+  Standard_EXPORT XSDRAWSTLVRML_DataSource(const Handle(Poly_Triangulation)& aMesh);
   
   //! Returns geometry information about node ( if IsElement is False ) or element ( IsElement is True )
   //! by co-ordinates. For element this method must return all its nodes co-ordinates in the strict order: X, Y, Z and
   //! with nodes order is the same as in wire bounding the face or link. NbNodes is number of nodes of element.
   //! It is recommended to return 1 for node. Type is an element type.
-  Standard_EXPORT Standard_Boolean GetGeom (const Standard_Integer ID, const Standard_Boolean IsElement, TColStd_Array1OfReal& Coords, Standard_Integer& NbNodes, MeshVS_EntityType& Type) const;
+  Standard_EXPORT Standard_Boolean GetGeom (const Standard_Integer ID, const Standard_Boolean IsElement, TColStd_Array1OfReal& Coords, Standard_Integer& NbNodes, MeshVS_EntityType& Type) const Standard_OVERRIDE;
   
   //! This method is similar to GetGeom, but returns only element or node type. This method is provided for
   //! a fine performance.
-  Standard_EXPORT Standard_Boolean GetGeomType (const Standard_Integer ID, const Standard_Boolean IsElement, MeshVS_EntityType& Type) const;
+  Standard_EXPORT Standard_Boolean GetGeomType (const Standard_Integer ID, const Standard_Boolean IsElement, MeshVS_EntityType& Type) const Standard_OVERRIDE;
   
   //! This method returns by number an address of any entity which represents element or node data structure.
-  Standard_EXPORT Standard_Address GetAddr (const Standard_Integer ID, const Standard_Boolean IsElement) const;
+  Standard_EXPORT Standard_Address GetAddr (const Standard_Integer ID, const Standard_Boolean IsElement) const Standard_OVERRIDE;
   
   //! This method returns information about what node this element consist of.
   Standard_EXPORT virtual Standard_Boolean GetNodesByElement (const Standard_Integer ID, TColStd_Array1OfInteger& NodeIDs, Standard_Integer& NbNodes) const Standard_OVERRIDE;
   
   //! This method returns map of all nodes the object consist of.
-  Standard_EXPORT const TColStd_PackedMapOfInteger& GetAllNodes() const;
+  Standard_EXPORT const TColStd_PackedMapOfInteger& GetAllNodes() const Standard_OVERRIDE;
   
   //! This method returns map of all elements the object consist of.
-  Standard_EXPORT const TColStd_PackedMapOfInteger& GetAllElements() const;
+  Standard_EXPORT const TColStd_PackedMapOfInteger& GetAllElements() const Standard_OVERRIDE;
   
   //! This method calculates normal of face, which is using for correct reflection presentation.
   //! There is default method, for advance reflection this method can be redefined.
@@ -75,7 +75,7 @@ public:
 
 
 
-  DEFINE_STANDARD_RTTI(XSDRAWSTLVRML_DataSource,MeshVS_DataSource)
+  DEFINE_STANDARD_RTTIEXT(XSDRAWSTLVRML_DataSource,MeshVS_DataSource)
 
 protected:
 
@@ -85,7 +85,7 @@ protected:
 private:
 
 
-  Handle(StlMesh_Mesh) myMesh;
+  Handle(Poly_Triangulation) myMesh;
   TColStd_PackedMapOfInteger myNodes;
   TColStd_PackedMapOfInteger myElements;
   Handle(TColStd_HArray2OfInteger) myElemNodes;