From: Artem Zhidkov Date: Tue, 15 Sep 2020 19:30:44 +0000 (+0300) Subject: Issue #20033: No preview after parameter change X-Git-Tag: V9_6_0a1~14 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ca95b8880b63f9998cb09d3ea7d91716f3ea4390;p=modules%2Fshaper.git Issue #20033: No preview after parameter change Restore the position of the history line when changing parameter. --- diff --git a/src/SketchPlugin/SketchPlugin_MultiRotation.cpp b/src/SketchPlugin/SketchPlugin_MultiRotation.cpp index 48a290028..90aa282a5 100644 --- a/src/SketchPlugin/SketchPlugin_MultiRotation.cpp +++ b/src/SketchPlugin/SketchPlugin_MultiRotation.cpp @@ -100,6 +100,11 @@ void SketchPlugin_MultiRotation::execute() if (isUpdateFlushed) Events_Loop::loop()->setFlushed(anUpdateEvent, false); + // Save the current feature of the document, because new features may appear while executing. + // In this case, they will become current. But if the number of copies is updated from outside + // of sketch (e.g. by parameter change), the history line should not hold in sketch. + keepCurrentFeature(); + std::shared_ptr aData = data(); AttributeRefListPtr aRefListOfShapes = std::dynamic_pointer_cast( aData->attribute(SketchPlugin_Constraint::ENTITY_A())); @@ -211,16 +216,7 @@ void SketchPlugin_MultiRotation::execute() } } -//// if (fabs(anAngle) > 1.e-12) { -//// // Recalculate positions of features -//// aTargetList = aRefListOfRotated->list(); -//// aTargetIter = aTargetList.begin(); -//// 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)); -//// } -//// } + restoreCurrentFeature(); // send events to update the sub-features by the solver if (isUpdateFlushed) diff --git a/src/SketchPlugin/SketchPlugin_MultiTranslation.cpp b/src/SketchPlugin/SketchPlugin_MultiTranslation.cpp index 887f159f8..cfbe0a137 100644 --- a/src/SketchPlugin/SketchPlugin_MultiTranslation.cpp +++ b/src/SketchPlugin/SketchPlugin_MultiTranslation.cpp @@ -93,6 +93,11 @@ void SketchPlugin_MultiTranslation::execute() if (isUpdateFlushed) Events_Loop::loop()->setFlushed(anUpdateEvent, false); + // Save the current feature of the document, because new features may appear while executing. + // In this case, they will become current. But if the number of copies is updated from outside + // of sketch (e.g. by parameter change), the history line should not hold in sketch. + keepCurrentFeature(); + AttributeRefListPtr aRefListOfShapes = std::dynamic_pointer_cast( aData->attribute(SketchPlugin_Constraint::ENTITY_A())); AttributeRefListPtr aRefListOfTranslated = std::dynamic_pointer_cast( @@ -201,6 +206,8 @@ void SketchPlugin_MultiTranslation::execute() } } + restoreCurrentFeature(); + // send events to update the sub-features by the solver if (isUpdateFlushed) Events_Loop::loop()->setFlushed(anUpdateEvent, true);