Merge branch 'BR_LAND_COVER' of ssh://git.salome-platform.org/modules/hydro into...

diff --cc src/HYDROGUI/HYDROGUI_CalculationDlg.cxx
Simple merge

diff --cc src/HYDROGUI/HYDROGUI_CalculationOp.cxx
index e6b9ea7248c52770ed199955b3765dd8e553c3e7,a63a43542a29895c315cec94d3be7bbb6ceae889..e00d3a44acbb29fafcf7050786eb0a17c078ecf7
--- 1/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
--- 2/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
@@@ -541,26 -538,6 +541,26 @@@ void HYDROGUI_CalculationOp::onSetMerge
    }
  }
  
-       aZone->setMergeStricklerType( theMergeType, theStricklerTypeName );
 +void HYDROGUI_CalculationOp::onSetMergeStricklerType( int theMergeType, QString& theStricklerTypeName )
 +{
 +  HYDROGUI_CalculationDlg* aPanel = 
 +    ::qobject_cast<HYDROGUI_CalculationDlg*>( inputPanel() );
 +  if ( aPanel )
 +  {
 +    HYDROGUI_Zone* aZone = aPanel->getCurrentZone();
 +    if ( aZone )
 +    {
++      aZone->setMergeType( theMergeType, theStricklerTypeName );
 +      HYDROGUI_Shape* aShape = module()->getObjectShape( HYDROGUI_Module::VMR_PreviewCaseZones, aZone->modelObject() );
 +      if ( aShape )
 +      {
 +        aShape->update( true, false );
 +      }
 +    }
 +    aPanel->refreshLandCoverZonesBrowser();
 +  }
 +}
 +
  void HYDROGUI_CalculationOp::onAddObjects()
  {
    HYDROGUI_CalculationDlg* aPanel = 

diff --cc src/HYDROGUI/HYDROGUI_CalculationOp.h
index dfcf2f6f597581a7d90a49cfdb00ff80f00643b9,6629e1c15d5617457a64714b40b6017f8a1dcaaa..263efd4fce4dfa7a1bb613965356b69f37990b68
--- 1/src/HYDROGUI/HYDROGUI_CalculationOp.h
--- 2/src/HYDROGUI/HYDROGUI_CalculationOp.h
+++ b/src/HYDROGUI/HYDROGUI_CalculationOp.h
@@@ -96,13 -96,9 +96,13 @@@ protected slots
    void                            onRemoveLandCovers();
  
    /**
-    * Set the given bathymetry merge type to the current zone.
+    * Set the given bathymetry/type merge type to the current zone.
     */
-   void                            onSetMergeType( int theMergeType, QString& theBathymetryName );
+   void                            onSetMergeType( int theMergeType, QString& theMergeObjectName );
 +  /**
 +   * Set the given Strickler merge type to the current zone.
 +   */
 +  void                            onSetMergeStricklerType( int theMergeType, QString& theStricklerTypeName );
    /**
     * Selected zones are moved to the existing region.
     */