X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_TwoImagesDlg.h;h=b29d18841e4b52e309fda34b80982079e93095a8;hb=71ba58001e1084f0995fff43bf5e4643b153e5e0;hp=8ac3bce73c226095aacdda5918c9306f5f48c5e4;hpb=a51a8a154799a4a022e4f8d5f8547585102e83f7;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_TwoImagesDlg.h b/src/HYDROGUI/HYDROGUI_TwoImagesDlg.h
index 8ac3bce7..b29d1884 100644
--- a/src/HYDROGUI/HYDROGUI_TwoImagesDlg.h
+++ b/src/HYDROGUI/HYDROGUI_TwoImagesDlg.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
@@ -29,6 +25,7 @@ class QCheckBox;
 class QLabel;
 class QLineEdit;
 class QRadioButton;
+class QFrame;
 
 class HYDROGUI_ColorWidget;
 class HYDROGUI_ObjSelector;
@@ -38,7 +35,7 @@ class HYDROGUI_TwoImagesDlg : public HYDROGUI_InputPanel
   Q_OBJECT
 
 public:
-  enum Mode { TwoImages = 0, ImageAndPolyline };
+  enum Mode { TwoFuseImage = 0, TwoCutImage, ImageAndPolyline };
 
 public:
   HYDROGUI_TwoImagesDlg( HYDROGUI_Module* theModule, const QString& theTitle );
@@ -58,12 +55,27 @@ public:
   bool                       getSelectedObjects( QString& theName1,
                                                  QString& theName2 ) const;
 
+  void                       setPreselectedObject( const QString& theName );
+
   void                       setColor( const QColor& theColor );
   QColor                     getColor() const;
 
+signals:
+  /** Signal is emitted if the name has already been selected 
+   *  in other selector of the same parent widget. 
+   * @param theName the selected object name
+   */
+  void                       alreadySelected( const QString& theName );
+
 protected slots:
   void                       onModifySelectedImage( bool theState );
 
+private:
+  /**
+   * Returns whether the mode is to select two images, that corresponds to cut or fuse mode
+   */
+  bool                       isTwoImagesMode() const;
+
 private:
   int                        myMode;
   bool                       myIsEdit;
@@ -80,6 +92,7 @@ private:
   QLabel*                    myPolylineLabel;
   HYDROGUI_ObjSelector*      myPolyline;
 
+  QFrame*                    myBackgroundFrame;
   QRadioButton*              myTransparent;
   QRadioButton*              myColor;
   HYDROGUI_ColorWidget*      myColorBox;