X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROData%2FHYDROData_Channel.h;h=163601c0d718be20b2d5ead90c5ad0febacdce2f;hb=58bb6b7459bebeeb089c9ed486c4683a8bae7288;hp=f5c8a4b17ed91f159a14defdad17e8b7ddb03ed4;hpb=474c2cd65280d793f1c81ca528bc92e1cff988e6;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Channel.h b/src/HYDROData/HYDROData_Channel.h
index f5c8a4b1..163601c0 100644
--- a/src/HYDROData/HYDROData_Channel.h
+++ b/src/HYDROData/HYDROData_Channel.h
@@ -1,8 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015  EDF-R&D
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
@@ -28,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 
@@ -62,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:
 
@@ -75,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:
 
@@ -87,7 +80,8 @@ 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.
@@ -95,14 +89,14 @@ public:
   HYDRODATA_EXPORT virtual HYDROData_SequenceOfObjects GetAllReferenceObjects() const;
 
   /**
-   * Returns the top shape of the object.
+   * Returns the left edge of the channel.
    */
-  HYDRODATA_EXPORT virtual TopoDS_Shape GetTopShape() const;
+  HYDRODATA_EXPORT virtual TopoDS_Shape GetLeftShape() const;
 
   /**
-   * Returns the 3d shape of the object.
+   * Returns the right edge of the channel.
    */
-  HYDRODATA_EXPORT virtual TopoDS_Shape GetShape3D() const;
+  HYDRODATA_EXPORT virtual TopoDS_Shape GetRightShape() const;
 
   /**
    * Update the shape presentations of stream.
@@ -118,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:      
@@ -160,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.