land cover map icon

[modules/hydro.git] / src / HYDROData / HYDROData_IPolyline.h

diff --git a/src/HYDROData/HYDROData_IPolyline.h b/src/HYDROData/HYDROData_IPolyline.h
index 5d15d916eb8d27d4d5986827672b61248050305f..afb307cb0b68bee4d6fa29809f951b020903d698 100644 (file)
--- a/src/HYDROData/HYDROData_IPolyline.h
+++ b/src/HYDROData/HYDROData_IPolyline.h
@@ -21,15 +21,12 @@
 
 #include "HYDROData_Entity.h"
 
-
-DEFINE_STANDARD_HANDLE(HYDROData_IPolyline, HYDROData_Entity)
-
 class gp_XY;
 class TopoDS_Shape;
-class Handle(TDataStd_RealList);
-class Handle(TDataStd_ExtStringList);
-class Handle(TDataStd_BooleanList);
-class Handle(TDataStd_IntegerList);
+class TDataStd_RealList;
+class TDataStd_ExtStringList;
+class TDataStd_BooleanList;
+class TDataStd_IntegerList;
 
 
 /**\class HYDROData_IPolyline
@@ -38,7 +35,6 @@ class Handle(TDataStd_IntegerList);
 class HYDROData_IPolyline : public HYDROData_Entity
 {
 public:
-
   enum SectionType{ SECTION_POLYLINE = 0, SECTION_SPLINE = 1 };
 
   typedef gp_XY                       Point;
@@ -58,7 +54,7 @@ protected:
   };
 
 public:
-  DEFINE_STANDARD_RTTI(HYDROData_IPolyline);
+  DEFINE_STANDARD_RTTIEXT(HYDROData_IPolyline, HYDROData_Entity);
 
 public:
 
@@ -78,13 +74,6 @@ public:
   HYDRODATA_EXPORT static QColor DefaultWireColor();
 
 public:
-
-  /**
-   * Returns the 3D presentation of all points.
-   */
-  HYDRODATA_EXPORT virtual TopoDS_Shape GetShape() const = 0;
-
-
   /**
    * Returns number of sections.
    */
@@ -197,14 +186,11 @@ public:
    */
   HYDRODATA_EXPORT virtual PointsList GetPoints( const int theSectionIndex = -1, bool IsConvertToGlobal = false ) const = 0;
 
-protected:
-
-  TopoDS_Shape getPolylineShape() const;
-
-  void setPolylineShape( const TopoDS_Shape& theShape );
-
-  void removePolylineShape();
+  HYDRODATA_EXPORT TopoDS_Shape GetShape() const;
+  HYDRODATA_EXPORT void SetShape( const TopoDS_Shape& theShape );
 
+protected:
+  void RemovePolylineShape();
 
   void getSectionsLists( Handle(TDataStd_ExtStringList)& theNamesList,
                          Handle(TDataStd_IntegerList)&   theTypesList,