#include <ModelAPI_Events.h>
#include <ModelAPI_Session.h>
#include <ModelAPI_Validator.h>
+#include <ModelAPI_Tools.h>
#include <SketchPlugin_SketchEntity.h>
data()->addAttribute(SketchPlugin_Constraint::ENTITY_A(), ModelAPI_AttributeRefList::typeId());
data()->addAttribute(SketchPlugin_Constraint::ENTITY_B(), ModelAPI_AttributeRefList::typeId());
data()->addAttribute(ROTATION_LIST_ID(), ModelAPI_AttributeRefList::typeId());
- ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), SketchPlugin_Constraint::ENTITY_A());
- ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), SketchPlugin_Constraint::ENTITY_B());
+ ModelAPI_Session::get()->validators()->
+ registerNotObligatory(getKind(), SketchPlugin_Constraint::ENTITY_A());
+ ModelAPI_Session::get()->validators()->
+ registerNotObligatory(getKind(), SketchPlugin_Constraint::ENTITY_B());
}
void SketchPlugin_MultiRotation::execute()
std::list<ObjectPtr>::iterator anInitIter = anInitialList.begin();
std::list<ObjectPtr>::iterator aTargetIter = aTargetList.begin();
std::vector<bool>::iterator aUsedIter = isUsed.begin();
+ std::set<FeaturePtr> aFeaturesToBeRemoved;
for (; aUsedIter != isUsed.end(); aUsedIter++) {
if (!(*aUsedIter)) {
aRefListOfShapes->remove(*anInitIter);
aRefListOfRotated->remove(*aTargetIter++);
- for (int i = 0; i < aCurrentNbCopies && aTargetIter != aTargetList.end(); i++, aTargetIter++) {
+ for (int i = 0; i < aCurrentNbCopies && aTargetIter != aTargetList.end();
+ i++, aTargetIter++) {
aRefListOfRotated->remove(*aTargetIter);
// remove the corresponding feature from the sketch
ResultConstructionPtr aRC =
DocumentPtr aDoc = aRC ? aRC->document() : DocumentPtr();
FeaturePtr aFeature = aDoc ? aDoc->feature(aRC) : FeaturePtr();
if (aFeature)
- aDoc->removeFeature(aFeature);
+ aFeaturesToBeRemoved.insert(aFeature);
}
} else {
for (int i = 0; i <= aNbCopies && aTargetIter != aTargetList.end(); i++)
if (anInitIter != anInitialList.end())
anInitIter++;
}
+ ModelAPI_Tools::removeFeaturesAndReferences(aFeaturesToBeRemoved);
// change number of copies
if (aCurrentNbCopies != 0 && aNbCopies != aCurrentNbCopies) {
bool isAdd = aNbCopies > aCurrentNbCopies;
aTargetList = aRefListOfRotated->list();
aTargetIter = aTargetList.begin();
ObjectPtr anObjToCopy = *aTargetIter;
+ std::set<FeaturePtr> aFeaturesToBeRemoved;
while (aTargetIter != aTargetList.end()) {
aRefListOfRotated->remove(*aTargetIter);
aTargetIter++;
DocumentPtr aDoc = aRC ? aRC->document() : DocumentPtr();
FeaturePtr aFeature = aDoc ? aDoc->feature(aRC) : FeaturePtr();
if (aFeature)
- aDoc->removeFeature(aFeature);
+ aFeaturesToBeRemoved.insert(aFeature);
}
ind++;
}
anObjToCopy = *aTargetIter;
}
}
+ ModelAPI_Tools::removeFeaturesAndReferences(aFeaturesToBeRemoved);
for (aTargetIter = aTargetList.begin(); aTargetIter != aTargetList.end(); aTargetIter++)
aRefListOfRotated->append(*aTargetIter);
//// while (aTargetIter != aTargetList.end()) {
//// ObjectPtr anInitialObject = *aTargetIter++;
//// for (int i = 0; i < aNbCopies && aTargetIter != aTargetList.end(); i++, aTargetIter++)
-//// rotateFeature(anInitialObject, *aTargetIter, aCenter->x(), aCenter->y(), anAngle * (i + 1));
+//// rotateFeature(anInitialObject, *aTargetIter, aCenter->x(), aCenter->y(), anAngle * (i + 1));
//// }
//// }
if (!sketch())
return thePrevious;
- AISObjectPtr anAIS = thePrevious;
- if (!anAIS) {
- anAIS = SketcherPrs_Factory::rotateConstraint(this, sketch()->coordinatePlane());
- }
+ AISObjectPtr anAIS = SketcherPrs_Factory::rotateConstraint(this, sketch()->coordinatePlane(),
+ thePrevious);
return anAIS;
}
if(aRes.get()) {
FeaturePtr aFeature = aRes->document()->feature(aRes);
if(aFeature.get()) {
- AttributeBooleanPtr aBooleanAttr = aFeature->boolean(SketchPlugin_SketchEntity::COPY_ID());
+ AttributeBooleanPtr aBooleanAttr =
+ aFeature->boolean(SketchPlugin_SketchEntity::COPY_ID());
if(aBooleanAttr.get()) {
if (ModelAPI_Session::get()->isOperation()) // if this is not undo or redo
aBooleanAttr->setValue(false);
if (!aFeature || !aResult)
return ObjectPtr();
- FeaturePtr aNewFeature = SketchPlugin_Sketch::addUniqueNamedCopiedFeature(aFeature, sketch(), true);
+ FeaturePtr aNewFeature =
+ SketchPlugin_Sketch::addUniqueNamedCopiedFeature(aFeature, sketch(), true);
aNewFeature->execute();
static Events_ID aRedisplayEvent = Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY);
return;
// Clear list of objects
- AttributeRefListPtr aRefListOfRotated = std::dynamic_pointer_cast<ModelAPI_AttributeRefList>(
- data()->attribute(SketchPlugin_Constraint::ENTITY_B()));
+ AttributeRefListPtr aRefListOfRotated = reflist(SketchPlugin_Constraint::ENTITY_B());
std::list<ObjectPtr> aTargetList = aRefListOfRotated->list();
std::list<ObjectPtr>::iterator aTargetIter = aTargetList.begin();
+ std::set<FeaturePtr> aFeaturesToBeRemoved;
while (aTargetIter != aTargetList.end()) {
aTargetIter++;
for (int i = 0; i < aNbCopies && aTargetIter != aTargetList.end(); i++, aTargetIter++) {
aRefListOfRotated->remove(*aTargetIter);
// remove the corresponding feature from the sketch
- ResultConstructionPtr aRC =
- std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(*aTargetIter);
- DocumentPtr aDoc = aRC ? aRC->document() : DocumentPtr();
- FeaturePtr aFeature = aDoc ? aDoc->feature(aRC) : FeaturePtr();
+ FeaturePtr aFeature = ModelAPI_Feature::feature(*aTargetIter);
if (aFeature)
- aDoc->removeFeature(aFeature);
+ aFeaturesToBeRemoved.insert(aFeature);
}
}
+ ModelAPI_Tools::removeFeaturesAndReferences(aFeaturesToBeRemoved);
+
aRefListOfRotated->clear();
- std::dynamic_pointer_cast<ModelAPI_AttributeRefList>(
- data()->attribute(SketchPlugin_Constraint::ENTITY_A()))->clear();
- std::dynamic_pointer_cast<ModelAPI_AttributeRefList>(
- data()->attribute(SketchPlugin_Constraint::ENTITY_B()))->clear();
+ reflist(SketchPlugin_Constraint::ENTITY_A())->clear();
}
}
}