#1352 Selection mode is invalid on edit Partition

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

diff --git a/src/ModuleBase/ModuleBase_WidgetSelector.cpp b/src/ModuleBase/ModuleBase_WidgetSelector.cpp
index 131911c1ac63610d701806d4c99e745e0623aa09..e8c6093438fc650319046cad21c6f5ddeeb31844 100755 (executable)
--- a/src/ModuleBase/ModuleBase_WidgetSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetSelector.cpp
@@ -44,8 +44,6 @@ void ModuleBase_WidgetSelector::getGeomSelection(const ModuleBase_ViewerPrs& the
 //********************************************************************
 void ModuleBase_WidgetSelector::onSelectionChanged()
 {
-  clearAttribute();
-
   QList<ModuleBase_ViewerPrs> aSelected = getFilteredSelected();
 
   bool isDone = setSelection(aSelected, true/*false*/);
@@ -58,6 +56,9 @@ void ModuleBase_WidgetSelector::onSelectionChanged()
   // calls validators for the feature and, as a result, updates the Apply button state.
   updateObject(myFeature);
 
+  // we need to forget about previous validation result as the current selection can influence on it
+  clearValidatedCash();
+
   if (isDone)
     updateFocus();
 }
@@ -114,7 +115,7 @@ bool ModuleBase_WidgetSelector::acceptSubShape(const GeomShapePtr& theShape,
 }
 
 //********************************************************************
-void ModuleBase_WidgetSelector::activateSelectionAndFilters(bool toActivate)
+bool ModuleBase_WidgetSelector::activateSelectionAndFilters(bool toActivate)
 {
   updateSelectionName();
 
@@ -123,7 +124,7 @@ void ModuleBase_WidgetSelector::activateSelectionAndFilters(bool toActivate)
   } else {
     myWorkshop->deactivateSubShapesSelection();
   }
-  activateFilters(toActivate);
+  return activateFilters(toActivate);
 }
 
 //********************************************************************