External object are not removed in both cases: in multi/signgle selection controls.

[modules/shaper.git] / src / PartSet / PartSet_WidgetMultiSelector.cpp

diff --git a/src/PartSet/PartSet_WidgetMultiSelector.cpp b/src/PartSet/PartSet_WidgetMultiSelector.cpp
index 9f76f81200fd7bbd5ae520cb26b3649cd7b816e9..afb664ed02bc246363af1633e6b6ebc6bf030885 100755 (executable)
--- a/src/PartSet/PartSet_WidgetMultiSelector.cpp
+++ b/src/PartSet/PartSet_WidgetMultiSelector.cpp
@@ -43,38 +43,6 @@ PartSet_WidgetMultiSelector::~PartSet_WidgetMultiSelector()
   delete myExternalObjectMgr;
 }
 
-bool PartSet_WidgetMultiSelector::setSelection(QList<ModuleBase_ViewerPrs>& theValues,
-                                               const bool theToValidate)
-{
-  bool aSucceed = ModuleBase_WidgetMultiSelector::setSelection(theValues, theToValidate);
-  if (aSucceed) {
-    // TODO(nds): unite with externalObject(), remove parameters
-    //myFeature->execute();
-
-    QObjectPtrList aListOfAttributeObjects;
-
-    AttributePtr anAttribute = myFeature->data()->attribute(attributeID());
-    if (anAttribute->attributeType() == ModelAPI_AttributeSelectionList::typeId()) {
-      AttributeSelectionListPtr aSelectionListAttr = 
-                           std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(anAttribute);
-      for (int i = 0; i < aSelectionListAttr->size(); i++) {
-        AttributeSelectionPtr anAttr = aSelectionListAttr->value(i);
-        aListOfAttributeObjects.append(anAttr->context());
-      }
-    }
-    else if (anAttribute->attributeType() == ModelAPI_AttributeRefList::typeId()) {
-      AttributeRefListPtr aRefListAttr = 
-                                 std::dynamic_pointer_cast<ModelAPI_AttributeRefList>(anAttribute);
-      for (int i = 0; i < aRefListAttr->size(); i++) {
-        aListOfAttributeObjects.append(aRefListAttr->object(i));
-      }
-    }
-
-    myExternalObjectMgr->removeUnusedExternalObjects(aListOfAttributeObjects, sketch(), myFeature);
-  }
-  return aSucceed;
-}
-
 //********************************************************************
 bool PartSet_WidgetMultiSelector::isValidSelectionCustom(const ModuleBase_ViewerPrs& thePrs)
 {
@@ -91,7 +59,7 @@ void PartSet_WidgetMultiSelector::restoreAttributeValue(const bool theValid)
 {
   ModuleBase_WidgetMultiSelector::restoreAttributeValue(theValid);
 
-  myExternalObjectMgr->removeExternal/*Validated*/(sketch(), myFeature, myWorkshop, true);
+  myExternalObjectMgr->removeExternal(sketch(), myFeature, myWorkshop, true);
 }
 
 void PartSet_WidgetMultiSelector::getGeomSelection(const ModuleBase_ViewerPrs& thePrs,
@@ -112,11 +80,7 @@ void PartSet_WidgetMultiSelector::getGeomSelection(const ModuleBase_ViewerPrs& t
       if (aResult.get())
         aShape = aResult->shape();
     }
-    if (aShape.get() != NULL && !aShape->isNull()) {
-      //if (myIsInValidate)
-      //  theObject = myExternalObjectMgr->externalObjectValidated(theObject, aShape, sketch());
-      //else
+    if (aShape.get() != NULL && !aShape->isNull())
       theObject = myExternalObjectMgr->externalObject(theObject, aShape, sketch(), myIsInValidate);
-    }
   }
 }