From: nds <nds@opencascade.com>
Date: Mon, 9 Nov 2015 11:34:57 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/BR_REENTRANCE_OPERATION' into origin_Dev_1.5.0
X-Git-Tag: V_2.0.0_alfa1~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=42985955d89fa845790a7e38609f5b6838285147;p=modules%2Fshaper.git

Merge remote-tracking branch 'origin/BR_REENTRANCE_OPERATION' into origin_Dev_1.5.0

Conflicts:
	src/Model/Model_Document.cpp
---

42985955d89fa845790a7e38609f5b6838285147
diff --cc src/Model/Model_Document.cpp
index ecd12cf45,e3ff4e04c..e3ff4e04c
mode 100644,100644..100755
--- a/src/Model/Model_Document.cpp
+++ b/src/Model/Model_Document.cpp
diff --cc src/PartSet/PartSet_Module.h
index 5ff0b77df,1a726e212..26f7ace34
--- a/src/PartSet/PartSet_Module.h
+++ b/src/PartSet/PartSet_Module.h
@@@ -204,14 -212,14 +212,14 @@@ public
    virtual void grantedOperationIds(ModuleBase_Operation* theOperation, QStringList& theIds) const;
  
    /// Validates the current operation and send the state change to sketch manager
 -  /// \thePrevState the previous widget value state
 +  /// \param thePreviousState the previous widget value state
    virtual void widgetStateChanged(int thePreviousState);
  
- public slots:
-   /// SLOT, that is called by no more widget signal emitted by property panel
-   /// Set a specific flag to restart the sketcher operation
-   void onNoMoreWidgets();
+   /// Returns true if the event is processed. It gives the reentrance manager to process the enter.
+   /// \param thePreviousAttributeID an index of the previous active attribute
+   virtual bool processEnter(const std::string& thePreviousAttributeID);
  
+ public slots:
    /// Redefines the parent method in order to customize the next case:
    /// If the sketch nested operation is active and the presentation is not visualized in the viewer,
    /// the operation should be always aborted.