Merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0

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

diff --git a/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp b/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
index 53f0352756df1ebd3c712260df79170dbc05b39d..c74b323b83b6f038769f71032f5418ff79a0c24e 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
@@ -196,20 +196,18 @@ void ModuleBase_WidgetMultiSelector::restoreAttributeValue(bool/* theValid*/)
 }
 
 //********************************************************************
-bool ModuleBase_WidgetMultiSelector::setSelection(const Handle_SelectMgr_EntityOwner& theOwner)
+bool ModuleBase_WidgetMultiSelector::setSelectionCustom(const ModuleBase_ViewerPrs& thePrs)
 {
-  ModuleBase_ViewerPrs aPrs;
-  ModuleBase_ISelection* aSelection = myWorkshop->selection();
-  aSelection->fillPresentation(aPrs, theOwner);
+  ResultPtr aResult;
+  if (!thePrs.owner().IsNull()) {
+    ObjectPtr anObject = myWorkshop->selection()->getSelectableObject(thePrs.owner());
+    aResult = std::dynamic_pointer_cast<ModelAPI_Result>(anObject);
+  }
+  else {
+    aResult = std::dynamic_pointer_cast<ModelAPI_Result>(thePrs.object());
+  }
 
-  const TopoDS_Shape& aTDSShape = aPrs.shape();
-  if (aTDSShape.IsNull())
-    return false;
-  GeomShapePtr aShape = std::shared_ptr<GeomAPI_Shape>(new GeomAPI_Shape());
-  aShape->setImpl(new TopoDS_Shape(aTDSShape));
 
-  ObjectPtr anObject = aSelection->getSelectableObject(theOwner);
-  ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(anObject);
   if (myFeature) {
     // We can not select a result of our feature
     const std::list<ResultPtr>& aResList = myFeature->results();
@@ -230,11 +228,21 @@ bool ModuleBase_WidgetMultiSelector::setSelection(const Handle_SelectMgr_EntityO
   DataPtr aData = myFeature->data();
   AttributeSelectionListPtr aSelectionListAttr = 
     std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(aData->attribute(attributeID()));
-  if (aShape->isEqual(aResult->shape()))
-    aSelectionListAttr->append(aResult, GeomShapePtr());
-  else
-    aSelectionListAttr->append(aResult, aShape);
 
+  const TopoDS_Shape& aTDSShape = thePrs.shape();
+  // if only result is selected, an empty shape is set to the model
+  if (aTDSShape.IsNull()) {
+    aSelectionListAttr->append(aResult, GeomShapePtr());
+  }
+  else {
+    GeomShapePtr aShape = std::shared_ptr<GeomAPI_Shape>(new GeomAPI_Shape());
+    aShape->setImpl(new TopoDS_Shape(aTDSShape));
+    // We can not select a result of our feature
+    if (aShape->isEqual(aResult->shape()))
+      aSelectionListAttr->append(aResult, GeomShapePtr());
+    else
+      aSelectionListAttr->append(aResult, aShape);
+  }
   return true;
 }
 
@@ -259,15 +267,16 @@ void ModuleBase_WidgetMultiSelector::onSelectionTypeChanged()
 {
   activateShapeSelection();
   QObjectPtrList anEmptyList;
+  // This method will call Selection changed event which will call onSelectionChanged
+  // To clear mySelection, myListControl and storeValue()
+  // So, we don't need to call it
   myWorkshop->setSelected(anEmptyList);
-  // Clear mySelection, myListControl and storeValue()
-  onSelectionChanged();
 }
 
 //********************************************************************
 void ModuleBase_WidgetMultiSelector::onSelectionChanged()
 {
-  QList<ModuleBase_ViewerPrs> aSelected = myWorkshop->selection()->getSelected();
+  QList<ModuleBase_ViewerPrs> aSelected = getSelectedEntitiesOrObjects(myWorkshop->selection());
 
   DataPtr aData = myFeature->data();
   AttributeSelectionListPtr aSelectionListAttr = 
@@ -276,9 +285,8 @@ void ModuleBase_WidgetMultiSelector::onSelectionChanged()
   aSelectionListAttr->clear();
   if (aSelected.size() > 0) {
     foreach (ModuleBase_ViewerPrs aPrs, aSelected) {
-      Handle(SelectMgr_EntityOwner) anOwner = aPrs.owner();
-      if (isValid(anOwner)) {
-        setSelection(anOwner);
+      if (isValidSelection(aPrs)) {
+        setSelectionCustom(aPrs);
       }
     }
   }