Merge branch 'BR_MULTI_BATHS' into HEAD

[modules/hydro.git] / src / HYDROPy / HYDROData_CalculationCase.sip

diff --git a/src/HYDROPy/HYDROData_CalculationCase.sip b/src/HYDROPy/HYDROData_CalculationCase.sip
index 34b906213fba2d0ee7a801e6e9ba5487cf10b5d1..01b1ae04f7d8ef86a4e7cb3120f2f5bd5ea94729 100644 (file)
--- a/src/HYDROPy/HYDROData_CalculationCase.sip
+++ b/src/HYDROPy/HYDROData_CalculationCase.sip
@@ -72,15 +72,15 @@ public:
     DataTag_Region,                    ///< reference regions
     DataTag_Polyline,                  ///< reference boundary polyline
     DataTag_GeometryGroup,             ///< reference geometry groups
-    DataTag_SplittedGroups,            ///< reference splitted groups
+    DataTag_SplitGroups,               ///< reference split groups
     DataTag_CustomRules,               ///< custom rules
     DataTag_AssignmentMode,            ///< assignment mode
     DataTag_StricklerTable,            ///< reference Strickler table
-    DataTag_LandCover,                 ///< reference land covers
-    DataTag_CustomLandCoverRules,      ///< custom rules for land covers priority
-    DataTag_AssignmentLandCoverMode,   ///< assignment mode of land covers priority
-       DataTag_ChildLandCoverRegion,      ///< child land cover regions
-    DataTag_LandCoverRegion            ///< reference land cover regions
+    DataTag_LandCover_Obsolete,                 ///< reference land covers
+    DataTag_CustomLandCoverRules_Obsolete,      ///< custom rules for land covers priority
+    DataTag_AssignmentLandCoverMode_Obsolete,   ///< assignment mode of land covers priority
+    DataTag_ChildLandCoverRegion_Obsolete,      ///< child land cover regions
+    DataTag_LandCoverRegion_Obsolete            ///< reference land cover regions
   };
 
 public:      
@@ -108,7 +108,8 @@ public:
   /**
    * Removes reference geometry object from calculation case.
    */
-  void RemoveGeometryObject( HYDROData_Object theObject ) [void ( const Handle_HYDROData_Object& )];
+  void RemoveGeometryObject( HYDROData_Object theObject )
+  [void ( const Handle_HYDROData_Object& )];
   %MethodCode
     Handle(HYDROData_Object) aRef =
       Handle(HYDROData_Object)::DownCast( createHandle( a0 ) );
@@ -222,7 +223,7 @@ public:
    * The label of theZone is changed during this operation
    * because of new region becomes the new parent for this zone.
    */
-  HYDROData_Region AddNewRegion( HYDROData_Zone theZone, const bool theLandCover ) [Handle_HYDROData_Region ( const Handle_HYDROData_Zone&, const bool )];
+  HYDROData_Region AddNewRegion( HYDROData_Zone theZone ) [Handle_HYDROData_Region ( const Handle_HYDROData_Zone& )];
   %MethodCode
     Handle(HYDROData_Zone) aRef =
       Handle(HYDROData_Zone)::DownCast( createHandle( a0 ) );
@@ -231,8 +232,8 @@ public:
     if ( !aRef.IsNull() )
     {
       Py_BEGIN_ALLOW_THREADS
-      aRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::AddNewRegion( aRef, a1 ) : 
-                             sipCpp->AddNewRegion( aRef, a1 );
+      aRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::AddNewRegion( aRef ) : 
+                             sipCpp->AddNewRegion( aRef );
       Py_END_ALLOW_THREADS
     }
     
@@ -243,15 +244,15 @@ public:
    * Add new one reference region for calculation case.
    * The label of theRegion is changed in case if old parent is not this calculation.
    */
-  bool AddRegion( HYDROData_Region theRegion, const bool theLandCover ) [bool ( const Handle_HYDROData_Region&, const bool )];
+  bool AddRegion( HYDROData_Region theRegion ) [bool ( const Handle_HYDROData_Region& )];
   %MethodCode
     Handle(HYDROData_Region) aRef =
       Handle(HYDROData_Region)::DownCast( createHandle( a0 ) );
     if ( !aRef.IsNull() )
     {
       Py_BEGIN_ALLOW_THREADS
-      sipRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::AddRegion( aRef, a1 ):
-                               sipCpp->AddRegion( aRef, a1 );
+      sipRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::AddRegion( aRef ):
+                               sipCpp->AddRegion( aRef );
       Py_END_ALLOW_THREADS
     }
   %End
