Merge branch 'master' of newgeom:newgeom.git

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

diff --cc src/ModuleBase/ModuleBase_WidgetShapeSelector.h
index aa79150bfa3152375b4e6aa08d1b40b871376fab,bf9cb955f6d144316d485a2ec6beb9d492195bec..7d0a453f6931e4c25646fd6aac9bc739c57e5942
--- 1/src/ModuleBase/ModuleBase_WidgetShapeSelector.h
--- 2/src/ModuleBase/ModuleBase_WidgetShapeSelector.h
+++ b/src/ModuleBase/ModuleBase_WidgetShapeSelector.h
@@@ -77,10 -76,13 +78,11 @@@ private
    void updateSelectionName();
    void raisePanel() const;
    bool isAccepted(const ObjectPtr theObject) const;
+   bool isAccepted(boost::shared_ptr<GeomAPI_Shape> theShape) const;
  
    // Set the given object as a value of the widget
-   void setObject(ObjectPtr theObj);
+   void setObject(ObjectPtr theObj, boost::shared_ptr<GeomAPI_Shape> theShape = boost::shared_ptr<GeomAPI_Shape>());
  
 -  static TopAbs_ShapeEnum shapeType(const QString& theType);
 -
    QWidget* myContainer;
    QLabel* myLabel;
    QLineEdit* myTextLine;