Merge remote-tracking branch 'origin/BR_LAND_COVER' into BR_v14_rc

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_ColorDlg.h

diff --git a/src/HYDROGUI/HYDROGUI_ColorDlg.h b/src/HYDROGUI/HYDROGUI_ColorDlg.h
index 4287e266329bdbffffaea3fff2f261a414ed01d1..8faa03c60fc4a6534e83190523b141ab541f4d24 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ColorDlg.h
+++ b/src/HYDROGUI/HYDROGUI_ColorDlg.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,8 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
+
+
 #ifndef HYDROGUI_COLORDLG_H
 #define HYDROGUI_COLORDLG_H
 
@@ -34,14 +32,14 @@ class HYDROGUI_ColorDlg : public QDialog
   Q_OBJECT
 
 public:
-  HYDROGUI_ColorDlg( QWidget* );
+  HYDROGUI_ColorDlg( QWidget* theParent, bool theIsOneColor );
   virtual ~HYDROGUI_ColorDlg();
   
-  void                       setFillingColor( const QColor& theColor );
-  QColor                     getFillingColor() const;
+  void                       setFirstColor( const QColor& theColor );
+  QColor                     getFirstColor() const;
 
-  void                       setBorderColor( const QColor& theColor );
-  QColor                     getBorderColor() const;
+  void                       setSecondColor( const QColor& theColor );
+  QColor                     getSecondColor() const;
 
 protected slots:
 
@@ -52,6 +50,10 @@ private:
 
   QGroupBox*                 myBorderColorGroup;
   HYDROGUI_ColorWidget*      myBorderColorBox;
+
+  HYDROGUI_ColorWidget*      myColorBox;
+
+  bool                       myIsOneColor;
 };
 
 #endif