@@ -259,7 +260,7 @@ public:
   /**
    * Returns all reference regions of calculation case.
    */
-  HYDROData_SequenceOfObjects GetRegions( const bool theLandCover ) const;
+  HYDROData_SequenceOfObjects GetRegions() const;
 
   /**
    * Updates names of regions to correct order.
@@ -269,7 +270,7 @@ public:
   /**
    * Removes reference region from calculation case.
    */
-  void RemoveRegion( HYDROData_Region theRegion, const bool theLandCover ) [void ( const Handle_HYDROData_Region&, const bool )];
+  void RemoveRegion( HYDROData_Region theRegion ) [void ( const Handle_HYDROData_Region& )];
   %MethodCode
     Handle(HYDROData_Region) aRef =
       Handle(HYDROData_Region)::DownCast( createHandle( a0 ) );
@@ -277,9 +278,9 @@ public:
     {
       Py_BEGIN_ALLOW_THREADS
       if ( sipSelfWasArg ) {
-        sipCpp->HYDROData_CalculationCase::RemoveRegion( aRef, a1 );
+        sipCpp->HYDROData_CalculationCase::RemoveRegion( aRef );
       } else {
-        sipCpp->RemoveRegion( aRef, a1 );
+        sipCpp->RemoveRegion( aRef );
       }
       Py_END_ALLOW_THREADS
     }
@@ -288,18 +289,18 @@ public:
   /**
    * Removes all reference regions from calculation case.
    */
-  void RemoveRegions( const bool theLandCover );
+  void RemoveRegions();
 
   
   /**
    * Returns all reference geometry groups of calculation case.
    */
-  HYDROData_SequenceOfObjects GetSplittedGroups() const;
+  HYDROData_SequenceOfObjects GetSplitGroups() const;
 
   /**
    * Removes all reference geometry groups from calculation case.
    */
-  void RemoveSplittedGroups();
+  void RemoveSplitGroups();
 
 
   /**
@@ -398,8 +399,9 @@ public:
    */
   NCollection_Sequence<double> GetAltitudesForPoints( const NCollection_Sequence<double>& theCoordsX,
                                                       const NCollection_Sequence<double>& theCoordsY,
-                                                      HYDROData_Region                    theRegion ) const
-  [NCollection_Sequence<double> ( const NCollection_Sequence<gp_XY>&, const Handle_HYDROData_Region& )];
+                                                      HYDROData_Region                    theRegion,
+                                                      int                                 theMethod = 0) const
+  [NCollection_Sequence<double> ( const NCollection_Sequence<gp_XY>&, const Handle_HYDROData_Region&, int)];
   %MethodCode
 
     NCollection_Sequence<gp_XY> aPnts;
@@ -413,16 +415,39 @@ public:
 
     Handle(HYDROData_Region) aRefRegion =
       Handle(HYDROData_Region)::DownCast( createHandle( a2 ) );
-
+    int aMethod = a3;
+    
     NCollection_Sequence<double> aRes;
     Py_BEGIN_ALLOW_THREADS
-    aRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetAltitudesForPoints( aPnts, aRefRegion ) : 
-                           sipCpp->GetAltitudesForPoints( aPnts, aRefRegion );
+    aRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetAltitudesForPoints( aPnts, aRefRegion, aMethod ) : 
+                           sipCpp->GetAltitudesForPoints( aPnts, aRefRegion, aMethod );
     Py_END_ALLOW_THREADS
     
     sipRes = new NCollection_Sequence<double>( aRes );
   %End
 
