X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_CalculationOp.h;h=9d2dc0d1b5a91326b7b6d844b5a188750f30d134;hb=18bf2fdae8933e8a31ca58f36b6dceb7a4a8cf42;hp=dfcf2f6f597581a7d90a49cfdb00ff80f00643b9;hpb=d4cd71fc291a732783caf61bebde87fe5b4bfc92;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.h b/src/HYDROGUI/HYDROGUI_CalculationOp.h
index dfcf2f6f..9d2dc0d1 100644
--- 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.
    */
@@ -127,7 +127,7 @@ protected slots:
    */
   void                            onClickedInZonesBrowser( SUIT_DataObject* theItem );
   /**
-   * Hide zones in the viewer.
+   * Slot called on back button click.
    */
   void                            onHideZones( const int );
   /** 
@@ -152,9 +152,11 @@ 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                            setGeomObjectsVisible( bool theIsVisible );
+  void                            setLandCoversVisible( bool theIsVisible );
   void                            getNamesAndEntries( const HYDROData_SequenceOfObjects& theSeq, 
                                                       QStringList& theNames, QStringList& theEntries ) const;
 
@@ -188,12 +190,15 @@ private:
   bool confirmOrderChange() const;
   bool confirmContinueWithWarning( const HYDROData_Warning& theWarning ) const;
 
+  bool confirmLandCoverRegionsChange() const;
   bool confirmLandCoverModeChange() const;
   bool confirmLandCoverOrderChange() const;
 
 private:
   bool                            myIsEdit;
   bool                            myShowZones;
+  bool                            myShowGeomObjects;
+  bool                            myShowLandCovers;
   Handle(HYDROData_CalculationCase) myEditedObject;
 
   SUIT_ViewManager*               myActiveViewManager;