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
Fix for the bug #42: point C is not activated, but point C is shown in preview in...
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_TwoImagesOp.h
diff --git
a/src/HYDROGUI/HYDROGUI_TwoImagesOp.h
b/src/HYDROGUI/HYDROGUI_TwoImagesOp.h
index 8940d854e12ecdf33b4a102600746acd237a0047..83ef1de94f2e4ae824acf17180492e2299c1d46e 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_TwoImagesOp.h
+++ b/
src/HYDROGUI/HYDROGUI_TwoImagesOp.h
@@
-25,24
+25,30
@@
#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
);
+ virtual bool
processApply( int& theUpdateFlags, QString& theErrorMsg
);
private:
private:
- int myType;
+ int myType;
+ bool myIsEdit;
+ Handle(HYDROData_Image) myEditedObject;
};
#endif
};
#endif