#571 - Land Cover: calculation of Strickler coefficient

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_CalculationOp.h

diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.h b/src/HYDROGUI/HYDROGUI_CalculationOp.h
index dfcf2f6f597581a7d90a49cfdb00ff80f00643b9..17134b7eb2513200510bfd4332ab1ce6917bec2d 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_CalculationOp.h
+++ b/src/HYDROGUI/HYDROGUI_CalculationOp.h
@@ -96,9 +96,9 @@ 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.
    */
@@ -152,7 +152,7 @@ protected slots:
 
 private:
   void                            createPreview( const bool theLandCover);
-  void                            closePreview();
+  void                            closePreview( bool theRemoveViewManager = true );
   void                            setObjectVisibility( Handle(HYDROData_Entity) theEntity, const bool theIsVisible );
   void                            setZonesVisible( bool theIsVisible, const bool theLandCover );
   void                            getNamesAndEntries( const HYDROData_SequenceOfObjects& theSeq,