X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_CalculationOp.h;h=5ae6b3d887c8235401b685bac3a031c08eca0e26;hb=a53349567d67f4df0ef737798a25c24d9dc8f08e;hp=d64b483e7a729d03946baaced9833715f7a0bc1c;hpb=c7917bada8643db80254fe2a3b3a91d25548b484;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_CalculationOp.h b/src/HYDROGUI/HYDROGUI_CalculationOp.h
index d64b483e..5ae6b3d8 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
 
@@ -118,6 +115,8 @@ protected slots:
    */
   void                            onBoundarySelected ( const QString & theObjName );
 
+  void onOrderChanged( bool& isConfirmed );
+
 private:
   void                            createPreview();
   void                            closePreview();
@@ -127,16 +126,29 @@ 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
+   * 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
    */
-  bool                            confirmModeChange() const;
+  QColor                          GenerateDefaultZonesColor( int theIndex,
+                                                             float theSaturation = 0.5,
+                                                             float theValue = 0.95 ) const;
+
+  bool confirmRegionsChange() const;
+  bool confirmModeChange() const;
+  bool confirmOrderChange() const;
+  bool confirmContinueWithWarning( const HYDROData_Warning& theWarning ) const;
 
 private:
   bool                            myIsEdit;