+  std::vector<double> GetStricklerCoefficientForPoints( const NCollection_Sequence<double>& theCoordsX,
+                                                        const NCollection_Sequence<double>& theCoordsY,
+                                                        double DefValue,
+                                                        bool UseMax ) const
+  [std::vector<double> ( const NCollection_Sequence<gp_XY>&, double, bool)];
+  %MethodCode
+  std::vector<gp_XY> aPnts;
+  int aLen = qMin( a0->Length(), a1->Length() );
+  for ( int i = 1; i <= aLen; ++i )
+  {
+    gp_XY aPnt( a0->Value( i ), a1->Value( i ) );
+    aPnts.push_back( aPnt );
+  }
+  std::vector<double> aRes;
+  Py_BEGIN_ALLOW_THREADS
+  aRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetStricklerCoefficientForPoints( aPnts, a2, a3 ) : 
+                         sipCpp->GetStricklerCoefficientForPoints( aPnts, a2, a3 );
+  Py_END_ALLOW_THREADS
+  sipRes = new std::vector<double>( aRes );
+  %End
+
+
   /**
    * Returns altitudes for given points on given zone.
    * \param thePoints the points to examine
@@ -431,8 +456,9 @@ public:
    */
   NCollection_Sequence<double> GetAltitudesForPoints( const NCollection_Sequence<double>& theCoordsX,
                                                       const NCollection_Sequence<double>& theCoordsY,
-                                                      HYDROData_Zone                      theZone ) const
-  [NCollection_Sequence<double> ( const NCollection_Sequence<gp_XY>&, const Handle_HYDROData_Zone& )];
+                                                      HYDROData_Zone                      theZone,
+                                                      int                                 theMethod = 0) const
+  [NCollection_Sequence<double> ( const NCollection_Sequence<gp_XY>&, const Handle_HYDROData_Zone&, int )];
   %MethodCode
 
     NCollection_Sequence<gp_XY> aPnts;
@@ -446,11 +472,12 @@ public:
 
     Handle(HYDROData_Zone) aRefZone =
       Handle(HYDROData_Zone)::DownCast( createHandle( a2 ) );
+    int aMethod = a3;
 
     NCollection_Sequence<double> aRes;
     Py_BEGIN_ALLOW_THREADS
-    aRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetAltitudesForPoints( aPnts, aRefZone ) : 
-                           sipCpp->GetAltitudesForPoints( aPnts, aRefZone );
+    aRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetAltitudesForPoints( aPnts, aRefZone, aMethod ) : 
+                           sipCpp->GetAltitudesForPoints( aPnts, aRefZone, aMethod );
     Py_END_ALLOW_THREADS
     
     sipRes = new NCollection_Sequence<double>( aRes );
@@ -462,17 +489,16 @@ public:
    * \return result region
    */
   HYDROData_Region GetRegionFromPoint( const double theCoordX,
-                                       const double theCoordY,
-                                                                          const bool theLandCover ) const
-  [Handle_HYDROData_Region ( const gp_XY&, const bool )];
+                                       const double theCoordY ) const
+  [Handle_HYDROData_Region ( const gp_XY& )];
   %MethodCode
     Handle(HYDROData_Region) aRes;
     
     gp_XY aPnt( a0, a1 );
   
     Py_BEGIN_ALLOW_THREADS
-    aRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetRegionFromPoint( aPnt, a2 ) : 
-                           sipCpp->GetRegionFromPoint( aPnt, a2 );
+    aRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetRegionFromPoint( aPnt ) : 
+                           sipCpp->GetRegionFromPoint( aPnt );
     Py_END_ALLOW_THREADS
     
     sipRes = (HYDROData_Region*)createPointer( aRes );
@@ -484,17 +510,16 @@ public:
    * \return result zone
    */
   HYDROData_Zone GetZoneFromPoint( const double theCoordX,
-                                   const double theCoordY,
-                                                                  const bool theLandCover ) const
-  [Handle_HYDROData_Zone ( const gp_XY&, const bool )];
+                                   const double theCoordY ) const
+  [Handle_HYDROData_Zone ( const gp_XY& )];
   %MethodCode
     Handle(HYDROData_Zone) aRes;
     
     gp_XY aPnt( a0, a1 );
   
     Py_BEGIN_ALLOW_THREADS
-    aRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetZoneFromPoint( aPnt, a2 ) : 
-                           sipCpp->GetZoneFromPoint( aPnt, a2 );
+    aRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetZoneFromPoint( aPnt ) : 
+                           sipCpp->GetZoneFromPoint( aPnt );
     Py_END_ALLOW_THREADS
     
     sipRes = (HYDROData_Zone*)createPointer( aRes );
@@ -544,14 +569,10 @@ public:
   %End
 
   QString DumpRules();
-  QString DumpLandCoverRules();
 
   void SetAssignmentMode( AssignmentMode theMode );
   AssignmentMode GetAssignmentMode() const;
 
-  void SetAssignmentLandCoverMode( AssignmentMode theMode );
-  AssignmentMode GetAssignmentLandCoverMode() const;
-
 protected:
 
   /**