X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_CalculationOp.h;h=8eb18c1463deed01f16d76e1f63768623db0b2d2;hb=c16caee6b6e61dffbc739dce6639215b24a459d3;hp=4966ee3cde0e3152a198dea7285e69dc59a822e4;hpb=21eebcb554d7cf6c6ee051aca4f01d84750abce3;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.h b/src/HYDROGUI/HYDROGUI_CalculationOp.h
index 4966ee3c..8eb18c14 100644
--- a/src/HYDROGUI/HYDROGUI_CalculationOp.h
+++ b/src/HYDROGUI/HYDROGUI_CalculationOp.h
@@ -54,6 +54,8 @@ protected:
 
   void setAvailableGroups();
 
+  void setAvailableBoundaryPolygons();
+
 protected slots:
 
   /**
@@ -80,36 +82,25 @@ protected slots:
    */
   void                            onRemoveGroups();
 
-  /**
-   * Change the creation mode related to land covers.
-   * @param theMode the mode to set
-   */
-  void                            onChangeLandCoverMode( int theMode );
+  void                            onAddBoundaryPolygons();
 
-  /**
-   * Add land covers selected in the module browser to the calculation case.
-   */
-  void                            onAddLandCovers();
-  /**
-   * Remove selected land covers from the calculation case.
-   */
-  void                            onRemoveLandCovers();
+  void                            onRemoveBoundaryPolygons();
 
   /**
-   * 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 );
   /**
    * Selected zones are moved to the existing region.
    */
   void                            onMoveZones( SUIT_DataObject* theRegionItem, 
-                                               const QList<SUIT_DataObject*>& theZonesList );
+                                               const QList<SUIT_DataObject*>& theZonesList);
   /**
    * Selected zones are moved to the new region to be created.
    */
   void                            onCreateRegion( 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* );
@@ -118,17 +109,17 @@ protected slots:
    */
   void                            onClickedInZonesBrowser( SUIT_DataObject* theItem );
   /**
-   * Hide zones in the viewer.
+   * Slot called on back button click.
    */
-  void                            onHideZones();
+  void                            onHideZones( const int );
   /** 
    * Geometry object is selected in the list on the first wizard page
    */
   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
    */
@@ -139,13 +130,18 @@ protected slots:
   void                            onStricklerTableSelected( const QString & theObjName );
 
   void onOrderChanged( bool& isConfirmed );
-  void onOrderLandCoverChanged( bool& isConfirmed );
+
+  void onRuleChanged( bool& isConfirmed );
+
+  void onRegenerateColors();
 
 private:
-  void                            createPreview();
-  void                            closePreview();
+  void                            createPreview( const bool theLandCoverMap, bool fitAllFlag = true, bool onTopViewAndFit = true);
+  void                            closePreview( bool theRemoveViewManager = true );
   void                            setObjectVisibility( Handle(HYDROData_Entity) theEntity, const bool theIsVisible );
   void                            setZonesVisible( bool theIsVisible );
+  void                            setGeomObjectsVisible( bool theIsVisible );
+  void                            setLandCoverMapVisible( bool theIsVisible );
   void                            getNamesAndEntries( const HYDROData_SequenceOfObjects& theSeq, 
                                                       QStringList& theNames, QStringList& theEntries ) const;
 
@@ -153,35 +149,23 @@ private:
    * Internal method that used to assign unique default colors for zones
    */
   void                            AssignDefaultZonesColors();
-  /**
-   * Internal method that used to generate default color for zone
-   * @param theIndex the index of color to be generated
-   * @param theSaturation the saturation of the color in the range 0 to 1,
-   * and the bigger it is, the stronger the color is. Grayish colors have
-   * saturation near 0, very strong colors have saturation near 1.
-   * The defalt value is 0.5.
-   * @param theValue the value in the range 0 to 1, represents lightness or
-   * brightness of the color. 0 is black, 1 is as far from black as possible.
-   * The defalt value is 0.95.
-   * \return the generated color
-   */
-  QColor                          GenerateDefaultZonesColor( int theIndex,
-                                                             float theSaturation = 0.5,
-                                                             float theValue = 0.95 ) const;
-
   void                            setRules( HYDROData_CalculationCase::DataTag theDataTag );
 
+  bool                            createRegion( const QList<SUIT_DataObject*>& theZonesList );
+
+  void                            AddInterPolylinesToList(QStringList& theList, QStringList& theEntryList);
+
   bool confirmRegionsChange() const;
   bool confirmModeChange() const;
   bool confirmOrderChange() const;
+  bool confirmRuleChange() const;
   bool confirmContinueWithWarning( const HYDROData_Warning& theWarning ) const;
 
-  bool confirmLandCoverModeChange() const;
-  bool confirmLandCoverOrderChange() const;
-
 private:
   bool                            myIsEdit;
   bool                            myShowZones;
+  bool                            myShowGeomObjects;
+  bool                            myShowLandCoverMap;
   Handle(HYDROData_CalculationCase) myEditedObject;
 
   SUIT_ViewManager*               myActiveViewManager;