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 #476: more robust resolving conflicts
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_DigueOp.h
diff --git
a/src/HYDROGUI/HYDROGUI_DigueOp.h
b/src/HYDROGUI/HYDROGUI_DigueOp.h
index 87db05f80001bf3bebba5cd2a9642743e8da4a5f..f5c434555423de87a6a132bf9d29adea856cb250 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_DigueOp.h
+++ b/
src/HYDROGUI/HYDROGUI_DigueOp.h
@@
-35,11
+35,20
@@
public:
protected:
protected:
- virtual void startOperation();
+ virtual void startOperation();
+
+ virtual bool processApply( int& theUpdateFlags, QString& theErrorMsg,
+ QStringList& theBrowseObjectsEntries );
virtual HYDROGUI_InputPanel* createInputPanel() const;
virtual HYDROGUI_InputPanel* createInputPanel() const;
- virtual Handle(HYDROData_Channel) getObjectToEdit() const;
+protected:
+
+ virtual Handle(HYDROData_Channel) createNewObject() const;
+
+ virtual QColor getDefaultFillingColor() const;
+
+ virtual QColor getDefaultBorderColor() const;
private:
private: