X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_ConstraintMirror.cpp;h=4eec31621f4ea90c8200a6aec3c6c2792061824d;hb=cdbbde4803e9c320204d537d22af4ac7ef024962;hp=f28a09516757ff59a05cbe8966e34693cfeb4fd4;hpb=c910e9e2e9e68bc1a9f857d555a0201c2c4c75f1;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_ConstraintMirror.cpp b/src/SketchPlugin/SketchPlugin_ConstraintMirror.cpp index f28a09516..4eec31621 100644 --- a/src/SketchPlugin/SketchPlugin_ConstraintMirror.cpp +++ b/src/SketchPlugin/SketchPlugin_ConstraintMirror.cpp @@ -1,8 +1,21 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> - -// File: SketchPlugin_ConstraintMirror.cpp -// Created: 17 Mar 2015 -// Author: Artem ZHIDKOV +// Copyright (C) 2014-2021 CEA/DEN, EDF R&D +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include "SketchPlugin_ConstraintMirror.h" @@ -10,10 +23,10 @@ #include #include #include -#include #include #include #include +#include #include #include @@ -31,20 +44,28 @@ 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"); - ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), SketchPlugin_Constraint::ENTITY_B()); - ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), SketchPlugin_Constraint::ENTITY_C()); + 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); + + // Save the current feature of the document, because new features may appear while executing. + // In this case, they will become current. But if the number of copies is updated from outside + // of sketch (e.g. by parameter change), the history line should not hold in sketch. + keepCurrentFeature(); std::shared_ptr aData = data(); AttributeRefListPtr aRefListOfShapes = std::dynamic_pointer_cast( @@ -56,21 +77,22 @@ 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(); std::list::iterator aMirrorIter = aMirroredList.begin(); std::vector::iterator aUsedIter = isUsed.begin(); + std::set aFeaturesToBeRemoved; for (; aUsedIter != isUsed.end(); aUsedIter++) { if (!(*aUsedIter)) { aRefListOfShapes->remove(*anInitIter); @@ -82,7 +104,7 @@ void SketchPlugin_ConstraintMirror::execute() DocumentPtr aDoc = aRC ? aRC->document() : DocumentPtr(); FeaturePtr aFeature = aDoc ? aDoc->feature(aRC) : FeaturePtr(); if (aFeature) - aDoc->removeFeature(aFeature); + aFeaturesToBeRemoved.insert(aFeature); } } if (anInitIter != anInitialList.end()) @@ -90,6 +112,7 @@ void SketchPlugin_ConstraintMirror::execute() if (aMirrorIter != aMirroredList.end()) aMirrorIter++; } + ModelAPI_Tools::removeFeaturesAndReferences(aFeaturesToBeRemoved); static Events_ID aRedisplayEvent = Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY); @@ -131,8 +154,8 @@ 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); @@ -179,6 +202,12 @@ void SketchPlugin_ConstraintMirror::execute() aRefListOfMirrored->append(aNewFeature); } } + + restoreCurrentFeature(); + + // send events to update the sub-features by the solver + if (isUpdateFlushed) + Events_Loop::loop()->setFlushed(anUpdateEvent, true); } AISObjectPtr SketchPlugin_ConstraintMirror::getAISObject(AISObjectPtr thePrevious) @@ -186,11 +215,66 @@ 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(), + 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) { + DocumentPtr aDoc = document(); + // 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++) { + FeaturePtr aFeature = ModelAPI_Feature::feature(*aTargetIter); + if (aFeature) + aDoc->removeFeature(aFeature); + } + aRefListOfMirrored->clear(); + std::dynamic_pointer_cast( + data()->attribute(SketchPlugin_Constraint::ENTITY_B()))->clear(); + } + } +}