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
Merge branch 'Dev_0.7.1' of newgeom:newgeom into Dev_0.7.1
[modules/shaper.git]
/
src
/
ModuleBase
/
ModuleBase_WidgetMultiSelector.cpp
diff --git
a/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
b/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
index 114a76748d716bd951d53f499582f9875ac3bd2e..5ee8ac64a38bd0bab91c132eb4b3a475fdebfac9 100644
(file)
--- a/
src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
+++ b/
src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
@@
-37,7
+37,7
@@
ModuleBase_WidgetMultiSelector::ModuleBase_WidgetMultiSelector(QWidget* theParen
const Config_WidgetAPI* theData,
const std::string& theParentId)
: ModuleBase_ModelWidget(theParent, theData, theParentId),
const Config_WidgetAPI* theData,
const std::string& theParentId)
: ModuleBase_ModelWidget(theParent, theData, theParentId),
- myWorkshop(theWorkshop), myIsActive(false)
, myUseSubShapes(false)
+ myWorkshop(theWorkshop), myIsActive(false)
{
myMainWidget = new QWidget(theParent);
QGridLayout* aMainLay = new QGridLayout(myMainWidget);
{
myMainWidget = new QWidget(theParent);
QGridLayout* aMainLay = new QGridLayout(myMainWidget);
@@
-62,9
+62,6
@@
ModuleBase_WidgetMultiSelector::ModuleBase_WidgetMultiSelector(QWidget* theParen
aMainLay->addWidget(new QLabel(myMainWidget));
aMainLay->setRowMinimumHeight(3, 20);
myMainWidget->setLayout(aMainLay);
aMainLay->addWidget(new QLabel(myMainWidget));
aMainLay->setRowMinimumHeight(3, 20);
myMainWidget->setLayout(aMainLay);
- //TODO: Move into the base class
- myUseSubShapes = theData->getBooleanAttribute("use_subshapes", false);
- //TODO_END
connect(myTypeCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(onSelectionTypeChanged()));
myCopyAction = new QAction(QIcon(":pictures/copy.png"), tr("Copy"), this);
connect(myTypeCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(onSelectionTypeChanged()));
myCopyAction = new QAction(QIcon(":pictures/copy.png"), tr("Copy"), this);