X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_SketcherMgr.h;h=71ba10312df149bec88947b6d5bb2cb2e3536c80;hb=3205d0f18200948632155bbe7b640bc1e482243d;hp=b7e7ffd6e5333d5a0bfd5c5aa716f2a04284a99f;hpb=42985955d89fa845790a7e38609f5b6838285147;p=modules%2Fshaper.git

diff --git a/src/PartSet/PartSet_SketcherMgr.h b/src/PartSet/PartSet_SketcherMgr.h
index b7e7ffd6e..71ba10312 100644
--- 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);
 
+  /// 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
@@ -128,6 +133,10 @@ public:
   /// \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;
@@ -155,6 +164,10 @@ public:
   /// \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; }
 
@@ -180,7 +193,10 @@ public:
   //! Incorrect states: the feature is sketch, the solver error value
   //! The feature value is reset, this is the flag of sketch mgr
   //! \return string value
-  QString getFeatureError(const FeaturePtr& theFeature, const bool isCheckGUI = true);
+  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();
@@ -225,7 +241,7 @@ private slots:
   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();
@@ -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;
-  Point myClickedPoint;
+  //Point myClickedPoint;
 
   CompositeFeaturePtr myCurrentSketch;