Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
[modules/shaper.git]
/
src
/
XGUI
/
XGUI_OperationMgr.h
diff --git
a/src/XGUI/XGUI_OperationMgr.h
b/src/XGUI/XGUI_OperationMgr.h
index e69eb70fa9364bac121c3b996ac3c65b2f486bb3..eb0e7541a753675a929521bc09d0342576d81937 100644
(file)
--- a/
src/XGUI/XGUI_OperationMgr.h
+++ b/
src/XGUI/XGUI_OperationMgr.h
@@
-74,9
+74,6
@@
Q_OBJECT
/// \return the state whether the current operation is started
bool startOperation(ModuleBase_Operation* theOperation);
/// \return the state whether the current operation is started
bool startOperation(ModuleBase_Operation* theOperation);
- /// Abort all operations
- bool abortAllOperations();
-
/// Returns whether the operation can be started. Check if there is already started operation and
/// the granted parameter of the launched operation
/// \param theId id of the operation which is going to start
/// Returns whether the operation can be started. Check if there is already started operation and
/// the granted parameter of the launched operation
/// \param theId id of the operation which is going to start
@@
-104,6
+101,10
@@
Q_OBJECT
void onAbortOperation();
/// Slot that validates the current operation using the validateOperation method.
void onValidateOperation();
void onAbortOperation();
/// Slot that validates the current operation using the validateOperation method.
void onValidateOperation();
+ /// Commit all operations
+ bool commitAllOperations();
+ /// Abort all operations
+ bool abortAllOperations();
signals:
/// Signal about an operation is started. It is emitted after the start() of operation is done.
signals:
/// Signal about an operation is started. It is emitted after the start() of operation is done.
@@
-123,7
+124,10
@@
signals:
void operationAborted(ModuleBase_Operation* theOperation);
/// Signal is emitted after the apply enable state changed.
void operationAborted(ModuleBase_Operation* theOperation);
/// Signal is emitted after the apply enable state changed.
- void applyEnableChanged(bool);
+ void validationStateChanged(bool);
+
+ /// Signal is emitted after the apply enable state changed.
+ void nestedStateChanged(bool);
/// Signal is emitted after the current operation is filled with existing preselection.
void operationActivatedByPreselection();
/// Signal is emitted after the current operation is filled with existing preselection.
void operationActivatedByPreselection();
@@
-131,7
+135,6
@@
signals:
/// Signal is emitted after the key released click.
void keyEnterReleased();
/// Signal is emitted after the key released click.
void keyEnterReleased();
-
protected:
/// Commits the current operatin if it is valid
bool commitOperation();
protected:
/// Commits the current operatin if it is valid
bool commitOperation();