#include "XGUI_Tools.h"
+#include "XGUI_ModuleConnector.h"
+#include "XGUI_Workshop.h"
+
+#include "ModuleBase_IWorkshop.h"
+
#include <TopoDS_Shape.hxx>
#include <ModelAPI_Object.h>
#include <ModelAPI_Result.h>
return;
theAlreadyProcessed.insert(aFeature);
- // 1. find references in the current document
+ //convert ignore object list to containt sub-features if the composite feature is in the list
+ QObjectPtrList aFullIgnoreList;
+ QObjectPtrList::const_iterator anIIt = theIgnoreList.begin(), anILast = theIgnoreList.end();
+ for (; anIIt != anILast; anIIt++) {
+ aFullIgnoreList.append(*anIIt);
+ CompositeFeaturePtr aComposite = std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(*anIIt);
+ // if the current feature is aborted, the composite is removed and has invalid data
+ if (aComposite.get() && aComposite->data()->isValid()) {
+ int aNbSubs = aComposite->numberOfSubs();
+ for (int aSub = 0; aSub < aNbSubs; aSub++) {
+ aFullIgnoreList.append(aComposite->subFeature(aSub));
+ }
+ }
+ }
+ // 1. find references in the current document
std::set<FeaturePtr> aRefFeatures;
refsToFeatureInFeatureDocument(theObject, aRefFeatures);
std::set<FeaturePtr>::const_iterator anIt = aRefFeatures.begin(),
aLast = aRefFeatures.end();
for (; anIt != aLast; anIt++) {
// composite feature should not be deleted when the sub feature is to be deleted
- if (!isSubOfComposite(theSourceObject, *anIt) && !theIgnoreList.contains(*anIt))
+ if (!isSubOfComposite(theSourceObject, *anIt) && !aFullIgnoreList.contains(*anIt))
theDirectRefFeatures.insert(*anIt);
}
}
}
+XGUI_Workshop* workshop(ModuleBase_IWorkshop* theWorkshop)
+{
+ XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(theWorkshop);
+ return aConnector->workshop();
+}
+
}