Merge remote-tracking branch 'origin/BR_DEMO' into BR_2017

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

diff --git a/src/HYDROData/HYDROData_ImmersibleZone.h b/src/HYDROData/HYDROData_ImmersibleZone.h
index c888645b64d75c980da535b51a426c9f1ee129cd..cae0e08b2cdcbdf14a660297bd36288cfa42625a 100644 (file)
--- a/src/HYDROData/HYDROData_ImmersibleZone.h
+++ b/src/HYDROData/HYDROData_ImmersibleZone.h
@@ -21,9 +21,7 @@
 
 #include <HYDROData_NaturalObject.h>
 
-DEFINE_STANDARD_HANDLE(HYDROData_ImmersibleZone, HYDROData_NaturalObject)
-
-class Handle(HYDROData_PolylineXY);
+class HYDROData_PolylineXY;
 
 /**\class HYDROData_ImmersibleZone
  * \brief 
@@ -42,7 +40,7 @@ protected:
 };
 
 public:
-  DEFINE_STANDARD_RTTI(HYDROData_ImmersibleZone);
+  DEFINE_STANDARD_RTTIEXT(HYDROData_ImmersibleZone, HYDROData_NaturalObject);
 
   /**
    * Returns the kind of this object. Must be redefined in all objects of known type.
@@ -52,7 +50,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.
@@ -78,12 +77,12 @@ public:
   /**
    * Returns default filling color for new zone.
    */
-  HYDRODATA_EXPORT static QColor DefaultFillingColor();
+  HYDRODATA_EXPORT virtual QColor DefaultFillingColor() const;
 
   /**
    * Returns default border color for new zone.
    */
-  HYDRODATA_EXPORT static QColor DefaultBorderColor();
+  HYDRODATA_EXPORT virtual QColor DefaultBorderColor() const;
 
   /**
    * Sets reference polyline object for zone.
@@ -103,18 +102,6 @@ public:
   HYDRODATA_EXPORT TopoDS_Shape generateTopShape() const;
   HYDRODATA_EXPORT static TopoDS_Shape generateTopShape( const Handle(HYDROData_PolylineXY)& );
 
-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;
-
 private:
 
   /**