From 45c3e44ff6c503dfcb6f6c682f6d37a7b037291f Mon Sep 17 00:00:00 2001 From: vsv Date: Tue, 17 Jan 2017 16:04:11 +0300 Subject: [PATCH] Issue #1961: Accept result if selection mode is object --- src/CollectionPlugin/CollectionPlugin_WidgetField.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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(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()); -- 2.39.2