X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_TwoImagesOp.h;h=095d47f100cae27538e2b148d3040e45bbcacec7;hb=a1431f03eac1d1aed4203d0568d987c41ce939b3;hp=59404f65aed3736e8695903f0eb7bb3b24dc75bb;hpb=c66fbd26a75a044039dc2b2f8dea2249582deabc;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_TwoImagesOp.h b/src/HYDROGUI/HYDROGUI_TwoImagesOp.h
index 59404f65..095d47f1 100644
--- a/src/HYDROGUI/HYDROGUI_TwoImagesOp.h
+++ b/src/HYDROGUI/HYDROGUI_TwoImagesOp.h
@@ -1,25 +1,61 @@
-
-#ifndef HYDROGUI_TWO_IMAGE_OP_HEADER
-#define HYDROGUI_TWO_IMAGE_OP_HEADER
-
-#include <HYDROGUI_Operation.h>
+// 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
+//
+// 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.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+#ifndef HYDROGUI_TWOIMAGESOP_H
+#define HYDROGUI_TWOIMAGESOP_H
+
+#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 );
+
 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