X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FSketchPlugin%2FSketchPlugin_MultiRotation.cpp;h=8bdf4ef847b72b8abf595c2a42fa21231b6d712d;hb=cdbbde4803e9c320204d537d22af4ac7ef024962;hp=130a8ff6206c06d5807a6ad6be78133e6a9077d7;hpb=e7c4184a3752e98c384b35e812120fcadc92c194;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_MultiRotation.cpp b/src/SketchPlugin/SketchPlugin_MultiRotation.cpp index 130a8ff62..8bdf4ef84 100644 --- a/src/SketchPlugin/SketchPlugin_MultiRotation.cpp +++ b/src/SketchPlugin/SketchPlugin_MultiRotation.cpp @@ -1,61 +1,98 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> - -// File: SketchPlugin_MultiRotation.cpp -// Created: 21 Apr 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_MultiRotation.h" +#include "SketchPlugin_Tools.h" #include +#include +#include #include +#include #include #include #include #include -#include #include #include #include +#include + +#include #include #include -#define PI 3.1415926535897932 +#include + +#include + +static const double PI = 3.1415926535897932; +static const double PERIOD = 360.0; +static const double ANGLETOL = 1.e-7; SketchPlugin_MultiRotation::SketchPlugin_MultiRotation() + : isUpdatingAngle(false) { } void SketchPlugin_MultiRotation::initAttributes() { - data()->addAttribute(CENTER_ID(), GeomDataAPI_Point2D::typeId()); + data()->addAttribute(CENTER_ID(), ModelAPI_AttributeRefAttr::typeId()); + + data()->addAttribute(ANGLE_TYPE(), ModelAPI_AttributeString::typeId()); data()->addAttribute(ANGLE_ID(), ModelAPI_AttributeDouble::typeId()); - data()->addAttribute(NUMBER_OF_COPIES_ID(), ModelAPI_AttributeDouble::typeId()/*ModelAPI_AttributeInteger::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()); - AttributeSelectionListPtr aSelection = - std::dynamic_pointer_cast(data()->addAttribute( - ROTATION_LIST_ID(), ModelAPI_AttributeSelectionList::typeId())); - aSelection->setSelectionType("EDGE"); - ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), SketchPlugin_Constraint::ENTITY_A()); - ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), SketchPlugin_Constraint::ENTITY_B()); + data()->addAttribute(ROTATION_LIST_ID(), ModelAPI_AttributeRefList::typeId()); + data()->addAttribute(REVERSED_ID(), ModelAPI_AttributeBoolean::typeId()); + + ModelAPI_Session::get()->validators()-> + registerNotObligatory(getKind(), SketchPlugin_Constraint::ENTITY_A()); + ModelAPI_Session::get()->validators()-> + registerNotObligatory(getKind(), SketchPlugin_Constraint::ENTITY_B()); } void SketchPlugin_MultiRotation::execute() { - AttributeSelectionListPtr aRotationObjectRefs = selectionList(ROTATION_LIST_ID()); - int aNbCopies = (int)(std::dynamic_pointer_cast( - attribute(NUMBER_OF_COPIES_ID()))->value()); + if (!sketch()) { + // it is possible, that this method is called before this feature has back reference to sketch + // in this case, the execute is performed after this is done + return; + } + + AttributeRefListPtr aRotationObjectRefs = reflist(ROTATION_LIST_ID()); + int aNbCopies = integer(NUMBER_OF_OBJECTS_ID())->value() - 1; + if (aNbCopies <= 0) + return; // Obtain center and angle of rotation - std::shared_ptr aCenter = std::dynamic_pointer_cast( - attribute(CENTER_ID())); + AttributeRefAttrPtr aCenter = data()->refattr(CENTER_ID()); if (!aCenter || !aCenter->isInitialized()) return; - double anAngle = std::dynamic_pointer_cast( - attribute(ANGLE_ID()))->value(); + + //double anAngle = std::dynamic_pointer_cast( + // attribute(ANGLE_ID()))->value(); + // Convert angle to radians - anAngle *= PI / 180.0; + //anAngle *= PI / 180.0; // Wait all objects being created, then send update events static Events_ID anUpdateEvent = Events_Loop::eventByName(EVENT_OBJECT_UPDATED); @@ -63,6 +100,11 @@ void SketchPlugin_MultiRotation::execute() 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( aData->attribute(SketchPlugin_Constraint::ENTITY_A())); @@ -72,29 +114,32 @@ void SketchPlugin_MultiRotation::execute() aRefListOfRotated->size() / aRefListOfShapes->size() - 1 : 0; std::list anInitialList = aRefListOfShapes->list(); std::list aTargetList = aRefListOfRotated->list(); - std::list anAddition; + std::list anAddition; std::vector isUsed(anInitialList.size(), false); // collect new items and check the items to remove for(int anInd = 0; anInd < aRotationObjectRefs->size(); anInd++) { - std::shared_ptr aSelect = aRotationObjectRefs->value(anInd); + ObjectPtr anObject = aRotationObjectRefs->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()) - anAddition.push_back(aSelect->context()); + anAddition.push_back(anObject); } // remove unused items 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); - for (int i = 0; i < aCurrentNbCopies && aTargetIter != aTargetList.end(); i++, aTargetIter++) { + aRefListOfRotated->remove(*aTargetIter++); + for (int i = 0; i < aCurrentNbCopies && aTargetIter != aTargetList.end(); + i++, aTargetIter++) { aRefListOfRotated->remove(*aTargetIter); // remove the corresponding feature from the sketch ResultConstructionPtr aRC = @@ -102,7 +147,7 @@ void SketchPlugin_MultiRotation::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++) @@ -111,6 +156,8 @@ void SketchPlugin_MultiRotation::execute() if (anInitIter != anInitialList.end()) anInitIter++; } + ModelAPI_Tools::removeFeaturesAndReferences(aFeaturesToBeRemoved); + aFeaturesToBeRemoved.clear(); // change number of copies if (aCurrentNbCopies != 0 && aNbCopies != aCurrentNbCopies) { bool isAdd = aNbCopies > aCurrentNbCopies; @@ -133,16 +180,17 @@ void SketchPlugin_MultiRotation::execute() aTargetList.insert(aTargetIter, anObject); } else { // remove object - std::list::iterator aRemoveIt = aTargetIter; - ObjectPtr anObject = *(--aRemoveIt); + std::list::iterator aRemoveIt = aTargetIter++; + ObjectPtr anObject = *aRemoveIt; aTargetList.erase(aRemoveIt); + aRefListOfRotated->remove(anObject); // remove the corresponding feature from the sketch ResultConstructionPtr aRC = std::dynamic_pointer_cast(anObject); DocumentPtr aDoc = aRC ? aRC->document() : DocumentPtr(); FeaturePtr aFeature = aDoc ? aDoc->feature(aRC) : FeaturePtr(); if (aFeature) - aDoc->removeFeature(aFeature); + aFeaturesToBeRemoved.insert(aFeature); } ind++; } @@ -151,12 +199,14 @@ void SketchPlugin_MultiRotation::execute() anObjToCopy = *aTargetIter; } } + ModelAPI_Tools::removeFeaturesAndReferences(aFeaturesToBeRemoved); + aFeaturesToBeRemoved.clear(); for (aTargetIter = aTargetList.begin(); aTargetIter != aTargetList.end(); aTargetIter++) aRefListOfRotated->append(*aTargetIter); } // add new items - std::list::iterator anAddIter = anAddition.begin(); + std::list::iterator anAddIter = anAddition.begin(); for (; anAddIter != anAddition.end(); anAddIter++) { aRefListOfShapes->append(*anAddIter); aRefListOfRotated->append(*anAddIter); @@ -166,16 +216,7 @@ void SketchPlugin_MultiRotation::execute() } } - if (fabs(anAngle) > 1.e-12) { - // Recalculate positions of features - aTargetList = aRefListOfRotated->list(); - aTargetIter = aTargetList.begin(); - while (aTargetIter != aTargetList.end()) { - ObjectPtr anInitialObject = *aTargetIter++; - for (int i = 0; i < aNbCopies && aTargetIter != aTargetList.end(); i++, aTargetIter++) - rotateFeature(anInitialObject, *aTargetIter, aCenter->x(), aCenter->y(), anAngle * (i + 1)); - } - } + restoreCurrentFeature(); // send events to update the sub-features by the solver if (isUpdateFlushed) @@ -187,14 +228,50 @@ AISObjectPtr SketchPlugin_MultiRotation::getAISObject(AISObjectPtr thePrevious) if (!sketch()) return thePrevious; - AISObjectPtr anAIS = thePrevious; - if (!anAIS) { -// TODO: -// anAIS = SketcherPrs_Factory::mirrorConstraint(this, sketch()->coordinatePlane()); - } + AISObjectPtr anAIS = SketcherPrs_Factory::rotateConstraint(this, sketch(), + thePrevious); return anAIS; } +void SketchPlugin_MultiRotation::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 aRefListOfRotated = std::dynamic_pointer_cast( + data()->attribute(SketchPlugin_Constraint::ENTITY_B())); + + if(aRefListOfShapes.get() && aRefListOfRotated.get()) { + for(int anIndex = 0; anIndex < aRefListOfRotated->size(); anIndex++) { + ObjectPtr anObject = aRefListOfRotated->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_MultiRotation::copyFeature(ObjectPtr theObject) { @@ -203,8 +280,8 @@ ObjectPtr SketchPlugin_MultiRotation::copyFeature(ObjectPtr theObject) if (!aFeature || !aResult) return ObjectPtr(); - FeaturePtr aNewFeature = sketch()->addFeature(aFeature->getKind()); - aFeature->data()->copyTo(aNewFeature->data()); + FeaturePtr aNewFeature = + SketchPlugin_Sketch::addUniqueNamedCopiedFeature(aFeature, sketch(), true); aNewFeature->execute(); static Events_ID aRedisplayEvent = Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY); @@ -225,13 +302,13 @@ ObjectPtr SketchPlugin_MultiRotation::copyFeature(ObjectPtr theObject) return ObjectPtr(); } -void SketchPlugin_MultiRotation::rotateFeature( +/*void SketchPlugin_MultiRotation::rotateFeature( ObjectPtr theInitial, ObjectPtr theTarget, double theCenterX, double theCenterY, double theAngle) { std::shared_ptr aCenter(new GeomAPI_Pnt2d(theCenterX, theCenterY)); - double cosA = cos(theAngle); - double sinA = sin(theAngle); + double cosA = std::cos(theAngle); + double sinA = std::sin(theAngle); FeaturePtr anInitialFeature = ModelAPI_Feature::feature(theInitial); FeaturePtr aTargetFeature = ModelAPI_Feature::feature(theTarget); @@ -263,5 +340,62 @@ void SketchPlugin_MultiRotation::rotateFeature( // unblock feature update aTargetFeature->data()->blockSendAttributeUpdated(false); -} +}*/ + + +void SketchPlugin_MultiRotation::attributeChanged(const std::string& theID) +{ + if (theID == ROTATION_LIST_ID()) { + AttributeRefListPtr aRotationObjectRefs = reflist(ROTATION_LIST_ID()); + if (aRotationObjectRefs->size() == 0) { + int aNbCopies = integer(NUMBER_OF_OBJECTS_ID())->value()-1; + if (aNbCopies <= 0) + return; + // Clear list of objects + AttributeRefListPtr aRefListOfRotated = reflist(SketchPlugin_Constraint::ENTITY_B()); + std::list aTargetList = aRefListOfRotated->list(); + std::list::iterator aTargetIter = aTargetList.begin(); + std::set aFeaturesToBeRemoved; + while (aTargetIter != aTargetList.end()) { + aTargetIter++; + for (int i = 0; i < aNbCopies && aTargetIter != aTargetList.end(); i++, aTargetIter++) { + aRefListOfRotated->remove(*aTargetIter); + // remove the corresponding feature from the sketch + FeaturePtr aFeature = ModelAPI_Feature::feature(*aTargetIter); + if (aFeature) + aFeaturesToBeRemoved.insert(aFeature); + } + } + ModelAPI_Tools::removeFeaturesAndReferences(aFeaturesToBeRemoved); + + aRefListOfRotated->clear(); + reflist(SketchPlugin_Constraint::ENTITY_A())->clear(); + } + } + else if (!isUpdatingAngle && real(ANGLE_ID())->isInitialized()) + { + isUpdatingAngle = true; + AttributeDoublePtr anAngle = real(ANGLE_ID()); + if (theID == ANGLE_TYPE() && integer(NUMBER_OF_OBJECTS_ID())->isInitialized()) { + if (string(ANGLE_TYPE())->value() != "SingleAngle") + anAngle->setValue(anAngle->value() * (integer(NUMBER_OF_OBJECTS_ID())->value() - 1)); + else + { + int aNbSplits = integer(NUMBER_OF_OBJECTS_ID())->value(); + if (anAngle->value() < PERIOD - ANGLETOL) + aNbSplits -= 1; + anAngle->setValue(anAngle->value() / aNbSplits); + } + } + else if (theID == ANGLE_ID()) { + if (anAngle->value() > PERIOD + ANGLETOL || anAngle->value() < -ANGLETOL) + anAngle->setValue(anAngle->value() + PERIOD * ceil(-anAngle->value() / PERIOD)); + if (fabs(anAngle->value() - PERIOD) < ANGLETOL) + anAngle->setValue(PERIOD); + else if (fabs(anAngle->value()) < ANGLETOL) + anAngle->setValue(0.); + } + isUpdatingAngle = false; + } +}