Preselection using in operations: setSelection of widget returns a modified list...

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

diff --git a/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp b/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
index 6f413e634d1f0d2486e5b97aabd1e776e51afb9e..2720e55cfafc31f2886004fc0541893f26d14771 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
@@ -262,33 +262,34 @@ bool ModuleBase_WidgetMultiSelector::acceptSubShape(const TopoDS_Shape& theShape
 }
 
 //********************************************************************
-bool ModuleBase_WidgetMultiSelector::setSelection(const QList<ModuleBase_ViewerPrs>& theValues,
-                                                  int& thePosition)
+bool ModuleBase_WidgetMultiSelector::setSelection(QList<ModuleBase_ViewerPrs>& theValues)
 {
-  if (thePosition < 0)
-    return false;
+  QList<ModuleBase_ViewerPrs> aSkippedValues;
 
   QList<ModuleBase_ViewerPrs>::const_iterator anIt = theValues.begin(), aLast = theValues.end();
   bool isDone = false;
-  for (int i = thePosition; i < theValues.size(); i++) {
-    ModuleBase_ViewerPrs aValue = theValues[i];
+  for (; anIt != aLast; anIt++) {
+    ModuleBase_ViewerPrs aValue = *anIt;
     bool aProcessed = false;
     if (isValidSelection(aValue)) {
       aProcessed = setSelectionCustom(aValue);
     }
+    else
+      aSkippedValues.append(aValue);
     // if there is at least one set, the result is true
     isDone = isDone || aProcessed;
-    // when an object, which do not satisfy the validating process, stop set selection
-    if (!aProcessed)
-      break;
-    else
-      thePosition++;
   }
-  if (isDone) {
-    updateObject(myFeature);
+  // updateObject - to update/redisplay feature
+  // it is commented in order to perfom it outside the method
+  //if (isDone) {
+    //updateObject(myFeature);
     // this emit is necessary to call store/restore method an restore type of selection
-    emit valuesChanged();
-  }
+    //emit valuesChanged();
+  //}
+  theValues.clear();
+  if (!aSkippedValues.empty())
+    theValues.append(aSkippedValues);
+
   return isDone;
 }