lots 3,8

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

diff --git a/src/HYDROData/HYDROData_Channel.h b/src/HYDROData/HYDROData_Channel.h
index 5b4e694f84496701dff8b14f7ac227f12f2d0060..3ba6e2c9a2e4cc15defffc426515226b706bc9f1 100644 (file)
--- a/src/HYDROData/HYDROData_Channel.h
+++ b/src/HYDROData/HYDROData_Channel.h
@@ -24,12 +24,8 @@
 #include <TopoDS_Face.hxx>
 #include <TopoDS_Wire.hxx>
 
-class Handle(HYDROData_Polyline3D);
-class Handle(HYDROData_Profile);
-class TopTools_SequenceOfShape;
-class TopTools_ListOfShape;
-
-DEFINE_STANDARD_HANDLE(HYDROData_Channel, HYDROData_ArtificialObject)
+class HYDROData_Polyline3D;
+class HYDROData_Profile;
 
 /**\class HYDROData_Channel
  * \brief 
@@ -43,10 +39,10 @@ public:
   {
     TopoDS_Shape myPrs3D;
     TopoDS_Face  myPrs2D;
-    TopoDS_Wire  myLeftBank;
-    TopoDS_Wire  myRightBank;
-    TopoDS_Wire  myInlet;
-    TopoDS_Wire  myOutlet;
+    TopoDS_Shape myLeftBank;
+    TopoDS_Shape myRightBank;
+    TopoDS_Shape myInlet;
+    TopoDS_Shape myOutlet;
   };
 
 protected:
@@ -58,11 +54,11 @@ protected:
     DataTag_First = HYDROData_ArtificialObject::DataTag_First + 100, ///< first tag, to reserve
     DataTag_GuideLine, 
     DataTag_Profile,
+    DataTag_EquiDistance,
   };
 
 public:
-
-  DEFINE_STANDARD_RTTI(HYDROData_Channel);
+  DEFINE_STANDARD_RTTIEXT(HYDROData_Channel, HYDROData_ArtificialObject);
 
 public:
 
@@ -71,7 +67,8 @@ public:
    */
   HYDRODATA_EXPORT static bool CreatePresentations( const Handle(HYDROData_Polyline3D)& theGuideLine,
                                                     const Handle(HYDROData_Profile)&    theProfile,
-                                                    PrsDefinition&                      thePrs );
+                                                    PrsDefinition&                      thePrs,
+                                                    double                              theEquiDistance );
 
 public:
 
@@ -83,23 +80,14 @@ public:
   /**
    * Dump object to Python script representation.
    */
-  HYDRODATA_EXPORT virtual QStringList DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const;
+  HYDRODATA_EXPORT virtual QStringList DumpToPython( const QString& thePyScriptPath,
+                                                     MapOfTreatedObjects& theTreatedObjects ) const;
 
   /**
    * Returns the list of all reference objects of this object.
    */
   HYDRODATA_EXPORT virtual HYDROData_SequenceOfObjects GetAllReferenceObjects() const;
 
-  /**
-   * Returns the top shape of the object.
-   */
-  HYDRODATA_EXPORT virtual TopoDS_Shape GetTopShape() const;
-
-  /**
-   * Returns the 3d shape of the object.
-   */
-  HYDRODATA_EXPORT virtual TopoDS_Shape GetShape3D() const;
-
   /**
    * Returns the left edge of the channel.
    */
@@ -124,12 +112,12 @@ public:
   /**
    * Returns default filling color for new channel.
    */
-  HYDRODATA_EXPORT static QColor DefaultFillingColor();
+  HYDRODATA_EXPORT virtual QColor DefaultFillingColor() const;
 
   /**
    * Returns default border color for new channel.
    */
-  HYDRODATA_EXPORT static QColor DefaultBorderColor();
+  HYDRODATA_EXPORT virtual QColor DefaultBorderColor() const;
 
 
 public:      
@@ -166,19 +154,10 @@ public:
    */
   HYDRODATA_EXPORT virtual void RemoveProfile();
 
+  HYDRODATA_EXPORT void SetEquiDistance( double );
+  HYDRODATA_EXPORT double GetEquiDistance() const;
 
 protected:
-
-  /**
-   * Returns default filling color for new object.
-   */
-  HYDRODATA_EXPORT virtual QColor getDefaultFillingColor() const;
-
-  /**
-   * Returns default border color for new object.
-   */
-  HYDRODATA_EXPORT virtual QColor getDefaultBorderColor() const;
-
   /**
    * Returns the type of child altitude object.
    * Reimplemented to create chanel altitude object.