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
refs #550: fix crash when myObject is NULL
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_TwoImagesOp.h
diff --git
a/src/HYDROGUI/HYDROGUI_TwoImagesOp.h
b/src/HYDROGUI/HYDROGUI_TwoImagesOp.h
index ee3bbda7ce5652bce3a32808c86154fad114bbff..8abc7a99df16494f31e80b70291fa474a4c0fd36 100644
(file)
--- 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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-25,15
+21,17
@@
#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:
@@
-41,10
+39,20
@@
protected:
virtual HYDROGUI_InputPanel* createInputPanel() const;
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:
private:
- int myType;
+ int myType;
+ bool myIsEdit;
+ Handle(HYDROData_Image) myEditedObject;
};
#endif
};
#endif