Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refs #226: the next non-filled widget should have focus after preselection processing
[modules/shaper.git]
/
src
/
ModuleBase
/
ModuleBase_WidgetShapeSelector.h
diff --git
a/src/ModuleBase/ModuleBase_WidgetShapeSelector.h
b/src/ModuleBase/ModuleBase_WidgetShapeSelector.h
index 7446122705d4af04dddb8dc2c8fc460cd363a11d..7d0a453f6931e4c25646fd6aac9bc739c57e5942 100644
(file)
--- a/
src/ModuleBase/ModuleBase_WidgetShapeSelector.h
+++ b/
src/ModuleBase/ModuleBase_WidgetShapeSelector.h
@@
-9,6
+9,7
@@
#include "ModuleBase_ModelWidget.h"
#include <ModelAPI_Object.h>
#include "ModuleBase_ModelWidget.h"
#include <ModelAPI_Object.h>
+#include <GeomAPI_Shape.h>
#include <TopAbs_ShapeEnum.hxx>
#include <TopAbs_ShapeEnum.hxx>
@@
-77,9
+78,10
@@
private:
void updateSelectionName();
void raisePanel() const;
bool isAccepted(const ObjectPtr theObject) const;
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
// 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>()
);
QWidget* myContainer;
QLabel* myLabel;
QWidget* myContainer;
QLabel* myLabel;
@@
-89,8
+91,13
@@
private:
ModuleBase_IWorkshop* myWorkshop;
ObjectPtr mySelectedObject;
ModuleBase_IWorkshop* myWorkshop;
ObjectPtr mySelectedObject;
+ boost::shared_ptr<GeomAPI_Shape> myShape;
+
QStringList myShapeTypes;
QStringList myShapeTypes;
+ /// If true then local selector has to be activated in context
+ bool myUseSubShapes;
+
QPalette myBasePalet;
QPalette myInactivePalet;
QPalette myBasePalet;
QPalette myInactivePalet;