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
#1150 Tab buttons problems
[modules/shaper.git]
/
src
/
ModuleBase
/
ModuleBase_WidgetSelector.cpp
diff --git
a/src/ModuleBase/ModuleBase_WidgetSelector.cpp
b/src/ModuleBase/ModuleBase_WidgetSelector.cpp
index 130079870bb186c835a1970033a42e5fa9af9d9d..99edfb890e390b33024d5a85b05baefa0aa2ed43 100755
(executable)
--- a/
src/ModuleBase/ModuleBase_WidgetSelector.cpp
+++ b/
src/ModuleBase/ModuleBase_WidgetSelector.cpp
@@
-8,11
+8,10
@@
#include <ModuleBase_ISelection.h>
#include <ModuleBase_IWorkshop.h>
#include <ModuleBase_ISelection.h>
#include <ModuleBase_IWorkshop.h>
+#include <ModuleBase_Tools.h>
#include <ModelAPI_ResultConstruction.h>
#include <ModelAPI_ResultConstruction.h>
-#include <GeomValidators_Tools.h>
-
#include <TopoDS_Iterator.hxx>
ModuleBase_WidgetSelector::ModuleBase_WidgetSelector(QWidget* theParent,
#include <TopoDS_Iterator.hxx>
ModuleBase_WidgetSelector::ModuleBase_WidgetSelector(QWidget* theParent,
@@
-90,7
+89,7
@@
bool ModuleBase_WidgetSelector::acceptSubShape(const GeomShapePtr& theShape,
// for compounds check sub-shapes: it may be compound of needed type:
// Booleans may produce compounds of Solids
if (aShapeType == TopAbs_COMPOUND) {
// for compounds check sub-shapes: it may be compound of needed type:
// Booleans may produce compounds of Solids
if (aShapeType == TopAbs_COMPOUND) {
- aShapeType =
GeomValidators
_Tools::getCompoundSubType(aTopoShape);
+ aShapeType =
ModuleBase
_Tools::getCompoundSubType(aTopoShape);
}
}
}
}
@@
-111,7
+110,7
@@
bool ModuleBase_WidgetSelector::acceptSubShape(const GeomShapePtr& theShape,
}
//********************************************************************
}
//********************************************************************
-void ModuleBase_WidgetSelector::activateSelection(bool toActivate)
+void ModuleBase_WidgetSelector::activateSelection
AndFilters
(bool toActivate)
{
updateSelectionName();
{
updateSelectionName();
@@
-120,6
+119,7
@@
void ModuleBase_WidgetSelector::activateSelection(bool toActivate)
} else {
myWorkshop->deactivateSubShapesSelection();
}
} else {
myWorkshop->deactivateSubShapesSelection();
}
+ activateFilters(toActivate);
}
//********************************************************************
}
//********************************************************************
@@
-128,12
+128,10
@@
void ModuleBase_WidgetSelector::activateCustom()
connect(myWorkshop, SIGNAL(selectionChanged()), this,
SLOT(onSelectionChanged()), Qt::UniqueConnection);
connect(myWorkshop, SIGNAL(selectionChanged()), this,
SLOT(onSelectionChanged()), Qt::UniqueConnection);
- activateSelection(true);
+ activateSelection
AndFilters
(true);
// Restore selection in the viewer by the attribute selection list
myWorkshop->setSelected(getAttributeSelection());
// Restore selection in the viewer by the attribute selection list
myWorkshop->setSelected(getAttributeSelection());
-
- activateFilters(true);
}
//********************************************************************
}
//********************************************************************
@@
-168,7
+166,7
@@
void ModuleBase_WidgetSelector::deactivate()
{
ModuleBase_ModelWidget::deactivate();
disconnect(myWorkshop, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged()));
{
ModuleBase_ModelWidget::deactivate();
disconnect(myWorkshop, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged()));
- activateSelection(false);
-
activateFilters(false
);
+ activateSelection
AndFilters
(false);
+
ModuleBase_ModelWidget::deactivate(
);
}
}