X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FHYDROData%2FHYDROData_Profile.h;h=5bcc450da7a182a4503ace453f15920e1c00e90d;hb=2f02a5b7680c10ed7fcd63f4ffb75af0932f5bb9;hp=22cd5cd2550f2366b6ed91757580dee13540edd2;hpb=2cf9e838e652ae811d9b3931914771ad1836c6b8;p=modules%2Fhydro.git

diff --git a/src/HYDROData/HYDROData_Profile.h b/src/HYDROData/HYDROData_Profile.h
index 22cd5cd2..5bcc450d 100644
--- a/src/HYDROData/HYDROData_Profile.h
+++ b/src/HYDROData/HYDROData_Profile.h
@@ -63,7 +63,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 top shape of the object.
@@ -87,12 +88,12 @@ public:
   /**
    * Returns default filling color for new profile.
    */
-  HYDRODATA_EXPORT static QColor DefaultFillingColor();
+  HYDRODATA_EXPORT virtual QColor DefaultFillingColor() const;
 
   /**
    * Returns default border color for new profile.
    */
-  HYDRODATA_EXPORT static QColor DefaultBorderColor();
+  HYDRODATA_EXPORT virtual QColor DefaultBorderColor() const;
 
 
 public:
@@ -125,7 +126,8 @@ public:
    * \param thePoint[out] profile first point
    * \return true if point has been set
    */
-  HYDRODATA_EXPORT bool GetLeftPoint( gp_XY& thePoint, bool IsConvertToGlobal = false ) const;
+  HYDRODATA_EXPORT bool GetLeftPoint( gp_XY& thePoint, bool IsConvertToGlobal = false,
+                                      bool CanUseDefault = false ) const;
 
   /**
    * Set last(right) point for profile.
@@ -138,8 +140,8 @@ public:
    * \param thePoint[out] profile last point
    * \return true if point has been set
    */
-  HYDRODATA_EXPORT bool GetRightPoint( gp_XY& thePoint, bool IsConvertToGlobal = false ) const;
-
+  HYDRODATA_EXPORT bool GetRightPoint( gp_XY& thePoint, bool IsConvertToGlobal = false,
+                                       bool CanUseDefault = false ) const;
 
   /**
    * Returns object which store parametric presentation of profile points.
@@ -185,7 +187,8 @@ public:
    * Empty sequence is returned if first or last point was not set.
    * \return profile points list
    */
-  HYDRODATA_EXPORT ProfilePoints GetProfilePoints( bool IsConvertToGlobal = false ) const;
+  HYDRODATA_EXPORT ProfilePoints GetProfilePoints( bool IsConvertToGlobal = false,
+                                                   bool CanUseDefaultLeftRight = false ) const;
 
 
   /**
@@ -194,6 +197,12 @@ public:
    */
   HYDRODATA_EXPORT ProfilePoint GetBottomPoint() const;
 
+  /**
+   * Return profile middle point.
+   * \return non-parametric profile point
+   */
+  HYDRODATA_EXPORT ProfilePoint GetMiddlePoint( bool CanUseDefault ) const;
+
 public:
   // Public methods to work with files.
 
@@ -239,23 +248,13 @@ public:
                                                 bool*      theIsRead = 0 );
 
 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;
-
   /**
    * Checks and if necessary create child 3D object.
    * Reimplemented to prevent creation of 3D child object.
    */
   HYDRODATA_EXPORT virtual void checkAndSetObject3D() {}
 
+  TopoDS_Shape CreateProfileWire( bool canUseDefaultPoints ) const;
 
 protected: