Selection correction for "objects" type defined in XML. It is not possible to use...

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

diff --git a/src/ModuleBase/ModuleBase_WidgetSelector.cpp b/src/ModuleBase/ModuleBase_WidgetSelector.cpp
index caa9c798b476182f4e98df1cda537e894cfcca93..a6c82a0dd45823fe51a04a57000e3427a7e14837 100755 (executable)
--- a/src/ModuleBase/ModuleBase_WidgetSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetSelector.cpp
@@ -78,7 +78,7 @@ void ModuleBase_WidgetSelector::updateOnSelectionChanged(const bool theDone)
 QIntList ModuleBase_WidgetSelector::getShapeTypes() const
 {
   QIntList aShapeTypes = shapeTypes();
-  if (aShapeTypes.contains(TopAbs_SOLID) || aShapeTypes.contains(TopAbs_SHAPE)) {
+  if (aShapeTypes.contains(TopAbs_SOLID) || aShapeTypes.contains(ModuleBase_ResultPrs::Sel_Result/*TopAbs_SHAPE*/)) {
     // it should be selectable for both, "solids" and "objects" types
     aShapeTypes.append(TopAbs_COMPSOLID);
   }
@@ -104,8 +104,8 @@ bool ModuleBase_WidgetSelector::acceptSubShape(const GeomShapePtr& theShape,
     aValid = true;
     return aValid;
   }
-  // when the SHAPE type is provided by XML, the hole result shape can be selected.
-  if (!aShape.get() && aShapeTypes.contains(TopAbs_SHAPE)) {
+  // when the SHAPE type is provided by XML as Object, the whole result shape should be selected.
+  if (!aShape.get() && aShapeTypes.contains(ModuleBase_ResultPrs::Sel_Result)) {
     aValid = true;
     return aValid;
   }