Porting on OCCT 7.0 and Qt 5. Make compilable version.

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

diff --git a/src/HYDROData/HYDROData_Obstacle.h b/src/HYDROData/HYDROData_Obstacle.h
index c0ac58221d3ebf5c23fbe38c175b43e57b20fd9f..e2b0c392c87e92f4b07142d0b9a22de2f0b9738f 100644 (file)
--- a/src/HYDROData/HYDROData_Obstacle.h
+++ b/src/HYDROData/HYDROData_Obstacle.h
@@ -21,8 +21,6 @@
 
 #include "HYDROData_ArtificialObject.h"
 
-DEFINE_STANDARD_HANDLE(HYDROData_Obstacle, HYDROData_ArtificialObject)
-
 /**\class HYDROData_Obstacle
  * \brief 
  *
@@ -42,7 +40,7 @@ protected:
   };
 
 public:
-  DEFINE_STANDARD_RTTI(HYDROData_Obstacle);
+  DEFINE_STANDARD_RTTIEXT(HYDROData_Obstacle, HYDROData_ArtificialObject);
 
   /**
    * 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;
 
   /**
    * Update the immersible zone object.
@@ -70,12 +69,12 @@ public:
   /**
    * Returns default filling color for new obstacle.
    */
-  HYDRODATA_EXPORT static QColor DefaultFillingColor();
+  HYDRODATA_EXPORT virtual QColor DefaultFillingColor() const;
 
   /**
    * Returns default border color for new obstacle.
    */
-  HYDRODATA_EXPORT static QColor DefaultBorderColor();
+  HYDRODATA_EXPORT virtual QColor DefaultBorderColor() const;
 
 
   /**
@@ -141,17 +140,6 @@ public:
                                    const double theDz );
 
 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 obstacle altitude object.