X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_MultiTranslation.cpp;h=3e6a702b6ae1ee350584a72fbaf2997206785781;hb=64fc7e4fdd63997ec7a502b233ef5f88186d5bbb;hp=a59283eb5bc0bfdc53b9c25a13bf31087775cc09;hpb=e7c4184a3752e98c384b35e812120fcadc92c194;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 a59283eb5..3e6a702b6 --- a/src/SketchPlugin/SketchPlugin_MultiTranslation.cpp +++ b/src/SketchPlugin/SketchPlugin_MultiTranslation.cpp @@ -13,11 +13,12 @@ #include #include #include -#include #include #include #include +#include + SketchPlugin_MultiTranslation::SketchPlugin_MultiTranslation() { } @@ -26,22 +27,24 @@ 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_AttributeDouble::typeId()/*ModelAPI_AttributeInteger::typeId()*/); + data()->addAttribute(NUMBER_OF_COPIES_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"); + 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() { - AttributeSelectionListPtr aTranslationObjectRefs = selectionList(TRANSLATION_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 aTranslationObjectRefs = reflist(TRANSLATION_LIST_ID()); + int aNbCopies = integer(NUMBER_OF_COPIES_ID())->value(); // Calculate shift vector std::shared_ptr aStart = std::dynamic_pointer_cast( @@ -50,6 +53,11 @@ void SketchPlugin_MultiTranslation::execute() attribute(END_POINT_ID())); if (!aStart || !aEnd || !aStart->isInitialized() || !aEnd->isInitialized()) return; + + // make a visible points + SketchPlugin_Sketch::createPoint2DResult(this, sketch(), START_POINT_ID(), 0); + SketchPlugin_Sketch::createPoint2DResult(this, sketch(), END_POINT_ID(), 1); + std::shared_ptr aShiftVec(new GeomAPI_XY(aEnd->x() - aStart->x(), aEnd->y() - aStart->y())); // Wait all objects being created, then send update events @@ -67,20 +75,21 @@ 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(); @@ -89,6 +98,7 @@ void SketchPlugin_MultiTranslation::execute() for (; aUsedIter != isUsed.end(); aUsedIter++) { if (!(*aUsedIter)) { aRefListOfShapes->remove(*anInitIter); + aRefListOfTranslated->remove(*aTargetIter++); for (int i = 0; i < aCurrentNbCopies && aTargetIter != aTargetList.end(); i++, aTargetIter++) { aRefListOfTranslated->remove(*aTargetIter); // remove the corresponding feature from the sketch @@ -128,9 +138,10 @@ void SketchPlugin_MultiTranslation::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); + aRefListOfTranslated->remove(anObject); // remove the corresponding feature from the sketch ResultConstructionPtr aRC = std::dynamic_pointer_cast(anObject); @@ -151,7 +162,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); @@ -161,16 +172,6 @@ void SketchPlugin_MultiTranslation::execute() } } - // Recalculate positions of features - aTargetList = aRefListOfTranslated->list(); - aTargetIter = aTargetList.begin(); - while (aTargetIter != aTargetList.end()) { - ObjectPtr anInitialObject = *aTargetIter++; - for (int i = 0; i < aNbCopies && aTargetIter != aTargetList.end(); i++, aTargetIter++) - shiftFeature(anInitialObject, *aTargetIter, - aShiftVec->x() * (i + 1), aShiftVec->y() * (i + 1)); - } - // send events to update the sub-features by the solver if (isUpdateFlushed) Events_Loop::loop()->setFlushed(anUpdateEvent, true); @@ -183,8 +184,7 @@ AISObjectPtr SketchPlugin_MultiTranslation::getAISObject(AISObjectPtr thePreviou AISObjectPtr anAIS = thePrevious; if (!anAIS) { -// TODO: -// anAIS = SketcherPrs_Factory::mirrorConstraint(this, sketch()->coordinatePlane()); + anAIS = SketcherPrs_Factory::translateConstraint(this, sketch()->coordinatePlane()); } return anAIS; } @@ -196,10 +196,9 @@ ObjectPtr SketchPlugin_MultiTranslation::copyFeature(ObjectPtr theObject) if (!aFeature || !aResult) return ObjectPtr(); - FeaturePtr aNewFeature = sketch()->addFeature(aFeature->getKind()); - aFeature->data()->copyTo(aNewFeature->data()); - aNewFeature->execute(); + FeaturePtr aNewFeature = SketchPlugin_Sketch::addUniqueNamedCopiedFeature(aFeature, sketch()); + aNewFeature->execute(); static Events_ID aRedisplayEvent = Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY); ModelAPI_EventCreator::get()->sendUpdated(aNewFeature, aRedisplayEvent); @@ -218,29 +217,35 @@ ObjectPtr SketchPlugin_MultiTranslation::copyFeature(ObjectPtr theObject) return ObjectPtr(); } -void SketchPlugin_MultiTranslation::shiftFeature( - ObjectPtr theInitial, ObjectPtr theTarget, double theDeltaX, double theDeltaY) +void SketchPlugin_MultiTranslation::attributeChanged(const std::string& theID) { - FeaturePtr anInitialFeature = ModelAPI_Feature::feature(theInitial); - FeaturePtr aTargetFeature = ModelAPI_Feature::feature(theTarget); - - // block feature update - aTargetFeature->data()->blockSendAttributeUpdated(true); - - std::list anInitAttrList = - anInitialFeature->data()->attributes(GeomDataAPI_Point2D::typeId()); - std::list aTargetAttrList = - aTargetFeature->data()->attributes(GeomDataAPI_Point2D::typeId()); - std::list::iterator anInitIt = anInitAttrList.begin(); - std::list::iterator aTargetIt = aTargetAttrList.begin(); - for (; anInitIt != anInitAttrList.end(); anInitIt++, aTargetIt++) { - std::shared_ptr aPointFrom = - std::dynamic_pointer_cast(*anInitIt); - std::shared_ptr aPointTo = - std::dynamic_pointer_cast(*aTargetIt); - aPointTo->setValue(aPointFrom->x() + theDeltaX, aPointFrom->y() + theDeltaY); + if (theID == TRANSLATION_LIST_ID()) { + AttributeRefListPtr aTranslationObjectRefs = reflist(TRANSLATION_LIST_ID()); + if (aTranslationObjectRefs->size() == 0) { + int aNbCopies = integer(NUMBER_OF_COPIES_ID())->value(); + // Clear list of objects + AttributeRefListPtr aRefListOfTranslated = std::dynamic_pointer_cast( + data()->attribute(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(); + 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(); + } } - - // unblock feature update - aTargetFeature->data()->blockSendAttributeUpdated(false); }