X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_MultiTranslation.cpp;h=1c4086acd55bf0ed83b5386db663f93d9f16b1a0;hb=b5893b0a30fac08134c24de4565cb513a43affa6;hp=7d06cfd13de953db693929f7ec8e2bf3a2c63ee9;hpb=3b2f8927207d5327b6ba6f0cd722940dafb8cc25;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_MultiTranslation.cpp b/src/SketchPlugin/SketchPlugin_MultiTranslation.cpp old mode 100644 new mode 100755 index 7d06cfd13..1c4086acd --- a/src/SketchPlugin/SketchPlugin_MultiTranslation.cpp +++ b/src/SketchPlugin/SketchPlugin_MultiTranslation.cpp @@ -5,6 +5,7 @@ // Author: Artem ZHIDKOV #include "SketchPlugin_MultiTranslation.h" +#include "SketchPlugin_Tools.h" #include #include @@ -13,11 +14,14 @@ #include #include #include -#include +#include +#include #include #include #include +#include +#include #include SketchPlugin_MultiTranslation::SketchPlugin_MultiTranslation() @@ -26,17 +30,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()); - AttributeSelectionListPtr aSelection = - std::dynamic_pointer_cast(data()->addAttribute( - TRANSLATION_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(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()); } void SketchPlugin_MultiTranslation::execute() @@ -47,22 +53,26 @@ void SketchPlugin_MultiTranslation::execute() return; } - AttributeSelectionListPtr aTranslationObjectRefs = selectionList(TRANSLATION_LIST_ID()); - int aNbCopies = integer(NUMBER_OF_COPIES_ID())->value(); + AttributeRefListPtr aTranslationObjectRefs = reflist(TRANSLATION_LIST_ID()); + 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); @@ -70,7 +80,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( @@ -79,30 +88,33 @@ void SketchPlugin_MultiTranslation::execute() aRefListOfTranslated->size() / aRefListOfShapes->size() - 1 : 0; std::list anInitialList = aRefListOfShapes->list(); std::list aTargetList = aRefListOfTranslated->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 < aTranslationObjectRefs->size(); anInd++) { - std::shared_ptr aSelect = aTranslationObjectRefs->value(anInd); + //std::shared_ptr aSelect = aTranslationObjectRefs->value(anInd); + ObjectPtr anObject = aTranslationObjectRefs->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); 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 = @@ -110,7 +122,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++) @@ -119,6 +131,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; @@ -165,7 +178,7 @@ void SketchPlugin_MultiTranslation::execute() aRefListOfTranslated->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); aRefListOfTranslated->append(*anAddIter); @@ -185,13 +198,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()->coordinatePlane(), + 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); @@ -199,7 +250,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); @@ -223,44 +275,28 @@ ObjectPtr SketchPlugin_MultiTranslation::copyFeature(ObjectPtr theObject) void SketchPlugin_MultiTranslation::attributeChanged(const std::string& theID) { if (theID == TRANSLATION_LIST_ID()) { - AttributeSelectionListPtr aTranslationObjectRefs = selectionList(TRANSLATION_LIST_ID()); + AttributeRefListPtr aTranslationObjectRefs = reflist(TRANSLATION_LIST_ID()); if (aTranslationObjectRefs->size() == 0) { - // the commented code is not necessary here because if an update event is flushed - // before the setFlushed with true value happens, it leads to crash - // Wait all objects being created, then send update events - //static Events_ID anUpdateEvent = Events_Loop::eventByName(EVENT_OBJECT_UPDATED); - //bool isUpdateFlushed = Events_Loop::loop()->isFlushed(anUpdateEvent); - //if (isUpdateFlushed) - // Events_Loop::loop()->setFlushed(anUpdateEvent, false); + int aNbCopies = integer(NUMBER_OF_OBJECTS_ID())->value()-1; + if (aNbCopies <= 0) + return; - int aNbCopies = integer(NUMBER_OF_COPIES_ID())->value(); + 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(); - - // send events to update the sub-features by the solver - //if (isUpdateFlushed) - // Events_Loop::loop()->setFlushed(anUpdateEvent, true); + reflist(SketchPlugin_Constraint::ENTITY_A())->clear(); } } }