Issue #1961: Filter not acceptable shapes and objects

[modules/shaper.git] / src / CollectionPlugin / CollectionPlugin_WidgetField.cpp

diff --git a/src/CollectionPlugin/CollectionPlugin_WidgetField.cpp b/src/CollectionPlugin/CollectionPlugin_WidgetField.cpp
index 55b8066127e6f911fffde266df517c4a958f860f..509789ad971fb05a6372521cff867e4b90c88750 100644 (file)
--- a/src/CollectionPlugin/CollectionPlugin_WidgetField.cpp
+++ b/src/CollectionPlugin/CollectionPlugin_WidgetField.cpp
@@ -9,6 +9,7 @@
 
 #include <ModuleBase_Tools.h>
 #include <ModuleBase_IWorkshop.h>
+#include <ModuleBase_IModule.h>
 #include <ModuleBase_ISelection.h>
 #include <ModuleBase_IPropertyPanel.h>
 
@@ -782,21 +783,25 @@ bool CollectionPlugin_WidgetField::
 }
 
 //**********************************************************************************
-void CollectionPlugin_WidgetField::onSelectionChanged()
+bool CollectionPlugin_WidgetField::
+  setSelection(QList<std::shared_ptr<ModuleBase_ViewerPrs>>& theValues, const bool theToValidate)
 {
-  //if (isEditingMode())
-  //  return;
-
   if (myActivation) {
     myActivation = false;
-    return;
+    return false;
   }
   // Ignore selection for Parts mode
   if (myShapeTypeCombo->currentIndex() == 5)
-    return;
-
-  QList<ModuleBase_ViewerPrsPtr> aSelected = getFilteredSelected();
-
+    return false;
+
+  QList<ModuleBase_ViewerPrsPtr> aSelected;
+  QList<ModuleBase_ViewerPrsPtr>::const_iterator anIt;
+  for (anIt = theValues.begin(); anIt != theValues.end(); anIt++) {
+    ModuleBase_ViewerPrsPtr aValue = *anIt;
+    ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(aValue->object());
+    if (theToValidate && aRes.get() && acceptSubShape(aValue->shape(), aRes))
+      aSelected.append(aValue);
+  }
   AttributeSelectionListPtr aSelList =
     myFeature->data()->selectionList(CollectionPlugin_Field::SELECTED_ID());
   aSelList->setSelectionType(getSelectionType(myShapeTypeCombo->currentIndex()));
@@ -859,7 +864,7 @@ void CollectionPlugin_WidgetField::onSelectionChanged()
       }
     }
   }
-  emit valuesChanged();
+  return true;
 }
 
 //**********************************************************************************