X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FSketchPlugin%2FSketchPlugin_ConstraintMirror.cpp;h=e17a704c5b5238d08f313cc0766a8eb9e39ec147;hb=d08d67feea4947dbbf51ef04b72df38b80f264e4;hp=029200ff814e2205be9f937e75a154383067a6e9;hpb=4dec3bf0332d1d6352439dc475cb830bc81de704;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 029200ff8..e17a704c5 --- a/src/SketchPlugin/SketchPlugin_ConstraintMirror.cpp +++ b/src/SketchPlugin/SketchPlugin_ConstraintMirror.cpp @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include @@ -31,18 +30,14 @@ 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()); + 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); @@ -60,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(); @@ -135,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(), true); aNewFeature->execute(); ModelAPI_EventCreator::get()->sendUpdated(aNewFeature, aRedisplayEvent); @@ -194,11 +188,68 @@ AISObjectPtr SketchPlugin_ConstraintMirror::getAISObject(AISObjectPtr thePreviou if (!sketch()) return thePrevious; - AISObjectPtr anAIS = thePrevious; - if (!anAIS) { - anAIS = SketcherPrs_Factory::mirrorConstraint(this, sketch()->coordinatePlane()); - } + AISObjectPtr anAIS = SketcherPrs_Factory::mirrorConstraint(this, sketch()->coordinatePlane(), + thePrevious); return anAIS; } +void SketchPlugin_ConstraintMirror::erase() +{ + // Set copy attribute to false on all copied features. + AttributeRefListPtr aRefListOfMirrored = std::dynamic_pointer_cast( + data()->attribute(SketchPlugin_Constraint::ENTITY_C())); + + if(aRefListOfMirrored.get()) { + static Events_Loop* aLoop = Events_Loop::loop(); + static Events_ID aRedispEvent = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY); + + std::list aTargetList = aRefListOfMirrored->list(); + for(std::list::const_iterator aTargetIt = aTargetList.cbegin(); aTargetIt != aTargetList.cend(); aTargetIt++) { + if((*aTargetIt).get()) { + ResultPtr aRes = std::dynamic_pointer_cast(*aTargetIt); + if(aRes.get()) { + FeaturePtr aFeature = aRes->document()->feature(aRes); + if(aFeature.get()) { + 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); + // Redisplay object as it is not copy anymore. + ModelAPI_EventCreator::get()->sendUpdated(aRes, aRedispEvent); + } + } + } + } + } + } + + SketchPlugin_ConstraintBase::erase(); +} + +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(); + } + } +}