From: sbh <sergey.belash@opencascade.com>
Date: Thu, 9 Oct 2014 16:20:58 +0000 (+0400)
Subject: Merge branch 'master' of newgeom:newgeom.git
X-Git-Tag: V_0.5~106
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=20114906ae0b3eec8b2e77913ba6109d56fa1d3e;p=modules%2Fshaper.git

Merge branch 'master' of newgeom:newgeom.git
---

20114906ae0b3eec8b2e77913ba6109d56fa1d3e
diff --cc src/ModuleBase/ModuleBase_WidgetShapeSelector.h
index aa79150bf,bf9cb955f..7d0a453f6
--- a/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;