Merge branch 'Dev_1.2.0' of newgeom:newgeom into Dev_1.2.0

Conflicts:
	src/ModuleBase/ModuleBase_IModule.h
	src/PartSet/PartSet_Module.cpp

diff --cc src/ModuleBase/ModuleBase_IModule.h
index 0e9b1feb06aa65f5b3960aafb62d892eac535e01,65a5c5a5a8b66b5b4541c54693604c673f24e928..ef8daaecdaa9368a6bcce0e3e7a7a3da4759a7a5
--- 1/src/ModuleBase/ModuleBase_IModule.h
--- 2/src/ModuleBase/ModuleBase_IModule.h
+++ b/src/ModuleBase/ModuleBase_IModule.h
@@@ -121,9 -120,10 +121,13 @@@ class MODULEBASE_EXPORT ModuleBase_IMod
    /// \returns true if the action is processed\r
    virtual bool deleteObjects() { return false; };\r
  \r
 +  /// Returns data model object for representation of data tree in Object browser\r
 +  virtual ModuleBase_IDocumentDataModel* dataModel() const = 0;\r
 +\r
+   /// Returns a list of modes, where the AIS objects should be activated\r
+   /// \param theModes a list of modes\r
+   virtual void activeSelectionModes(QIntList& theModes) {};\r
+ \r
  public slots:\r
    /// Called on call of command corresponded to a feature\r
    void onFeatureTriggered();\r

diff --cc src/PartSet/PartSet_Module.cpp
index 9077aaaff459ec64d90a88cdafb4ab1d71e45282,662e3d1bcaaf23c675f86a30b026ce7b0f934d3f..e32bba6435959e310ecd82e35c2a9f22ac5acc1c
--- 1/src/PartSet/PartSet_Module.cpp
--- 2/src/PartSet/PartSet_Module.cpp
+++ b/src/PartSet/PartSet_Module.cpp
@@@ -22,10 -18,7 +22,9 @@@
  #include <ModuleBase_IPropertyPanel.h>
  #include <ModuleBase_WidgetEditor.h>
  #include <ModuleBase_FilterFactory.h>
- #include <GeomValidators_Edge.h>
- #include <GeomValidators_EdgeOrVertex.h>
 +#include <ModuleBase_Tools.h>
+ #include <GeomValidators_ShapeType.h>
 +
  #include <GeomValidators_Face.h>
  #include <GeomValidators_ConstructionComposite.h>
  
@@@ -297,11 -280,18 +294,18 @@@ bool PartSet_Module::canDisplayObject(c
  }
  
  
 -bool PartSet_Module::addViewerItems(QMenu* theMenu, const QMap<QString, QAction*>& theStdActions) const
 +bool PartSet_Module::addViewerMenu(QMenu* theMenu, const QMap<QString, QAction*>& theStdActions) const
  {
 -  return myMenuMgr->addViewerItems(theMenu, theStdActions);
 +  return myMenuMgr->addViewerMenu(theMenu, theStdActions);
  }
  
+ void PartSet_Module::activeSelectionModes(QIntList& theModes)
+ {
+   theModes.clear();
+   if (mySketchMgr->activeSketch().get())
+     PartSet_SketcherMgr::sketchSelectionModes(theModes);
+ }
+ 
  bool PartSet_Module::isMouseOverWindow()
  {
    return mySketchMgr->isMouseOverWindow();

diff --cc src/PartSet/PartSet_Module.h
index fc41521cd31cc32f5b83b37d5659fbe763172ac0,9ba109a65eb3cf28b060765cdf98c4920f1c9fda..6da7807b23b8982261c2ebf5cbd05906da127edf
--- 1/src/PartSet/PartSet_Module.h
--- 2/src/PartSet/PartSet_Module.h
+++ b/src/PartSet/PartSet_Module.h
@@@ -109,8 -101,12 +109,12 @@@ public
    /// \param theMenu a popup menu to be shown in the viewer
    /// \param theStdActions a map of standard actions
    /// \return true if items are added and there is no necessity to provide standard menu
 -  virtual bool addViewerItems(QMenu* theMenu, const QMap<QString, QAction*>& theStdActions) const;
 +  virtual bool addViewerMenu(QMenu* theMenu, const QMap<QString, QAction*>& theStdActions) const;
  
+   /// Returns a list of modes, where the AIS objects should be activated
+   /// \param theModes a list of modes
+   virtual void activeSelectionModes(QIntList& theModes);
+ 
    /// Returns whether the mouse enter the viewer's window
    /// \return true if items are added and there is no necessity to provide standard menu
    bool isMouseOverWindow();

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