X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_ConstraintMirror.cpp;h=371830c761471fb377899b28a46ab18599913f74;hb=f5c7bb3100ed321392da42f61c2ab505833ec61a;hp=f28a09516757ff59a05cbe8966e34693cfeb4fd4;hpb=c910e9e2e9e68bc1a9f857d555a0201c2c4c75f1;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_ConstraintMirror.cpp b/src/SketchPlugin/SketchPlugin_ConstraintMirror.cpp old mode 100644 new mode 100755 index f28a09516..371830c76 --- a/src/SketchPlugin/SketchPlugin_ConstraintMirror.cpp +++ b/src/SketchPlugin/SketchPlugin_ConstraintMirror.cpp @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include @@ -31,20 +30,20 @@ void SketchPlugin_ConstraintMirror::initAttributes() data()->addAttribute(SketchPlugin_Constraint::ENTITY_A(), ModelAPI_AttributeRefAttr::typeId()); data()->addAttribute(SketchPlugin_Constraint::ENTITY_B(), ModelAPI_AttributeRefList::typeId()); data()->addAttribute(SketchPlugin_Constraint::ENTITY_C(), ModelAPI_AttributeRefList::typeId()); - AttributeSelectionListPtr aSelection = - std::dynamic_pointer_cast(data()->addAttribute( - SketchPlugin_ConstraintMirror::MIRROR_LIST_ID(), ModelAPI_AttributeSelectionList::typeId())); - aSelection->setSelectionType("EDGE"); + data()->addAttribute(SketchPlugin_ConstraintMirror::MIRROR_LIST_ID(), ModelAPI_AttributeRefList::typeId()); ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), SketchPlugin_Constraint::ENTITY_B()); ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), SketchPlugin_Constraint::ENTITY_C()); } void SketchPlugin_ConstraintMirror::execute() { - AttributeSelectionListPtr aMirrorObjectRefs = - selectionList(SketchPlugin_ConstraintMirror::MIRROR_LIST_ID()); - if (!aMirrorObjectRefs->isInitialized()) - return; + AttributeRefListPtr aMirrorObjectRefs = reflist(SketchPlugin_ConstraintMirror::MIRROR_LIST_ID()); + + // Wait all objects being created, then send update events + static Events_ID anUpdateEvent = Events_Loop::eventByName(EVENT_OBJECT_UPDATED); + bool isUpdateFlushed = Events_Loop::loop()->isFlushed(anUpdateEvent); + if (isUpdateFlushed) + Events_Loop::loop()->setFlushed(anUpdateEvent, false); std::shared_ptr aData = data(); AttributeRefListPtr aRefListOfShapes = std::dynamic_pointer_cast( @@ -56,16 +55,16 @@ void SketchPlugin_ConstraintMirror::execute() std::vector isUsed(anInitialList.size(), false); // add new items to the list for(int anInd = 0; anInd < aMirrorObjectRefs->size(); anInd++) { - std::shared_ptr aSelect = aMirrorObjectRefs->value(anInd); + ObjectPtr anObject = aMirrorObjectRefs->object(anInd); std::list::const_iterator anIt = anInitialList.begin(); std::vector::iterator aUsedIt = isUsed.begin(); for (; anIt != anInitialList.end(); anIt++, aUsedIt++) - if (*anIt == aSelect->context()) { + if (*anIt == anObject) { *aUsedIt = true; break; } if (anIt == anInitialList.end()) - aRefListOfShapes->append(aSelect->context()); + aRefListOfShapes->append(anObject); } // remove unused items std::list::iterator anInitIter = anInitialList.begin(); @@ -131,8 +130,7 @@ void SketchPlugin_ConstraintMirror::execute() if (aMirrorIter != aMirroredList.end()) break; // the lists are inconsistent // There is no mirrored object yet, create it - FeaturePtr aNewFeature = sketch()->addFeature(aFeatureIn->getKind()); - aFeatureIn->data()->copyTo(aNewFeature->data()); + FeaturePtr aNewFeature = SketchPlugin_Sketch::addUniqueNamedCopiedFeature(aFeatureIn, sketch()); aNewFeature->execute(); ModelAPI_EventCreator::get()->sendUpdated(aNewFeature, aRedisplayEvent); @@ -179,6 +177,10 @@ void SketchPlugin_ConstraintMirror::execute() aRefListOfMirrored->append(aNewFeature); } } + + // send events to update the sub-features by the solver + if (isUpdateFlushed) + Events_Loop::loop()->setFlushed(anUpdateEvent, true); } AISObjectPtr SketchPlugin_ConstraintMirror::getAISObject(AISObjectPtr thePrevious) @@ -194,3 +196,30 @@ AISObjectPtr SketchPlugin_ConstraintMirror::getAISObject(AISObjectPtr thePreviou } +void SketchPlugin_ConstraintMirror::attributeChanged(const std::string& theID) +{ + if (theID == MIRROR_LIST_ID()) { + AttributeRefListPtr aMirrorObjectRefs = reflist(MIRROR_LIST_ID()); + if (aMirrorObjectRefs->size() == 0) { + // Clear list of objects + AttributeRefListPtr aRefListOfMirrored = std::dynamic_pointer_cast( + data()->attribute(SketchPlugin_Constraint::ENTITY_C())); + std::list aTargetList = aRefListOfMirrored->list(); + std::list::iterator aTargetIter = aTargetList.begin(); + for (; aTargetIter != aTargetList.end(); aTargetIter++) { + aRefListOfMirrored->remove(*aTargetIter); + // remove the corresponding feature from the sketch + ResultConstructionPtr aRC = + std::dynamic_pointer_cast(*aTargetIter); + DocumentPtr aDoc = aRC ? aRC->document() : DocumentPtr(); + FeaturePtr aFeature = aDoc ? aDoc->feature(aRC) : FeaturePtr(); + if (aFeature) + aDoc->removeFeature(aFeature); + } + aRefListOfMirrored->clear(); + std::dynamic_pointer_cast( + data()->attribute(SketchPlugin_Constraint::ENTITY_B()))->clear(); + } + } +} +