X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_MultiRotation.cpp;h=6ae033dec67086f271731da7795cd6f4f3d1f044;hb=3a0dbe1887f7a2825367c021d3c9351604e13ed7;hp=86f6943facb6c185146a951f5d80b401a52d5293;hpb=561727ada1614fb2cf4b863b846cd9831344a616;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_MultiRotation.cpp b/src/SketchPlugin/SketchPlugin_MultiRotation.cpp old mode 100644 new mode 100755 index 86f6943fa..6ae033dec --- a/src/SketchPlugin/SketchPlugin_MultiRotation.cpp +++ b/src/SketchPlugin/SketchPlugin_MultiRotation.cpp @@ -5,21 +5,30 @@ // Author: Artem ZHIDKOV #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 + +#include + #define PI 3.1415926535897932 SketchPlugin_MultiRotation::SketchPlugin_MultiRotation() @@ -28,34 +37,41 @@ SketchPlugin_MultiRotation::SketchPlugin_MultiRotation() 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"); + 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()); } 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); @@ -72,28 +88,30 @@ 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); + aRefListOfRotated->remove(*aTargetIter++); for (int i = 0; i < aCurrentNbCopies && aTargetIter != aTargetList.end(); i++, aTargetIter++) { aRefListOfRotated->remove(*aTargetIter); // remove the corresponding feature from the sketch @@ -102,7 +120,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 +129,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; @@ -121,6 +140,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++; @@ -143,7 +163,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++; } @@ -152,12 +172,13 @@ void SketchPlugin_MultiRotation::execute() anObjToCopy = *aTargetIter; } } + ModelAPI_Tools::removeFeaturesAndReferences(aFeaturesToBeRemoved); 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); @@ -188,14 +209,49 @@ 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()->coordinatePlane(), + 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) { @@ -204,8 +260,7 @@ 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); @@ -226,13 +281,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); @@ -264,5 +319,37 @@ 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(); + } + } +}