Minor changes for Regions of calculation cases.

diff --git a/src/HYDROPy/HYDROData.sip b/src/HYDROPy/HYDROData.sip
index 51f6775df4ddfdd5759628e637b672704ffe3622..97fd2024467fc2495e2debc64fa7ebb47ea31456 100644 (file)
--- a/src/HYDROPy/HYDROData.sip
+++ b/src/HYDROPy/HYDROData.sip
@@ -58,6 +58,7 @@ See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 %Include HYDROData_Bathymetry.sip
 %Include HYDROData_Domain.sip
 %Include HYDROData_Zone.sip
+%Include HYDROData_Region.sip
 %Include HYDROData_Calculation.sip
 
 %Include HYDROData_Document.sip

diff --git a/src/HYDROPy/HYDROData_Calculation.sip b/src/HYDROPy/HYDROData_Calculation.sip
index 00c026c57837c3a0868a586d8da02c484f53dd07..15d026ec15bea646d299d597a606f9ba40f24709 100644 (file)
--- a/src/HYDROPy/HYDROData_Calculation.sip
+++ b/src/HYDROPy/HYDROData_Calculation.sip
@@ -163,78 +163,78 @@ public:
 
 
   /**
-   * Returns number of splitted zones for calculation case.
+   * Returns number of regions for calculation case.
    */
-  int NbSplittedZones() const;
+  int NbRegions() const;
 
   /**
-   * Add new one splitted zone for calculation case.
+   * Add new one region for calculation case.
    */
-  void AddSplittedZone( HYDROData_Zone theZone ) [void (const Handle_HYDROData_Zone&)];
+  void AddRegion( HYDROData_Region theRegion ) [void (const Handle_HYDROData_Region&)];
   %MethodCode
 
-    Handle(HYDROData_Zone) aRefZone =
-      Handle(HYDROData_Zone)::DownCast( createHandle( a0 ) );
-    if ( !aRefZone.IsNull() )
+    Handle(HYDROData_Region) aRegion =
+      Handle(HYDROData_Region)::DownCast( createHandle( a0 ) );
+    if ( !aRegion.IsNull() )
     {
       Py_BEGIN_ALLOW_THREADS
-      sipSelfWasArg ? sipCpp->HYDROData_Calculation::AddSplittedZone( aRefZone ) : 
-                      sipCpp->AddSplittedZone( aRefZone );
+      sipSelfWasArg ? sipCpp->HYDROData_Calculation::AddRegion( aRegion ) : 
+                      sipCpp->AddRegion( aRegion );
       Py_END_ALLOW_THREADS
     }
 
   %End
 
   /**
-   * Replace the splitted zone for calculation case.
+   * Replace the region for calculation case.
    */
-  void SetSplittedZone( const int      theIndex, 
-                        HYDROData_Zone theZone ) [void (const int, const Handle_HYDROData_Zone&)];
+  void SetRegion( const int        theIndex, 
+                  HYDROData_Region theRegion ) [void (const int, const Handle_HYDROData_Region&)];
   %MethodCode
 
-    Handle(HYDROData_Zone) aRefZone =
-      Handle(HYDROData_Zone)::DownCast( createHandle( a1 ) );
-    if ( !aRefZone.IsNull() )
+    Handle(HYDROData_Region) aRegion =
+      Handle(HYDROData_Region)::DownCast( createHandle( a1 ) );
+    if ( !aRegion.IsNull() )
     {
       Py_BEGIN_ALLOW_THREADS
-      sipSelfWasArg ? sipCpp->HYDROData_Calculation::SetSplittedZone( a0, aRefZone ) : 
-                      sipCpp->SetSplittedZone( a0, aRefZone );
+      sipSelfWasArg ? sipCpp->HYDROData_Calculation::SetRegion( a0, aRegion ) : 
+                      sipCpp->SetRegion( a0, aRegion );
       Py_END_ALLOW_THREADS
     }
 
   %End
 
   /**
-   * Sets the refrence zones for calculation case.
+   * Sets the refrence region for calculation case.
    */
-  //void SetSplittedZones( const HYDROData_SequenceOfObjects& theZones );
+  //void SetRegions( const HYDROData_SequenceOfObjects& theRegions );
 
   /**
-   * Returns splitted zone of calculation case by index.
+   * Returns region of calculation case by index.
    */
-  HYDROData_Zone GetSplittedZone( const int theIndex ) const [Handle_HYDROData_Zone (const int)];
+  HYDROData_Region GetRegion( const int theIndex ) const [Handle_HYDROData_Region (const int)];
   %MethodCode
 
-    Handle(HYDROData_Zone) aRefZone;
+    Handle(HYDROData_Region) aRegion;
     
     Py_BEGIN_ALLOW_THREADS
-    aRefZone = sipSelfWasArg ? sipCpp->HYDROData_Calculation::GetSplittedZone( a0 ) : 
-                               sipCpp->GetSplittedZone( a0 );
+    aRegion = sipSelfWasArg ? sipCpp->HYDROData_Calculation::GetRegion( a0 ) : 
+                              sipCpp->GetRegion( a0 );
     Py_END_ALLOW_THREADS
     
-    sipRes = (HYDROData_Zone*)createPointer( aRefZone );
+    sipRes = (HYDROData_Region*)createPointer( aRegion );
   
   %End
 
   /**
-   * Returns all splitted zones of calculation case.
+   * Returns all regions of calculation case.
    */
-  //HYDROData_SequenceOfObjects GetSplittedZones() const;
+  //HYDROData_SequenceOfObjects GetRegions() const;
 
   /**
-   * Removes all splitted refrence zone of calculation case.
+   * Removes all regions of calculation case.
    */
-  void RemoveSplittedZones();
+  void RemoveRegions();
 
 
 protected:

diff --git a/src/HYDROPy/HYDROData_Domain.sip b/src/HYDROPy/HYDROData_Domain.sip
index 79f70128e2a9be1041b7bfc45374767d302a06a5..083c3a3c3928e34312cef400be3f53b52b2b8988 100644 (file)
--- a/src/HYDROPy/HYDROData_Domain.sip
+++ b/src/HYDROPy/HYDROData_Domain.sip
@@ -24,7 +24,7 @@
 #include <HYDROData_Domain.h>
 %End
 
-class HYDROData_Domain : HYDROData_Object
+class HYDROData_Domain : HYDROData_Object /Abstract/
 {
 
 %TypeHeaderCode