X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_CalculationOp.h;h=4966ee3cde0e3152a198dea7285e69dc59a822e4;hb=d6e19029f8b41f295db878e9aecf451c2edda4af;hp=271bb52d6613d30822d346f3adc439c03dc1ca96;hpb=6d592627e88a395398a02d7b884796e85331c1c1;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.h b/src/HYDROGUI/HYDROGUI_CalculationOp.h
index 271bb52d..4966ee3c 100644
--- a/src/HYDROGUI/HYDROGUI_CalculationOp.h
+++ b/src/HYDROGUI/HYDROGUI_CalculationOp.h
@@ -1,12 +1,8 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015  EDF-R&D
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,6 +16,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
+
 #ifndef HYDROGUI_CALCULATIONOP_H
 #define HYDROGUI_CALCULATIONOP_H
 
@@ -83,6 +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 merge type to the current zone.
    */
@@ -113,10 +125,21 @@ protected slots:
    * 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
+   */
+  void                            onLandCoversSelected();
   /** 
    * Boundary polyline is selected in the list on the first wizard page
    */
-  void                            onBoundarySelected ( const QString & theObjName );
+  void                            onBoundarySelected( const QString & theObjName );
+  /** 
+   * Strickler table name is selected in the list on the third wizard page
+   */
+  void                            onStricklerTableSelected( const QString & theObjName );
+
+  void onOrderChanged( bool& isConfirmed );
+  void onOrderLandCoverChanged( bool& isConfirmed );
 
 private:
   void                            createPreview();
@@ -127,23 +150,34 @@ private:
                                                       QStringList& theNames, QStringList& theEntries ) const;
 
   /**
-   * Ask user to confirm splitting zones recalculation after regions list modification.
-   * \return true if confirmed
+   * Internal method that used to assign unique default colors for zones
    */
-  bool                            confirmRegionsChange() const;
-
+  void                            AssignDefaultZonesColors();
   /**
-   * Ask user to confirm splitting zones recalculation after mode change.
-   * \return true if confirmed
-   */
-  bool                            confirmModeChange() const;
-
-  /**
-   * Ask user to confirm the operation continuation with warning.
-   * @param theWarning the warning
-   * \return true if confirmed
-   */
-  bool                            confirmContinueWithWarning( const HYDROData_Warning& theWarning ) const;
+   * 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 confirmRegionsChange() const;
+  bool confirmModeChange() const;
+  bool confirmOrderChange() const;
+  bool confirmContinueWithWarning( const HYDROData_Warning& theWarning ) const;
+
+  bool confirmLandCoverModeChange() const;
+  bool confirmLandCoverOrderChange() const;
 
 private:
   bool                            myIsEdit;