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

diff --git a/src/HYDROGUI/HYDROGUI_TwoImagesOp.h b/src/HYDROGUI/HYDROGUI_TwoImagesOp.h
index 5b98368a..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
@@ -25,22 +21,38 @@
 
 #include "HYDROGUI_Operation.h"
 
+#include <HYDROData_Image.h>
+
 class HYDROGUI_TwoImagesOp : public HYDROGUI_Operation
 {
   Q_OBJECT
 
 public:
-  HYDROGUI_TwoImagesOp( HYDROGUI_Module* theModule, const QString& theTitle );
+  enum OperationType { Fuse, Cut, Split };
+
+public:
+  HYDROGUI_TwoImagesOp( HYDROGUI_Module* theModule, const int theType, const bool theIsEdit );
   virtual ~HYDROGUI_TwoImagesOp();
 
 protected:
+  virtual void               startOperation();
+
   virtual HYDROGUI_InputPanel* createInputPanel() const;
 
+  virtual bool               processApply( int& theUpdateFlags, QString& theErrorMsg,
+                                           QStringList& theBrowseObjectsEntries );
+
 protected slots:
-  virtual void OnApply();
+  /** 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:
-  QString myTitle;
+  int                        myType;
+  bool                       myIsEdit;
+  Handle(HYDROData_Image)    myEditedObject;
 };
 
 #endif