X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_MultiRotation.cpp;h=90aa282a54599510dbd6e9182fa2f5130905eb30;hb=ce72dd01645885d720b731795d676e2feeabc8d6;hp=e878ea50d612b3a9db9d9899f0ec7bb2879f4853;hpb=050fbffc14076e3a220135330916a9d77d565631;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_MultiRotation.cpp b/src/SketchPlugin/SketchPlugin_MultiRotation.cpp old mode 100755 new mode 100644 index e878ea50d..90aa282a5 --- a/src/SketchPlugin/SketchPlugin_MultiRotation.cpp +++ b/src/SketchPlugin/SketchPlugin_MultiRotation.cpp @@ -1,14 +1,28 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> - -// File: SketchPlugin_MultiRotation.cpp -// Created: 21 Apr 2015 -// Author: Artem ZHIDKOV +// Copyright (C) 2014-2020 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 @@ -18,6 +32,9 @@ #include #include #include +#include + +#include #include #include @@ -26,9 +43,12 @@ #include -#define PI 3.1415926535897932 +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) { } @@ -42,8 +62,12 @@ void SketchPlugin_MultiRotation::initAttributes() data()->addAttribute(SketchPlugin_Constraint::ENTITY_A(), ModelAPI_AttributeRefList::typeId()); data()->addAttribute(SketchPlugin_Constraint::ENTITY_B(), ModelAPI_AttributeRefList::typeId()); data()->addAttribute(ROTATION_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()); + 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() @@ -76,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())); @@ -104,11 +133,13 @@ void SketchPlugin_MultiRotation::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); aRefListOfRotated->remove(*aTargetIter++); - for (int i = 0; i < aCurrentNbCopies && aTargetIter != aTargetList.end(); i++, aTargetIter++) { + for (int i = 0; i < aCurrentNbCopies && aTargetIter != aTargetList.end(); + i++, aTargetIter++) { aRefListOfRotated->remove(*aTargetIter); // remove the corresponding feature from the sketch ResultConstructionPtr aRC = @@ -116,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++) @@ -125,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; @@ -157,7 +190,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); } ind++; } @@ -166,6 +199,8 @@ void SketchPlugin_MultiRotation::execute() anObjToCopy = *aTargetIter; } } + ModelAPI_Tools::removeFeaturesAndReferences(aFeaturesToBeRemoved); + aFeaturesToBeRemoved.clear(); for (aTargetIter = aTargetList.begin(); aTargetIter != aTargetList.end(); aTargetIter++) aRefListOfRotated->append(*aTargetIter); @@ -181,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) @@ -202,13 +228,50 @@ AISObjectPtr SketchPlugin_MultiRotation::getAISObject(AISObjectPtr thePrevious) if (!sketch()) return thePrevious; - AISObjectPtr anAIS = thePrevious; - if (!anAIS) { - anAIS = SketcherPrs_Factory::rotateConstraint(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) { @@ -217,7 +280,8 @@ ObjectPtr SketchPlugin_MultiRotation::copyFeature(ObjectPtr theObject) if (!aFeature || !aResult) return ObjectPtr(); - FeaturePtr aNewFeature = SketchPlugin_Sketch::addUniqueNamedCopiedFeature(aFeature, sketch(), true); + FeaturePtr aNewFeature = + SketchPlugin_Sketch::addUniqueNamedCopiedFeature(aFeature, sketch(), true); aNewFeature->execute(); static Events_ID aRedisplayEvent = Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY); @@ -289,28 +353,49 @@ void SketchPlugin_MultiRotation::attributeChanged(const std::string& theID) return; // Clear list of objects - AttributeRefListPtr aRefListOfRotated = std::dynamic_pointer_cast( - data()->attribute(SketchPlugin_Constraint::ENTITY_B())); + 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 - 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); + aFeaturesToBeRemoved.insert(aFeature); } } + ModelAPI_Tools::removeFeaturesAndReferences(aFeaturesToBeRemoved); + aRefListOfRotated->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(); + } + } + 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; } }