X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_CalculationOp.h;h=909256474537af6d9825243262e5f4621c0921dc;hb=39b1848f103d89cfb544a1651b3fbf221fc2c401;hp=1a5998ad08298e7226992fd26f1e5c0b557be3c8;hpb=5af3b9f9b6d4827b1ba04b7618539bbcd2a704c8;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.h b/src/HYDROGUI/HYDROGUI_CalculationOp.h
index 1a5998ad..90925647 100644
--- a/src/HYDROGUI/HYDROGUI_CalculationOp.h
+++ b/src/HYDROGUI/HYDROGUI_CalculationOp.h
@@ -80,45 +80,21 @@ 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.
+   * Case objects must be split to zones if the case has been modified or new.
    */
   void                            onNext( const int );
   void                            onLastViewClosed( SUIT_ViewManager* );
@@ -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,27 +124,25 @@ protected slots:
   void                            onStricklerTableSelected( const QString & theObjName );
 
   void onOrderChanged( bool& isConfirmed );
-  void onOrderLandCoverChanged( bool& isConfirmed );
 
   void onRuleChanged( bool& isConfirmed );
-  void onRuleLandCoverChanged( 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
@@ -187,8 +161,9 @@ private:
 
   void                            setRules( HYDROData_CalculationCase::DataTag theDataTag );
 
-  bool                            createRegion( const QList<SUIT_DataObject*>& theZonesList,
-                                                const bool theLandCover );
+  bool                            createRegion( const QList<SUIT_DataObject*>& theZonesList );
+
+  void                            AddInterPolylinesToList(QStringList& theList, QStringList& theEntryList);
 
   bool confirmRegionsChange() const;
   bool confirmModeChange() const;
@@ -196,17 +171,11 @@ private:
   bool confirmRuleChange() const;
   bool confirmContinueWithWarning( const HYDROData_Warning& theWarning ) const;
 
-  bool confirmLandCoverRegionsChange() const;
-  bool confirmLandCoverModeChange() const;
-  bool confirmLandCoverOrderChange() const;
-  bool confirmLandCoverRuleChange() const;
-
 private:
   bool                            myIsEdit;
   bool                            myShowZones;
   bool                            myShowGeomObjects;
-  bool                            myShowLandCovers;
-  bool                            myUpdateLandCoverZonesPrs;
+  bool                            myShowLandCoverMap;
   Handle(HYDROData_CalculationCase) myEditedObject;
 
   SUIT_ViewManager*               myActiveViewManager;