correct merge BR_hydro_v1_0_3 on BR_quadtree

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

diff --git a/src/HYDROGUI/HYDROGUI_TwoImagesOp.h b/src/HYDROGUI/HYDROGUI_TwoImagesOp.h
index d537f4c6ef8ca8e42597e2ec31ec65fc2438e569..274224a19c3d721fed166549fb86451be2a64558 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_TwoImagesOp.h
+++ b/src/HYDROGUI/HYDROGUI_TwoImagesOp.h
@@ -32,10 +32,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 +43,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;