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

Conflicts:
	src/Model/Model_Document.cpp

diff --cc src/Model/Model_Document.cpp
index ecd12cf455200855f578e6ed2b3d6a3516797116,e3ff4e04ceb7cd9620df60e053ab2961afd53218..e3ff4e04ceb7cd9620df60e053ab2961afd53218
mode 100644,100644..100755
--- 1/src/Model/Model_Document.cpp
--- 2/src/Model/Model_Document.cpp
+++ b/src/Model/Model_Document.cpp

diff --cc src/ModuleBase/ModuleBase_OperationFeature.cpp
Simple merge

diff --cc src/ModuleBase/ModuleBase_OperationFeature.h
Simple merge

diff --cc src/ModuleBase/ModuleBase_WidgetSelector.cpp
Simple merge

diff --cc src/PartSet/CMakeLists.txt
Simple merge

diff --cc src/PartSet/PartSet_Module.cpp
Simple merge

diff --cc src/PartSet/PartSet_Module.h
index 5ff0b77dfe6d1905d4fffc072b23cc3e8854ea71,1a726e21268a9fa4ccd3c95aa670ad92ca8308a5..26f7ace3431a7ec298888c5000ed51013a2e318f
--- 1/src/PartSet/PartSet_Module.h
--- 2/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.

diff --cc src/PartSet/PartSet_SketcherMgr.h
Simple merge

diff --cc src/PartSet/PartSet_Validators.cpp
Simple merge

diff --cc src/PartSet/PartSet_WidgetPoint2d.cpp
Simple merge

diff --cc src/PartSet/PartSet_WidgetPoint2d.h
Simple merge

diff --cc src/XGUI/XGUI_PropertyPanel.cpp
Simple merge

diff --cc src/XGUI/XGUI_Workshop.cpp
Simple merge