Merge branch 'master' of https://git.salome-platform.org/git/modules/hydro

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

diff --git a/src/HYDROData/HYDROData_Entity.h b/src/HYDROData/HYDROData_Entity.h
index 0c612ba279daf2ac967c76498700636c7f91a7d4..1e41b044d14dbe337e2390fe0f470e41c7003282 100644 (file)
--- a/src/HYDROData/HYDROData_Entity.h
+++ b/src/HYDROData/HYDROData_Entity.h
@@ -58,7 +58,7 @@ const ObjectKind KIND_ARTIFICIAL_OBJECT   = 19;
 const ObjectKind KIND_NATURAL_OBJECT      = 20;
 const ObjectKind KIND_DUMMY_3D            = 21;
 const ObjectKind KIND_SHAPES_GROUP        = 22;
-const ObjectKind KIND_SPLITTED_GROUP      = 23;
+const ObjectKind KIND_SPLIT_GROUP         = 23;
 const ObjectKind KIND_STREAM_ALTITUDE     = 24;
 const ObjectKind KIND_OBSTACLE_ALTITUDE   = 25;
 const ObjectKind KIND_STRICKLER_TABLE     = 26;
@@ -145,7 +145,8 @@ public:
    * You should reimplement this function in your derived class if it
    * has Python API and can be imported/exported from/to Python script.
    */
-  HYDRODATA_EXPORT virtual QStringList DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const;
+  HYDRODATA_EXPORT virtual QStringList DumpToPython( const QString& thePyScriptPath,
+                                                     MapOfTreatedObjects& theTreatedObjects ) const;
 
   /**
    * Updates object state. Base implementation dose nothing.
@@ -410,12 +411,14 @@ protected:
    */
   QString getPyTypeID() const;
 
-  void setPythonReferenceObject( MapOfTreatedObjects&            theTreatedObjects,
+  void setPythonReferenceObject( const QString&                  thePyScriptPath,
+                                 MapOfTreatedObjects&            theTreatedObjects,
                                  QStringList&                    theScript,
                                  const Handle(HYDROData_Entity)& theRefObject,
                                  const QString&                  theMethod ) const;
 
-  bool checkObjectPythonDefinition( MapOfTreatedObjects&            theTreatedObjects,
+  bool checkObjectPythonDefinition( const QString&                  thePyScriptPath,
+                                    MapOfTreatedObjects&            theTreatedObjects,
                                     QStringList&                    theScript,
                                     const Handle(HYDROData_Entity)& theRefObject ) const;
 
@@ -431,6 +434,9 @@ protected:
   void SetShape( int theTag, const TopoDS_Shape& theShape );
   TopoDS_Shape GetShape( int theTag ) const;
 
+  void SetDouble( int theTag, double theValue );
+  double GetDouble( int theTag, double theDefValue = 0.0 ) const;
+
   int GetGeomChangeFlag() const;
 
 protected: