From fa56cea9f8449a3dbacd3f768960b163c58df234 Mon Sep 17 00:00:00 2001 From: Artem Zhidkov Date: Mon, 26 Oct 2020 14:28:30 +0300 Subject: [PATCH] Issue #20245: New error when loading python dump: attribute "ExternalFeature" is invalid Improve multi-selection widget to process selection type by the shape type instead of string value defined in XML. --- src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp b/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp index bb5c6e39d..9ed25e82e 100644 --- a/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp +++ b/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp @@ -772,8 +772,10 @@ QIntList ModuleBase_WidgetMultiSelector::shapeTypes() const void ModuleBase_WidgetMultiSelector::setCurrentShapeType(const QString& theShapeType) { int idx = 0; + GeomAPI_Shape::ShapeType aShapeType = GeomAPI_Shape::shapeTypeByStr(theShapeType.toStdString()); foreach (QString aShapeTypeName, myShapeTypes) { - if(aShapeTypeName == theShapeType && idx != myTypeCtrl->value()) { + if(GeomAPI_Shape::shapeTypeByStr(aShapeTypeName.toStdString()) == aShapeType && + idx != myTypeCtrl->value()) { updateSelectionModesAndFilters(false); bool isBlocked = myTypeCtrl->blockSignals(true); myTypeCtrl->setValue(idx); -- 2.39.2