X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_MultiTranslation.cpp;h=c94ae2dca77d3b18156a408b641293167339aa0b;hb=8f10db487ef409d859a62aa6e2235a17d9b56723;hp=e7b850ec214c9ba4bdcd6a435ce363bad2874b90;hpb=561727ada1614fb2cf4b863b846cd9831344a616;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 e7b850ec2..c94ae2dca --- 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,35 +14,46 @@ #include #include #include -#include +#include #include #include #include +#include + SketchPlugin_MultiTranslation::SketchPlugin_MultiTranslation() +: myBlockValue(false) { } void SketchPlugin_MultiTranslation::initAttributes() { + data()->addAttribute(VALUE_TYPE(), ModelAPI_AttributeString::typeId()); + data()->addAttribute(START_POINT_ID(), GeomDataAPI_Point2D::typeId()); + data()->addAttribute(START_FULL_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(END_FULL_POINT_ID(), GeomDataAPI_Point2D::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"); + 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_OBJECTS_ID())->value()-1; + if (aNbCopies <= 0) + return; // Calculate shift vector std::shared_ptr aStart = std::dynamic_pointer_cast( @@ -50,6 +62,25 @@ void SketchPlugin_MultiTranslation::execute() attribute(END_POINT_ID())); if (!aStart || !aEnd || !aStart->isInitialized() || !aEnd->isInitialized()) return; + + if (attribute(END_POINT_ID())->isInitialized() && !attribute(END_FULL_POINT_ID())->isInitialized()) { + myBlockValue = true; + SketchPlugin_Tools::updateMultiAttribute(attribute(START_POINT_ID()), attribute(END_POINT_ID()), + attribute(END_FULL_POINT_ID()), aNbCopies, true); + myBlockValue = false; + } + + + // make a visible points + SketchPlugin_Sketch::createPoint2DResult(this, sketch(), START_POINT_ID(), 0); + + std::string aSecondPointAttributeID = END_POINT_ID(); + AttributeStringPtr aMethodTypeAttr = string(VALUE_TYPE()); + std::string aMethodType = aMethodTypeAttr->value(); + if (aMethodType != "SingleValue") + aSecondPointAttributeID = END_FULL_POINT_ID(); + SketchPlugin_Sketch::createPoint2DResult(this, sketch(), aSecondPointAttributeID, 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 +98,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 +121,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 @@ -152,7 +185,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); @@ -174,8 +207,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; } @@ -187,10 +219,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); @@ -208,3 +239,97 @@ ObjectPtr SketchPlugin_MultiTranslation::copyFeature(ObjectPtr theObject) } return ObjectPtr(); } + +void SketchPlugin_MultiTranslation::attributeChanged(const std::string& theID) +{ + if (theID == TRANSLATION_LIST_ID()) { + AttributeRefListPtr aTranslationObjectRefs = reflist(TRANSLATION_LIST_ID()); + if (aTranslationObjectRefs->size() == 0) { + int aNbCopies = integer(NUMBER_OF_OBJECTS_ID())->value()-1; + if (aNbCopies <= 0) + return; + // 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(); + } + } + else if (theID == START_POINT_ID() && !myBlockValue) { + myBlockValue = true; + std::shared_ptr aStartPoint = + std::dynamic_pointer_cast(attribute(START_POINT_ID())); + std::shared_ptr aStartFullPoint = + std::dynamic_pointer_cast(attribute(START_FULL_POINT_ID())); + aStartFullPoint->setValue(aStartPoint->pnt()); + myBlockValue = false; + } + else if (theID == START_FULL_POINT_ID() && !myBlockValue) { + myBlockValue = true; + std::shared_ptr aStartPoint = + std::dynamic_pointer_cast(attribute(START_POINT_ID())); + std::shared_ptr aStartFullPoint = + std::dynamic_pointer_cast(attribute(START_FULL_POINT_ID())); + aStartPoint->setValue(aStartFullPoint->pnt()); + myBlockValue = false; + } + else if (theID == END_POINT_ID() && !myBlockValue) { + int aNbCopies = integer(NUMBER_OF_OBJECTS_ID())->value() - 1; + if (aNbCopies > 0) { + myBlockValue = true; + SketchPlugin_Tools::updateMultiAttribute(attribute(START_POINT_ID()), attribute(END_POINT_ID()), + attribute(END_FULL_POINT_ID()), aNbCopies, true); + myBlockValue = false; + Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED)); + } + } + else if (theID == END_FULL_POINT_ID() && !myBlockValue) { + int aNbCopies = integer(NUMBER_OF_OBJECTS_ID())->value() - 1; + if (aNbCopies > 0) { + myBlockValue = true; + SketchPlugin_Tools::updateMultiAttribute(attribute(START_POINT_ID()), attribute(END_FULL_POINT_ID()), + attribute(END_POINT_ID()), aNbCopies, false); + myBlockValue = 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(END_POINT_ID())->isInitialized() && + attribute(VALUE_TYPE())->isInitialized()) { + AttributeStringPtr aMethodTypeAttr = string(VALUE_TYPE()); + std::string aMethodType = aMethodTypeAttr->value(); + int aNbCopies = integer(NUMBER_OF_OBJECTS_ID())->value() - 1; + if (aNbCopies > 0) { + myBlockValue = true; + if (aMethodType == "SingleValue") + SketchPlugin_Tools::updateMultiAttribute(attribute(START_POINT_ID()), attribute(END_POINT_ID()), + attribute(END_FULL_POINT_ID()), aNbCopies, true); + else { + SketchPlugin_Tools::updateMultiAttribute(attribute(START_POINT_ID()), attribute(END_FULL_POINT_ID()), + attribute(END_POINT_ID()), aNbCopies, false); + } + myBlockValue = false; + Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED)); + } + } + } +}