X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetMultiSelector.cpp;h=9f76f81200fd7bbd5ae520cb26b3649cd7b816e9;hb=013eda84dcea4a427d406c5c75ba7870f4124b7f;hp=d6c0008974f044bc263b532811cd073b0dd897fc;hpb=5b0a1b660acf209c220744eb75c54652ee81efde;p=modules%2Fshaper.git

diff --git a/src/PartSet/PartSet_WidgetMultiSelector.cpp b/src/PartSet/PartSet_WidgetMultiSelector.cpp
old mode 100644
new mode 100755
index d6c000897..9f76f8120
--- 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>
 
@@ -41,22 +43,33 @@ PartSet_WidgetMultiSelector::~PartSet_WidgetMultiSelector()
   delete myExternalObjectMgr;
 }
 
-bool PartSet_WidgetMultiSelector::setSelection(QList<ModuleBase_ViewerPrs>& theValues)
+bool PartSet_WidgetMultiSelector::setSelection(QList<ModuleBase_ViewerPrs>& theValues,
+                                               const bool theToValidate)
 {
-  bool aSucceed = ModuleBase_WidgetMultiSelector::setSelection(theValues);
+  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());
+
+    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;
@@ -73,20 +86,12 @@ bool PartSet_WidgetMultiSelector::isValidSelectionCustom(const ModuleBase_Viewer
   return aValid;
 }
 
-//********************************************************************
-void PartSet_WidgetMultiSelector::storeAttributeValue()
-{
-  myIsInVaildate = true;
-  ModuleBase_WidgetMultiSelector::storeAttributeValue();
-}
-
 //********************************************************************
 void PartSet_WidgetMultiSelector::restoreAttributeValue(const bool theValid)
 {
-  myIsInVaildate = false;
   ModuleBase_WidgetMultiSelector::restoreAttributeValue(theValid);
 
-  myExternalObjectMgr->removeExternalValidated(sketch(), myFeature);
+  myExternalObjectMgr->removeExternal/*Validated*/(sketch(), myFeature, myWorkshop, true);
 }
 
 void PartSet_WidgetMultiSelector::getGeomSelection(const ModuleBase_ViewerPrs& thePrs,
@@ -99,11 +104,19 @@ void PartSet_WidgetMultiSelector::getGeomSelection(const ModuleBase_ViewerPrs& t
   std::shared_ptr<SketchPlugin_Feature> aSPFeature = 
           std::dynamic_pointer_cast<SketchPlugin_Feature>(aSelectedFeature);
   // there is no a sketch feature is selected, but the shape exists, try to create an exernal object
-  if (aSPFeature.get() == NULL && theShape.get() != NULL && !theShape->isNull() &&
-      myExternalObjectMgr->useExternal()) {
-    if (myIsInVaildate)
-      theObject = myExternalObjectMgr->externalObjectValidated(theObject, theShape, sketch());
-    else
-      theObject = myExternalObjectMgr->externalObject(theObject, theShape, sketch());
+  // TODO: unite with the same functionality in PartSet_WidgetShapeSelector
+  if (aSPFeature.get() == NULL && myExternalObjectMgr->useExternal()) {
+    GeomShapePtr aShape = theShape;
+    if (!aShape.get()) {
+      ResultPtr aResult = myWorkshop->selection()->getResult(thePrs);
+      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(), myIsInValidate);
+    }
   }
 }