X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROPy%2FHYDROData_CalculationCase.sip;h=34b906213fba2d0ee7a801e6e9ba5487cf10b5d1;hb=10a9948d19f358b0ccf850d362d8ad8173b3ea5f;hp=0579fb9a56865066328b005fbe9d82898fd52c67;hpb=3a1dd3f29ff9b985b0aa2366a2afd5724286cb6e;p=modules%2Fhydro.git

diff --git a/src/HYDROPy/HYDROData_CalculationCase.sip b/src/HYDROPy/HYDROData_CalculationCase.sip
index 0579fb9a..34b90621 100644
--- a/src/HYDROPy/HYDROData_CalculationCase.sip
+++ b/src/HYDROPy/HYDROData_CalculationCase.sip
@@ -269,7 +269,7 @@ public:
   /**
    * Removes reference region from calculation case.
    */
-  void RemoveRegion( HYDROData_Region theRegion ) [void ( const Handle_HYDROData_Region& )];
+  void RemoveRegion( HYDROData_Region theRegion, const bool theLandCover ) [void ( const Handle_HYDROData_Region&, const bool )];
   %MethodCode
     Handle(HYDROData_Region) aRef =
       Handle(HYDROData_Region)::DownCast( createHandle( a0 ) );
@@ -277,9 +277,9 @@ public:
     {
       Py_BEGIN_ALLOW_THREADS
       if ( sipSelfWasArg ) {
-        sipCpp->HYDROData_CalculationCase::RemoveRegion( aRef );
+        sipCpp->HYDROData_CalculationCase::RemoveRegion( aRef, a1 );
       } else {
-        sipCpp->RemoveRegion( aRef );
+        sipCpp->RemoveRegion( aRef, a1 );
       }
       Py_END_ALLOW_THREADS
     }
@@ -316,6 +316,22 @@ public:
 public:      
   // Public methods to work with Calculation services
 
+  /**
+   * Returns strickler coefficient for given point.
+   * \param thePoint the point to examine
+   * \return result strickler coefficient
+   */
+  double GetStricklerCoefficientForPoint( const double theCoordX,
+                                          const double theCoordY ) const [double ( const gp_XY& ) ];
+  %MethodCode
+    gp_XY aPnt( a0, a1 );
+  
+    Py_BEGIN_ALLOW_THREADS
+    sipRes = sipSelfWasArg ? sipCpp->HYDROData_CalculationCase::GetStricklerCoefficientForPoint( aPnt ) : 
+                             sipCpp->GetStricklerCoefficientForPoint( aPnt );
+    Py_END_ALLOW_THREADS
+  %End
+
   /**
    * Returns altitude for given point.
    * \param thePoint the point to examine
@@ -512,9 +528,9 @@ public:
   void AddRule( HYDROData_Entity                   theObject1,
                 HYDROData_PriorityType             thePriority,
                 HYDROData_Entity                   theObject2,
-                HYDROData_Zone::MergeAltitudesType theMergeType,
+                HYDROData_Zone::MergeType          theMergeType,
 				HYDROData_CalculationCase::DataTag theDataTag )
-  [void ( const Handle_HYDROData_Entity&, HYDROData_PriorityType, const Handle_HYDROData_Entity&, HYDROData_Zone::MergeAltitudesType, HYDROData_CalculationCase::DataTag )];
+  [void ( const Handle_HYDROData_Entity&, HYDROData_PriorityType, const Handle_HYDROData_Entity&, HYDROData_Zone::MergeType, HYDROData_CalculationCase::DataTag )];
   %MethodCode
     Handle(HYDROData_Entity) anObject1 =
       Handle(HYDROData_Entity)::DownCast( createHandle( a0 ) );
@@ -528,10 +544,14 @@ public:
   %End
 
   QString DumpRules();
+  QString DumpLandCoverRules();
 
   void SetAssignmentMode( AssignmentMode theMode );
   AssignmentMode GetAssignmentMode() const;
 
+  void SetAssignmentLandCoverMode( AssignmentMode theMode );
+  AssignmentMode GetAssignmentLandCoverMode() const;
+
 protected:
 
   /**