X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_MultiTranslation.cpp;h=e14f5f0094bcba98d653afaa5188f64093a57035;hb=627bd194613dfc2a237720c962f33c56d331766f;hp=3e6a702b6ae1ee350584a72fbaf2997206785781;hpb=8f09d362a50ccbc085841c24af2e755121e458ba;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_MultiTranslation.cpp b/src/SketchPlugin/SketchPlugin_MultiTranslation.cpp old mode 100755 new mode 100644 index 3e6a702b6..e14f5f009 --- a/src/SketchPlugin/SketchPlugin_MultiTranslation.cpp +++ b/src/SketchPlugin/SketchPlugin_MultiTranslation.cpp @@ -1,10 +1,24 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> - -// File: SketchPlugin_MultiTranslation.cpp -// Created: 21 Apr 2015 -// Author: Artem ZHIDKOV +// Copyright (C) 2014-2019 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_MultiTranslation.h" +#include "SketchPlugin_Tools.h" #include #include @@ -13,10 +27,14 @@ #include #include #include +#include +#include #include #include #include +#include +#include #include SketchPlugin_MultiTranslation::SketchPlugin_MultiTranslation() @@ -25,14 +43,19 @@ SketchPlugin_MultiTranslation::SketchPlugin_MultiTranslation() void SketchPlugin_MultiTranslation::initAttributes() { - data()->addAttribute(START_POINT_ID(), GeomDataAPI_Point2D::typeId()); - data()->addAttribute(END_POINT_ID(), GeomDataAPI_Point2D::typeId()); - data()->addAttribute(NUMBER_OF_COPIES_ID(), ModelAPI_AttributeInteger::typeId()); + data()->addAttribute(VALUE_TYPE(), ModelAPI_AttributeString::typeId()); + + data()->addAttribute(START_POINT_ID(), ModelAPI_AttributeRefAttr::typeId()); + data()->addAttribute(END_POINT_ID(), ModelAPI_AttributeRefAttr::typeId()); + + data()->addAttribute(NUMBER_OF_OBJECTS_ID(), ModelAPI_AttributeInteger::typeId()); data()->addAttribute(SketchPlugin_Constraint::ENTITY_A(), ModelAPI_AttributeRefList::typeId()); data()->addAttribute(SketchPlugin_Constraint::ENTITY_B(), ModelAPI_AttributeRefList::typeId()); data()->addAttribute(TRANSLATION_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_MultiTranslation::execute() @@ -44,21 +67,25 @@ void SketchPlugin_MultiTranslation::execute() } AttributeRefListPtr aTranslationObjectRefs = reflist(TRANSLATION_LIST_ID()); - int aNbCopies = integer(NUMBER_OF_COPIES_ID())->value(); + int aNbCopies = integer(NUMBER_OF_OBJECTS_ID())->value()-1; + if (aNbCopies <= 0) + return; // Calculate shift vector - std::shared_ptr aStart = std::dynamic_pointer_cast( - attribute(START_POINT_ID())); - std::shared_ptr aEnd = std::dynamic_pointer_cast( - attribute(END_POINT_ID())); - if (!aStart || !aEnd || !aStart->isInitialized() || !aEnd->isInitialized()) + AttributeRefAttrPtr aStartAttr = data()->refattr(START_POINT_ID()); + AttributeRefAttrPtr anEndAttr = data()->refattr(END_POINT_ID()); + + if (!aStartAttr || !anEndAttr || !aStartAttr->isInitialized() || !anEndAttr->isInitialized()) return; - // make a visible points - SketchPlugin_Sketch::createPoint2DResult(this, sketch(), START_POINT_ID(), 0); - SketchPlugin_Sketch::createPoint2DResult(this, sketch(), END_POINT_ID(), 1); + DataPtr aData = data(); + AttributePoint2DPtr aStart = GeomDataAPI_Point2D::getPoint2D(aData, START_POINT_ID()); + AttributePoint2DPtr aEnd = GeomDataAPI_Point2D::getPoint2D(aData, END_POINT_ID()); + if (!aStart || !aEnd) + return; - std::shared_ptr aShiftVec(new GeomAPI_XY(aEnd->x() - aStart->x(), aEnd->y() - aStart->y())); + std::shared_ptr + aShiftVec(new GeomAPI_XY(aEnd->x() - aStart->x(), aEnd->y() - aStart->y())); // Wait all objects being created, then send update events static Events_ID anUpdateEvent = Events_Loop::eventByName(EVENT_OBJECT_UPDATED); @@ -66,7 +93,6 @@ void SketchPlugin_MultiTranslation::execute() if (isUpdateFlushed) Events_Loop::loop()->setFlushed(anUpdateEvent, false); - std::shared_ptr aData = data(); AttributeRefListPtr aRefListOfShapes = std::dynamic_pointer_cast( aData->attribute(SketchPlugin_Constraint::ENTITY_A())); AttributeRefListPtr aRefListOfTranslated = std::dynamic_pointer_cast( @@ -95,11 +121,13 @@ void SketchPlugin_MultiTranslation::execute() std::list::iterator anInitIter = anInitialList.begin(); std::list::iterator aTargetIter = aTargetList.begin(); std::vector::iterator aUsedIter = isUsed.begin(); + std::set aFeaturesToBeRemoved; for (; aUsedIter != isUsed.end(); aUsedIter++) { if (!(*aUsedIter)) { aRefListOfShapes->remove(*anInitIter); aRefListOfTranslated->remove(*aTargetIter++); - for (int i = 0; i < aCurrentNbCopies && aTargetIter != aTargetList.end(); i++, aTargetIter++) { + for (int i = 0; i < aCurrentNbCopies && aTargetIter != aTargetList.end(); + i++, aTargetIter++) { aRefListOfTranslated->remove(*aTargetIter); // remove the corresponding feature from the sketch ResultConstructionPtr aRC = @@ -107,7 +135,7 @@ void SketchPlugin_MultiTranslation::execute() 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++) @@ -116,6 +144,7 @@ void SketchPlugin_MultiTranslation::execute() if (anInitIter != anInitialList.end()) anInitIter++; } + ModelAPI_Tools::removeFeaturesAndReferences(aFeaturesToBeRemoved); // change number of copies if (aCurrentNbCopies != 0 && aNbCopies != aCurrentNbCopies) { bool isAdd = aNbCopies > aCurrentNbCopies; @@ -182,13 +211,51 @@ AISObjectPtr SketchPlugin_MultiTranslation::getAISObject(AISObjectPtr thePreviou if (!sketch()) return thePrevious; - AISObjectPtr anAIS = thePrevious; - if (!anAIS) { - anAIS = SketcherPrs_Factory::translateConstraint(this, sketch()->coordinatePlane()); - } + AISObjectPtr anAIS = SketcherPrs_Factory::translateConstraint(this, sketch(), + thePrevious); return anAIS; } +void SketchPlugin_MultiTranslation::erase() +{ + static Events_Loop* aLoop = Events_Loop::loop(); + static Events_ID aRedispEvent = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY); + + // Set copy attribute to false on all copied features. + AttributeRefListPtr aRefListOfShapes = std::dynamic_pointer_cast( + data()->attribute(SketchPlugin_Constraint::ENTITY_A())); + AttributeRefListPtr aRefListOfTranslated = std::dynamic_pointer_cast( + data()->attribute(SketchPlugin_Constraint::ENTITY_B())); + + if(aRefListOfShapes.get() && aRefListOfTranslated.get()) { + for(int anIndex = 0; anIndex < aRefListOfTranslated->size(); anIndex++) { + ObjectPtr anObject = aRefListOfTranslated->object(anIndex); + if(aRefListOfShapes->isInList(anObject)) { + // Don't modify attribute of original features, just skip. + continue; + } + if(anObject.get()) { + ResultPtr aRes = std::dynamic_pointer_cast(anObject); + 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(); +} + ObjectPtr SketchPlugin_MultiTranslation::copyFeature(ObjectPtr theObject) { ResultPtr aResult = std::dynamic_pointer_cast(theObject); @@ -196,7 +263,8 @@ ObjectPtr SketchPlugin_MultiTranslation::copyFeature(ObjectPtr theObject) if (!aFeature || !aResult) return ObjectPtr(); - FeaturePtr aNewFeature = SketchPlugin_Sketch::addUniqueNamedCopiedFeature(aFeature, sketch()); + FeaturePtr aNewFeature = + SketchPlugin_Sketch::addUniqueNamedCopiedFeature(aFeature, sketch(), true); aNewFeature->execute(); static Events_ID aRedisplayEvent = Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY); @@ -222,30 +290,26 @@ void SketchPlugin_MultiTranslation::attributeChanged(const std::string& theID) if (theID == TRANSLATION_LIST_ID()) { AttributeRefListPtr aTranslationObjectRefs = reflist(TRANSLATION_LIST_ID()); if (aTranslationObjectRefs->size() == 0) { - int aNbCopies = integer(NUMBER_OF_COPIES_ID())->value(); + int aNbCopies = integer(NUMBER_OF_OBJECTS_ID())->value()-1; + if (aNbCopies <= 0) + return; + + DocumentPtr aDoc = document(); // Clear list of objects - AttributeRefListPtr aRefListOfTranslated = std::dynamic_pointer_cast( - data()->attribute(SketchPlugin_Constraint::ENTITY_B())); + AttributeRefListPtr aRefListOfTranslated = reflist(SketchPlugin_Constraint::ENTITY_B()); std::list aTargetList = aRefListOfTranslated->list(); std::list::iterator aTargetIter = aTargetList.begin(); while (aTargetIter != aTargetList.end()) { aTargetIter++; for (int i = 0; i < aNbCopies && aTargetIter != aTargetList.end(); i++, aTargetIter++) { aRefListOfTranslated->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(); + FeaturePtr aFeature = ModelAPI_Feature::feature(*aTargetIter); if (aFeature) aDoc->removeFeature(aFeature); } } aRefListOfTranslated->clear(); - std::dynamic_pointer_cast( - data()->attribute(SketchPlugin_Constraint::ENTITY_A()))->clear(); - std::dynamic_pointer_cast( - data()->attribute(SketchPlugin_Constraint::ENTITY_B()))->clear(); + reflist(SketchPlugin_Constraint::ENTITY_A())->clear(); } } }