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

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

diff --git a/src/HYDROData/HYDROData_Region.h b/src/HYDROData/HYDROData_Region.h
index d1bc7ab8b62ce0a94dd79c4ff0a9062e340917d5..205e546ef97bfdf1f214a25c0e5209b2f5be87c1 100644 (file)
--- a/src/HYDROData/HYDROData_Region.h
+++ b/src/HYDROData/HYDROData_Region.h
@@ -22,10 +22,8 @@
 #include "HYDROData_ShapesGroup.h"
 
 
-DEFINE_STANDARD_HANDLE(HYDROData_Region, HYDROData_Entity)
-
-class Handle(HYDROData_Zone);
-class Handle(HYDROData_Document);
+class HYDROData_Zone;
+class HYDROData_Document;
 class TopoDS_Shape;
 class TopoDS_Face;
 class QStringList;
@@ -35,9 +33,7 @@ class QStringList;
  */
 class HYDROData_Region : public HYDROData_Entity
 {
-
 protected:
-
   /**
    * Enumeration of tags corresponding to the persistent object parameters.
    */
@@ -49,7 +45,7 @@ protected:
   };
 
 public:
-  DEFINE_STANDARD_RTTI(HYDROData_Region);
+  DEFINE_STANDARD_RTTIEXT(HYDROData_Region, HYDROData_Entity);
 
   /**
    * Returns the kind of this object. Must be redefined in all objects of known type.
@@ -59,7 +55,9 @@ 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,
+                                                     QString defRegName = QString()) const;
 
   /**
    * Returns flag indicating that object is updateble or not.
@@ -112,7 +110,10 @@ public:
    * - a shell if the zones faces can't be united into one face
    * \return shape as TopoDS_Shape
    */
-  HYDRODATA_EXPORT virtual TopoDS_Shape GetShape( HYDROData_ShapesGroup::SeqOfGroupsDefs* theSeqOfGroups = 0 ) const;
+  HYDRODATA_EXPORT virtual TopoDS_Shape GetShape( HYDROData_ShapesGroup::SeqOfGroupsDefs* theSeqOfGroups = 0, 
+                                                  const TopTools_SequenceOfShape* IntSh = NULL ) const;
+
+  HYDRODATA_EXPORT bool IsSubmersible() const;
 
 protected: