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

diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.h b/src/HYDROGUI/HYDROGUI_CalculationOp.h
index 9d2dc0d1..a74d7b06 100644
--- a/src/HYDROGUI/HYDROGUI_CalculationOp.h
+++ b/src/HYDROGUI/HYDROGUI_CalculationOp.h
@@ -80,43 +80,19 @@ protected slots:
    */
   void                            onRemoveGroups();
 
-  /**
-   * Change the creation mode related to land covers.
-   * @param theMode the mode to set
-   */
-  void                            onChangeLandCoverMode( int theMode );
-
-  /**
-   * Add land covers selected in the module browser to the calculation case.
-   */
-  void                            onAddLandCovers();
-  /**
-   * Remove selected land covers from the calculation case.
-   */
-  void                            onRemoveLandCovers();
-
   /**
    * Set the given bathymetry/type merge type to the current zone.
    */
   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,
-                                               bool theLandCover );
+                                               const QList<SUIT_DataObject*>& theZonesList);
   /**
    * 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.
    */
@@ -135,9 +111,9 @@ protected slots:
    */
   void                            onObjectsSelected();
   /** 
-   * Land cover is selected in the list on the third wizard page
+   * Land cover map is selected in the list on the third wizard page
    */
-  void                            onLandCoversSelected();
+  void                            onLandCoverMapSelected( const QString & theObjName );
   /** 
    * Boundary polyline is selected in the list on the first wizard page
    */
@@ -148,22 +124,25 @@ protected slots:
   void                            onStricklerTableSelected( const QString & theObjName );
 
   void onOrderChanged( bool& isConfirmed );
-  void onOrderLandCoverChanged( bool& isConfirmed );
+
+  void onRuleChanged( bool& isConfirmed );
+
+  void onRegenerateColors();
 
 private:
-  void                            createPreview( const bool theLandCover);
+  void                            createPreview( const bool theLandCoverMap);
   void                            closePreview( bool theRemoveViewManager = true );
   void                            setObjectVisibility( Handle(HYDROData_Entity) theEntity, const bool theIsVisible );
-  void                            setZonesVisible( bool theIsVisible, const bool theLandCover );
+  void                            setZonesVisible( bool theIsVisible );
   void                            setGeomObjectsVisible( bool theIsVisible );
-  void                            setLandCoversVisible( bool theIsVisible );
+  void                            setLandCoverMapVisible( 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( const bool theLandCover );
+  void                            AssignDefaultZonesColors();
   /**
    * Internal method that used to generate default color for zone
    * @param theIndex the index of color to be generated
@@ -182,23 +161,19 @@ private:
 
   void                            setRules( HYDROData_CalculationCase::DataTag theDataTag );
 
-  bool                            createRegion( const QList<SUIT_DataObject*>& theZonesList,
-                                                const bool theLandCover );
+  bool                            createRegion( const QList<SUIT_DataObject*>& theZonesList );
 
   bool confirmRegionsChange() const;
   bool confirmModeChange() const;
   bool confirmOrderChange() const;
+  bool confirmRuleChange() 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;
+  bool                            myShowLandCoverMap;
   Handle(HYDROData_CalculationCase) myEditedObject;
 
   SUIT_ViewManager*               myActiveViewManager;