From: mpv <mpv@opencascade.com>
Date: Mon, 12 Oct 2015 08:58:19 +0000 (+0300)
Subject: Merge branch 'BR_ADVANCED_CURRENT_FEATURE_MANAGEMENT' into Dev_1.5.0
X-Git-Tag: V_1.4.0_demo2~10
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=83e85cedfb936e7755500322e1afa638d318a863;p=modules%2Fshaper.git

Merge branch 'BR_ADVANCED_CURRENT_FEATURE_MANAGEMENT' into Dev_1.5.0
---

83e85cedfb936e7755500322e1afa638d318a863
diff --cc src/XGUI/XGUI_OperationMgr.h
index f6c25a87b,4a9839b9a..052aa86b5
--- a/src/XGUI/XGUI_OperationMgr.h
+++ b/src/XGUI/XGUI_OperationMgr.h
@@@ -170,10 -171,14 +171,14 @@@ protected: // TEMPORAR
    /// Returns whether the parameter operation is granted in relation to the previous operation
    /// in a stack of started operations. It is used in canStopOperation to avoid warning message
    /// when granted operation is aborted, e.g. SketchLine in Sketch
 -  /// \param theOperation the started operation
 +  /// \param theId id of the operation which is checked
    /// \return boolean result
 -  bool isGrantedOperation(ModuleBase_Operation* theOperation);
 +  bool isGrantedOperation(const QString& theId);
  
+   /// Sets the feature as a current in the document
+   /// \param theFeature a feature
+   void setCurrentFeature(const FeaturePtr& theFeature);
+ 
   public slots:
    /// SLOT, that is called by the key in the property panel is clicked.
    /// \param theEvent the mouse event