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

diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.h b/src/HYDROGUI/HYDROGUI_CalculationOp.h
index b4961a35..9d2dc0d1 100644
--- a/src/HYDROGUI/HYDROGUI_CalculationOp.h
+++ b/src/HYDROGUI/HYDROGUI_CalculationOp.h
@@ -96,18 +96,27 @@ 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.
    */
   void                            onMoveZones( SUIT_DataObject* theRegionItem, 
-                                               const QList<SUIT_DataObject*>& theZonesList );
+                                               const QList<SUIT_DataObject*>& theZonesList,
+                                               bool theLandCover );
   /**
    * Selected zones are moved to the new region to be created.
    */
   void                            onCreateRegion( const QList<SUIT_DataObject*>& theZonesList );
+  /**
+   * Selected land cover zones are moved to the new region to be created.
+   */
+  void                            onCreateLandCoverRegion( const QList<SUIT_DataObject*>& theZonesList );
   /**
    * Case objects must be splitted to zones if the case has been modified or new.
    */
@@ -120,7 +129,7 @@ protected slots:
   /**
    * Slot called on back button click.
    */
-  void                            onBack( const int );
+  void                            onHideZones( const int );
   /** 
    * Geometry object is selected in the list on the first wizard page
    */
@@ -142,18 +151,19 @@ protected slots:
   void onOrderLandCoverChanged( bool& isConfirmed );
 
 private:
-  void                            createPreview();
-  void                            closePreview();
+  void                            createPreview( const bool theLandCover);
+  void                            closePreview( bool theRemoveViewManager = true );
   void                            setObjectVisibility( Handle(HYDROData_Entity) theEntity, const bool theIsVisible );
-  void                            setZonesVisible( 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;
 
   /**
    * Internal method that used to assign unique default colors for zones
    */
-  void                            AssignDefaultZonesColors();
+  void                            AssignDefaultZonesColors( const bool theLandCover );
   /**
    * Internal method that used to generate default color for zone
    * @param theIndex the index of color to be generated
@@ -172,11 +182,15 @@ private:
 
   void                            setRules( HYDROData_CalculationCase::DataTag theDataTag );
 
+  bool                            createRegion( const QList<SUIT_DataObject*>& theZonesList,
+                                                const bool theLandCover );
+
   bool confirmRegionsChange() const;
   bool confirmModeChange() const;
   bool confirmOrderChange() const;
   bool confirmContinueWithWarning( const HYDROData_Warning& theWarning ) const;
 
+  bool confirmLandCoverRegionsChange() const;
   bool confirmLandCoverModeChange() const;
   bool confirmLandCoverOrderChange() const;
 
@@ -184,6 +198,7 @@ private:
   bool                            myIsEdit;
   bool                            myShowZones;
   bool                            myShowGeomObjects;
+  bool                            myShowLandCovers;
   Handle(HYDROData_CalculationCase) myEditedObject;
 
   SUIT_ViewManager*               myActiveViewManager;