From: mkr <mkr@opencascade.com>
Date: Fri, 19 Jun 2015 12:22:04 +0000 (+0300)
Subject: Merge branch 'BR_LAND_COVER' of ssh://git.salome-platform.org/modules/hydro into... 
X-Git-Tag: v1.4.2~53^2~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=69048e668dcd9f681a48054df3b01a84d7ed773e;p=modules%2Fhydro.git

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

69048e668dcd9f681a48054df3b01a84d7ed773e
diff --cc src/HYDROGUI/HYDROGUI_CalculationOp.cxx
index e6b9ea72,a63a4354..e00d3a44
--- a/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_CalculationOp.cxx
@@@ -541,26 -538,6 +541,26 @@@ void HYDROGUI_CalculationOp::onSetMerge
    }
  }
  
 +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->setMergeStricklerType( theMergeType, theStricklerTypeName );
++      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 dfcf2f6f,6629e1c1..263efd4f
--- a/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.
     */