From: vsv <vitaly.smetannikov@opencascade.com>
Date: Tue, 17 Jan 2017 13:04:11 +0000 (+0300)
Subject: Issue #1961: Accept result if selection mode is object
X-Git-Tag: V_2.7.0~331
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=45c3e44ff6c503dfcb6f6c682f6d37a7b037291f;p=modules%2Fshaper.git

Issue #1961: Accept result if selection mode is object
---

diff --git a/src/CollectionPlugin/CollectionPlugin_WidgetField.cpp b/src/CollectionPlugin/CollectionPlugin_WidgetField.cpp
index 7d091f00c..59a2dc16b 100644
--- a/src/CollectionPlugin/CollectionPlugin_WidgetField.cpp
+++ b/src/CollectionPlugin/CollectionPlugin_WidgetField.cpp
@@ -826,8 +826,12 @@ bool CollectionPlugin_WidgetField::
   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);
+    if (theToValidate && aRes.get()) {
+      if (myShapeTypeCombo->currentIndex() > 3)
+        aSelected.append(aValue);
+      else if (acceptSubShape(aValue->shape(), aRes))
+        aSelected.append(aValue);
+    }
   }
   AttributeSelectionListPtr aSelList =
     myFeature->data()->selectionList(CollectionPlugin_Field::SELECTED_ID());