X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_ConstraintMirror.cpp;h=73649b1cf8c5be45560eb220d4a2ad2f6329d8ff;hb=74e9ba33303efc2282db1261706e904efa36b255;hp=fde907d815e9e9616819398e4e1263cd4b610fa1;hpb=c65c7a084cf32f54c8d8a93fceace414c3b0fb21;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_ConstraintMirror.cpp b/src/SketchPlugin/SketchPlugin_ConstraintMirror.cpp index fde907d81..73649b1cf 100644 --- a/src/SketchPlugin/SketchPlugin_ConstraintMirror.cpp +++ b/src/SketchPlugin/SketchPlugin_ConstraintMirror.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -42,8 +43,12 @@ void SketchPlugin_ConstraintMirror::execute() { AttributeSelectionListPtr aMirrorObjectRefs = selectionList(SketchPlugin_ConstraintMirror::MIRROR_LIST_ID()); - if (!aMirrorObjectRefs->isInitialized()) - return; + + // 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( @@ -79,8 +84,7 @@ void SketchPlugin_ConstraintMirror::execute() ResultConstructionPtr aRC = std::dynamic_pointer_cast(*aMirrorIter); DocumentPtr aDoc = aRC ? aRC->document() : DocumentPtr(); - FeaturePtr aFeature = aDoc ? std::dynamic_pointer_cast( - aDoc->feature(aRC)) : FeaturePtr(); + FeaturePtr aFeature = aDoc ? aDoc->feature(aRC) : FeaturePtr(); if (aFeature) aDoc->removeFeature(aFeature); } @@ -91,6 +95,8 @@ void SketchPlugin_ConstraintMirror::execute() aMirrorIter++; } + static Events_ID aRedisplayEvent = Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY); + // Check consistency of initial list and mirrored list anInitialList = aRefListOfShapes->list(); anInitIter = anInitialList.begin(); @@ -129,9 +135,9 @@ 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); std::shared_ptr aShapeIn = aRCIn->shape(); const std::list& aResults = aNewFeature->results(); @@ -176,6 +182,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) @@ -184,8 +194,34 @@ AISObjectPtr SketchPlugin_ConstraintMirror::getAISObject(AISObjectPtr thePreviou return thePrevious; AISObjectPtr anAIS = thePrevious; - /// TODO: Equal constraint presentation should be put here + if (!anAIS) { + anAIS = SketcherPrs_Factory::mirrorConstraint(this, sketch()->coordinatePlane()); + } return anAIS; } +void SketchPlugin_ConstraintMirror::attributeChanged(const std::string& theID) +{ + if (theID == MIRROR_LIST_ID()) { + AttributeSelectionListPtr aMirrorObjectRefs = selectionList(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); + } + } + } +} +