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
Fix for issue #1174
[modules/shaper.git]
/
src
/
ModuleBase
/
ModuleBase_OperationFeature.h
diff --git
a/src/ModuleBase/ModuleBase_OperationFeature.h
b/src/ModuleBase/ModuleBase_OperationFeature.h
index f32bbb384462dca759a9160be9ac25add6aa3a02..ab0ce8c900ab13485f5ecf6333ff950674daf10b 100755
(executable)
--- a/
src/ModuleBase/ModuleBase_OperationFeature.h
+++ b/
src/ModuleBase/ModuleBase_OperationFeature.h
@@
-67,7
+67,9
@@
Q_OBJECT
/// Change the operation mode from create to edit.
/// The transaction and the operation name in the model history of transaction are the same.
/// It updates the edit state in the widgets of property panel
/// Change the operation mode from create to edit.
/// The transaction and the operation name in the model history of transaction are the same.
/// It updates the edit state in the widgets of property panel
- void setEditOperation();
+ /// \param theRestartTransaction if true, the current model transaction is committed and
+ /// the new one is started
+ void setEditOperation(const bool theRestartTransaction);
/// Returns the operation feature
/// \return the feature
/// Returns the operation feature
/// \return the feature
@@
-113,7
+115,7
@@
Q_OBJECT
CompositeFeaturePtr parentFeature() const;
/// Stores the previous to the operation current feature
CompositeFeaturePtr parentFeature() const;
/// Stores the previous to the operation current feature
- /// \
set
theFeature a feature
+ /// \
param
theFeature a feature
void setPreviousCurrentFeature(const FeaturePtr& theFeature);
/// Returns the previous to the operation current feature
void setPreviousCurrentFeature(const FeaturePtr& theFeature);
/// Returns the previous to the operation current feature
@@
-131,7
+133,8
@@
signals:
/// to change behavior of operation. There is no point in using this method. It would
/// be better to inherit own operator from base one and redefine startOperation method
/// instead.
/// to change behavior of operation. There is no point in using this method. It would
/// be better to inherit own operator from base one and redefine startOperation method
/// instead.
- void start();
+ /// \return true if the start is successful
+ virtual bool start();
/// Aborts operation
/// Public slot. Aborts operation. This slot is not virtual and cannot be redefined.
/// Aborts operation
/// Public slot. Aborts operation. This slot is not virtual and cannot be redefined.