#include "PartSet_WidgetMultiSelector.h"
#include <ModelAPI_AttributeRefAttr.h>
+#include <ModelAPI_AttributeSelectionList.h>
+#include <ModelAPI_AttributeRefList.h>
#include <ModelAPI_Session.h>
#include <ModelAPI_Validator.h>
// 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;
{
ModuleBase_WidgetMultiSelector::restoreAttributeValue(theValid);
- myExternalObjectMgr->removeExternalValidated(sketch(), myFeature, myWorkshop);
+ myExternalObjectMgr->removeExternal/*Validated*/(sketch(), myFeature, myWorkshop, true);
}
void PartSet_WidgetMultiSelector::getGeomSelection(const ModuleBase_ViewerPrs& thePrs,
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 (myIsInValidate)
+ // theObject = myExternalObjectMgr->externalObjectValidated(theObject, aShape, sketch());
+ //else
+ theObject = myExternalObjectMgr->externalObject(theObject, aShape, sketch(), myIsInValidate);
}
}
}