#1371 Using auxilliary Sketch elements in any Feature: code improvement to separate...

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

diff --git a/src/PartSet/PartSet_WidgetMultiSelector.cpp b/src/PartSet/PartSet_WidgetMultiSelector.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 91404aa..bfa7a8d
--- a/src/PartSet/PartSet_WidgetMultiSelector.cpp
+++ b/src/PartSet/PartSet_WidgetMultiSelector.cpp
@@ -7,6 +7,8 @@
 #include "PartSet_WidgetMultiSelector.h"
 
 #include <ModelAPI_AttributeRefAttr.h>
+#include <ModelAPI_AttributeSelectionList.h>
+#include <ModelAPI_AttributeRefList.h>
 #include <ModelAPI_Session.h>
 #include <ModelAPI_Validator.h>
 
@@ -29,9 +31,8 @@
 
 PartSet_WidgetMultiSelector::PartSet_WidgetMultiSelector(QWidget* theParent,
                                                          ModuleBase_IWorkshop* theWorkshop,
-                                                         const Config_WidgetAPI* theData,
-                                                         const std::string& theParentId)
-: ModuleBase_WidgetMultiSelector(theParent, theWorkshop, theData, theParentId)
+                                                         const Config_WidgetAPI* theData)
+: ModuleBase_WidgetMultiSelector(theParent, theWorkshop, theData)
 {
   myExternalObjectMgr = new PartSet_ExternalObjectsMgr(theData->getProperty("use_external"), false);
 }
@@ -41,28 +42,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();
-
-    DataPtr aData = myFeature->data();
-    AttributeSelectionListPtr aSelectionListAttr = 
-      std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(aData->attribute(attributeID()));
-
-    QObjectPtrList aListOfAttributeObjects;
-    for (int i = 0; i < aSelectionListAttr->size(); i++) {
-      AttributeSelectionPtr anAttr = aSelectionListAttr->value(i);
-      aListOfAttributeObjects.append(anAttr->context());
-    }
-    myExternalObjectMgr->removeUnusedExternalObjects(aListOfAttributeObjects, sketch(), myFeature);
-  }
-  return aSucceed;
-}
-
 //********************************************************************
 bool PartSet_WidgetMultiSelector::isValidSelectionCustom(const ModuleBase_ViewerPrs& thePrs)
 {
@@ -79,7 +58,7 @@ void PartSet_WidgetMultiSelector::restoreAttributeValue(const bool theValid)
 {
   ModuleBase_WidgetMultiSelector::restoreAttributeValue(theValid);
 
-  myExternalObjectMgr->removeExternalValidated(sketch(), myFeature, myWorkshop);
+  myExternalObjectMgr->removeExternal(sketch(), myFeature, myWorkshop, true);
 }
 
 void PartSet_WidgetMultiSelector::getGeomSelection(const ModuleBase_ViewerPrs& thePrs,
@@ -100,11 +79,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
-        theObject = myExternalObjectMgr->externalObject(theObject, aShape, sketch());
-    }
+    if (aShape.get() != NULL && !aShape->isNull())
+      theObject = myExternalObjectMgr->externalObject(theObject, aShape, sketch(), myIsInValidate);
   }
 }