Issue #219 Clear selected list if selection type changed

[modules/shaper.git] / src / ModuleBase / ModuleBase_WidgetMultiSelector.cpp

diff --git a/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp b/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
index ed40ee20434af9d1fb022043a90e13be7f2f84f2..227ec15863e74c2b089aca04513948391bc7e7c7 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
@@ -45,8 +45,8 @@ ModuleBase_WidgetMultiSelector::ModuleBase_WidgetMultiSelector(QWidget* theParen
   myTypeCombo = new QComboBox(myMainWidget);
   // There is no sence to paramerize list of types while we can not parametrize selection mode
   QString aTypesStr("Vertices Edges Faces Solids");
-  myShapeTypes = aTypesStr.split(' ');
-  myTypeCombo->addItems(myShapeTypes);
+  QStringList aShapeTypes = aTypesStr.split(' ');
+  myTypeCombo->addItems(aShapeTypes);
   aMainLay->addWidget(myTypeCombo, 0, 1);
 
   QLabel* aListLabel = new QLabel(tr("Selected objects:"), myMainWidget);
@@ -81,6 +81,11 @@ bool ModuleBase_WidgetMultiSelector::storeValue() const
 
   if (aSelectionListAttr && (mySelection.size() > 0)) {
     aSelectionListAttr->clear();
+    // Store shapes type
+    TopAbs_ShapeEnum aCurrentType =
+          ModuleBase_WidgetShapeSelector::shapeType(myTypeCombo->currentText());
+    aSelectionListAttr->setSelectionType((int) aCurrentType);
+    // Store selection in the attribute
     foreach (GeomSelection aSelec, mySelection) {
       aSelectionListAttr->append(aSelec.first, aSelec.second);
     }
@@ -102,6 +107,10 @@ bool ModuleBase_WidgetMultiSelector::restoreValue()
 
   if (aSelectionListAttr) {
     mySelection.clear();
+    // Restore shape type
+    TopAbs_ShapeEnum aShapeType = (TopAbs_ShapeEnum) aSelectionListAttr->selectionType();
+    setCurrentShapeType(aShapeType);
+    // Restore selection in the list
     for (int i = 0; i < aSelectionListAttr->size(); i++) {
       AttributeSelectionPtr aSelectAttr = aSelectionListAttr->value(i);
       mySelection.append(GeomSelection(aSelectAttr->context(), aSelectAttr->value()));
@@ -122,7 +131,7 @@ QWidget* ModuleBase_WidgetMultiSelector::getControl() const
 QList<QWidget*> ModuleBase_WidgetMultiSelector::getControls() const
 {
   QList<QWidget*> result;
-  result << myTypeCombo;
+  //result << myTypeCombo;
   result << myListControl;
   return result;
 }
@@ -202,6 +211,21 @@ void ModuleBase_WidgetMultiSelector::filterShapes(const NCollection_List<TopoDS_
   }
 }
 
+
+//********************************************************************
+void ModuleBase_WidgetMultiSelector::setCurrentShapeType(const TopAbs_ShapeEnum theShapeType)
+{
+  QString aShapeTypeName;
+  for (int idx = 0; idx < myTypeCombo->count(); ++idx) {
+    aShapeTypeName = myTypeCombo->itemText(idx);
+    TopAbs_ShapeEnum aRefType = ModuleBase_WidgetShapeSelector::shapeType(aShapeTypeName);
+    if(aRefType == theShapeType && idx != myTypeCombo->currentIndex()) {
+      myTypeCombo->setCurrentIndex(idx);
+      break;
+    }
+  }
+}
+
 //********************************************************************
 void ModuleBase_WidgetMultiSelector::activateSelection(bool toActivate)
 {
@@ -218,6 +242,7 @@ void ModuleBase_WidgetMultiSelector::activateSelection(bool toActivate)
 //********************************************************************
 void ModuleBase_WidgetMultiSelector::onSelectionTypeChanged()
 {
+  myListControl->clear();
   QString aNewType = myTypeCombo->currentText();
   QIntList aList;
   aList.append(ModuleBase_WidgetShapeSelector::shapeType(aNewType));