X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_MultiRotation.cpp;h=12ded259fa8d2d395b030e56e908ee3f7cd8b21a;hb=97917d3698f5a2f7fc9596e7c755ff8f6751e373;hp=274f8d64a03c6346e99f83a3999891b88e407775;hpb=42985955d89fa845790a7e38609f5b6838285147;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 274f8d64a..12ded259f --- a/src/SketchPlugin/SketchPlugin_MultiRotation.cpp +++ b/src/SketchPlugin/SketchPlugin_MultiRotation.cpp @@ -1,13 +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-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_MultiRotation.h" #include "SketchPlugin_Tools.h" #include +#include +#include #include #include #include @@ -17,6 +32,9 @@ #include #include #include +#include + +#include #include #include @@ -25,26 +43,31 @@ #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() -: myBlockAngle(false) + : 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(ANGLE_FULL_ID(), ModelAPI_AttributeDouble::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(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() @@ -61,26 +84,15 @@ void SketchPlugin_MultiRotation::execute() 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; - if (attribute(ANGLE_ID())->isInitialized() && !attribute(ANGLE_FULL_ID())->isInitialized()) { - myBlockAngle = true; - SketchPlugin_Tools::updateMultiAttribute(attribute(ANGLE_ID()), attribute(ANGLE_FULL_ID()), - aNbCopies, true); - myBlockAngle = false; - } - - // make a visible points - SketchPlugin_Sketch::createPoint2DResult(this, sketch(), CENTER_ID(), 0); - - 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); @@ -116,11 +128,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 = @@ -128,7 +142,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++) @@ -137,6 +151,7 @@ void SketchPlugin_MultiRotation::execute() if (anInitIter != anInitialList.end()) anInitIter++; } + ModelAPI_Tools::removeFeaturesAndReferences(aFeaturesToBeRemoved); // change number of copies if (aCurrentNbCopies != 0 && aNbCopies != aCurrentNbCopies) { bool isAdd = aNbCopies > aCurrentNbCopies; @@ -147,6 +162,7 @@ void SketchPlugin_MultiRotation::execute() aTargetList = aRefListOfRotated->list(); aTargetIter = aTargetList.begin(); ObjectPtr anObjToCopy = *aTargetIter; + std::set aFeaturesToBeRemoved; while (aTargetIter != aTargetList.end()) { aRefListOfRotated->remove(*aTargetIter); aTargetIter++; @@ -169,7 +185,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++; } @@ -178,6 +194,7 @@ void SketchPlugin_MultiRotation::execute() anObjToCopy = *aTargetIter; } } + ModelAPI_Tools::removeFeaturesAndReferences(aFeaturesToBeRemoved); for (aTargetIter = aTargetList.begin(); aTargetIter != aTargetList.end(); aTargetIter++) aRefListOfRotated->append(*aTargetIter); @@ -200,7 +217,7 @@ void SketchPlugin_MultiRotation::execute() //// 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)); +//// rotateFeature(anInitialObject, *aTargetIter, aCenter->x(), aCenter->y(), anAngle * (i + 1)); //// } //// } @@ -214,13 +231,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) { @@ -229,7 +283,8 @@ ObjectPtr SketchPlugin_MultiRotation::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); @@ -250,7 +305,7 @@ 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) { @@ -288,7 +343,7 @@ void SketchPlugin_MultiRotation::rotateFeature( // unblock feature update aTargetFeature->data()->blockSendAttributeUpdated(false); -} +}*/ void SketchPlugin_MultiRotation::attributeChanged(const std::string& theID) @@ -301,69 +356,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(); - } - } - else if (theID == ANGLE_ID() && !myBlockAngle) { - int aNbCopies = integer(NUMBER_OF_OBJECTS_ID())->value() - 1; - if (aNbCopies > 0) { - myBlockAngle = true; - SketchPlugin_Tools::updateMultiAttribute(attribute(ANGLE_ID()), attribute(ANGLE_FULL_ID()), - aNbCopies, true); - myBlockAngle = false; - Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED)); + reflist(SketchPlugin_Constraint::ENTITY_A())->clear(); } } - else if (theID == ANGLE_FULL_ID() && !myBlockAngle) { - int aNbCopies = integer(NUMBER_OF_OBJECTS_ID())->value() - 1; - if (aNbCopies > 0) { - myBlockAngle = true; - SketchPlugin_Tools::updateMultiAttribute(attribute(ANGLE_FULL_ID()), attribute(ANGLE_ID()), - aNbCopies, false); - myBlockAngle = false; - Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED)); - } - } - else if (theID == NUMBER_OF_OBJECTS_ID()) { - if (attribute(NUMBER_OF_OBJECTS_ID())->isInitialized() && - attribute(ANGLE_ID())->isInitialized() && - attribute(ANGLE_TYPE())->isInitialized()) { - AttributeStringPtr aMethodTypeAttr = string(ANGLE_TYPE()); - std::string aMethodType = aMethodTypeAttr->value(); - int aNbCopies = integer(NUMBER_OF_OBJECTS_ID())->value() - 1; - if (aNbCopies > 0) { - myBlockAngle = true; - if (aMethodType == "SingleAngle") - SketchPlugin_Tools::updateMultiAttribute(attribute(ANGLE_ID()), attribute(ANGLE_FULL_ID()), - aNbCopies, true); - else { - SketchPlugin_Tools::updateMultiAttribute(attribute(ANGLE_FULL_ID()), attribute(ANGLE_ID()), - aNbCopies, false); - } - myBlockAngle = false; - Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED)); + 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; } }