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 regression in unit tests
[modules/shaper.git]
/
src
/
PartSet
/
PartSet_SketcherMgr.h
diff --git
a/src/PartSet/PartSet_SketcherMgr.h
b/src/PartSet/PartSet_SketcherMgr.h
index 577f9601d8a6006557fc23d42003e67a9f324566..71ba10312df149bec88947b6d5bb2cb2e3536c80 100644
(file)
--- a/
src/PartSet/PartSet_SketcherMgr.h
+++ b/
src/PartSet/PartSet_SketcherMgr.h
@@
-94,6
+94,11
@@
public:
//// \return boolean value
static bool isNestedCreateOperation(ModuleBase_Operation* theOperation);
//// \return boolean value
static bool isNestedCreateOperation(ModuleBase_Operation* theOperation);
+ /// Returns true if the operation is an edit nested feature one
+ /// \param theOperation a checked operation
+ //// \return boolean value
+ static bool isNestedEditOperation(ModuleBase_Operation* theOperation);
+
/// Returns whether the current operation is a sketch entity - line, point, arc or circle
/// \param theId is an id of object
/// \return a boolean value
/// Returns whether the current operation is a sketch entity - line, point, arc or circle
/// \param theId is an id of object
/// \return a boolean value
@@
-128,6
+133,10
@@
public:
/// \param theOperation a committed operation
void commitNestedSketch(ModuleBase_Operation* theOperation);
/// \param theOperation a committed operation
void commitNestedSketch(ModuleBase_Operation* theOperation);
+ /// Commit the operation if it is possible. If the operation is dimention constraint,
+ /// it gives widget editor to input dimention value
+ void operationActivatedByPreselection();
+
/// Returns True if there are available Undos and the sketch manager allows undo
/// \return the boolean result
bool canUndo() const;
/// Returns True if there are available Undos and the sketch manager allows undo
/// \return the boolean result
bool canUndo() const;
@@
-155,6
+164,10
@@
public:
/// \return boolean result
bool canDisplayCurrentCreatedFeature() const;
/// \return boolean result
bool canDisplayCurrentCreatedFeature() const;
+ /// Returns true if the current operation is nested creation or internal reentrant edit
+ /// \param theOperation an operation
+ bool canChangeCursor(ModuleBase_Operation* theOperation) const;
+
/// Returns state of constraints showing flag
bool isConstraintsShown() const { return myIsConstraintsShown; }
/// Returns state of constraints showing flag
bool isConstraintsShown() const { return myIsConstraintsShown; }
@@
-182,6
+195,9
@@
public:
//! \return string value
QString getFeatureError(const FeaturePtr& theFeature);
//! \return string value
QString getFeatureError(const FeaturePtr& theFeature);
+ /// It nullify internal flags concerned to clicked mouse event
+ void clearClickedFlags();
+
/// Returns list of strings which contains id's of sketch operations
static const QStringList& sketchOperationIdList();
/// Returns list of strings which contains id's of sketch operations
static const QStringList& sketchOperationIdList();
@@
-198,7
+214,7
@@
public:
void connectToPropertyPanel(ModuleBase_ModelWidget* theWidget, const bool isToConnect);
/// Visualize the operation feature if the previous state is modified value in property panel
void connectToPropertyPanel(ModuleBase_ModelWidget* theWidget, const bool isToConnect);
/// Visualize the operation feature if the previous state is modified value in property panel
- /// \
thePrev
State the previous widget value state
+ /// \
param thePrevious
State the previous widget value state
void widgetStateChanged(int thePreviousState);
public slots:
void widgetStateChanged(int thePreviousState);
public slots:
@@
-225,7
+241,7
@@
private slots:
void onMouseMoved(ModuleBase_IViewWindow*, QMouseEvent*);
void onMouseDoubleClick(ModuleBase_IViewWindow*, QMouseEvent*);
void onApplicationStarted();
void onMouseMoved(ModuleBase_IViewWindow*, QMouseEvent*);
void onMouseDoubleClick(ModuleBase_IViewWindow*, QMouseEvent*);
void onApplicationStarted();
- void onBeforeWidgetActivated(ModuleBase_ModelWidget* theWidget);
+
//
void onBeforeWidgetActivated(ModuleBase_ModelWidget* theWidget);
void onBeforeContextMenu();
void onAfterContextMenu();
void onBeforeContextMenu();
void onAfterContextMenu();
@@
-305,7
+321,7
@@
private:
bool myIsMouseOverViewProcessed; /// the state whether the over view state is processed by mouseMove method
bool myIsPopupMenuActive; /// the state of the popup menu is shown
Point myCurrentPoint;
bool myIsMouseOverViewProcessed; /// the state whether the over view state is processed by mouseMove method
bool myIsPopupMenuActive; /// the state of the popup menu is shown
Point myCurrentPoint;
- Point myClickedPoint;
+
//
Point myClickedPoint;
CompositeFeaturePtr myCurrentSketch;
CompositeFeaturePtr myCurrentSketch;