X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_TwoImagesOp.h;h=8abc7a99df16494f31e80b70291fa474a4c0fd36;hb=a53349567d67f4df0ef737798a25c24d9dc8f08e;hp=d537f4c6ef8ca8e42597e2ec31ec65fc2438e569;hpb=0d25f237574f54902a8d972ebc613301acfe3e43;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_TwoImagesOp.h b/src/HYDROGUI/HYDROGUI_TwoImagesOp.h
index d537f4c6..8abc7a99 100644
--- a/src/HYDROGUI/HYDROGUI_TwoImagesOp.h
+++ b/src/HYDROGUI/HYDROGUI_TwoImagesOp.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
@@ -32,10 +28,10 @@ class HYDROGUI_TwoImagesOp : public HYDROGUI_Operation
   Q_OBJECT
 
 public:
-  enum OperationType { Fuse, Cut, Edit };
+  enum OperationType { Fuse, Cut, Split };
 
 public:
-  HYDROGUI_TwoImagesOp( HYDROGUI_Module* theModule, const int theType );
+  HYDROGUI_TwoImagesOp( HYDROGUI_Module* theModule, const int theType, const bool theIsEdit );
   virtual ~HYDROGUI_TwoImagesOp();
 
 protected:
@@ -43,7 +39,15 @@ protected:
 
   virtual HYDROGUI_InputPanel* createInputPanel() const;
 
-  virtual bool               processApply( int& theUpdateFlags, QString& theErrorMsg );
+  virtual bool               processApply( int& theUpdateFlags, QString& theErrorMsg,
+                                           QStringList& theBrowseObjectsEntries );
+
+protected slots:
+  /** Show warning if the name has already been selected 
+   *  in other selector of the same parent widget. 
+   * @param theName the selected object name
+   */
+  void                       onAlreadySelected( const QString& theName );
 
 private:
   int                        myType;