Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge trunk on BR_quadtree 20140820
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_TwoImagesOp.h
diff --git
a/src/HYDROGUI/HYDROGUI_TwoImagesOp.h
b/src/HYDROGUI/HYDROGUI_TwoImagesOp.h
index 2fc1e0cc74a478bed870cf593b2d7132d434044a..274224a19c3d721fed166549fb86451be2a64558 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_TwoImagesOp.h
+++ b/
src/HYDROGUI/HYDROGUI_TwoImagesOp.h
@@
-25,25
+25,38
@@
#include "HYDROGUI_Operation.h"
#include "HYDROGUI_Operation.h"
+#include <HYDROData_Image.h>
+
class HYDROGUI_TwoImagesOp : public HYDROGUI_Operation
{
Q_OBJECT
public:
class HYDROGUI_TwoImagesOp : public HYDROGUI_Operation
{
Q_OBJECT
public:
- enum OperationType { Fuse, Cut };
+ enum OperationType { Fuse, Cut
, Split
};
public:
public:
- HYDROGUI_TwoImagesOp( HYDROGUI_Module* theModule, const int theType );
+ HYDROGUI_TwoImagesOp( HYDROGUI_Module* theModule, const int theType
, const bool theIsEdit
);
virtual ~HYDROGUI_TwoImagesOp();
protected:
virtual ~HYDROGUI_TwoImagesOp();
protected:
+ virtual void startOperation();
+
virtual HYDROGUI_InputPanel* createInputPanel() const;
virtual HYDROGUI_InputPanel* createInputPanel() const;
+ virtual bool processApply( int& theUpdateFlags, QString& theErrorMsg,
+ QStringList& theBrowseObjectsEntries );
+
protected slots:
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:
private:
- int myType;
+ int myType;
+ bool myIsEdit;
+ Handle(HYDROData_Image) myEditedObject;
};
#endif
};
#endif