From 5697087aab694d736ce38f166469ec1fd31ed8b3 Mon Sep 17 00:00:00 2001 From: PaddleStroke Date: Tue, 3 Sep 2024 18:17:01 +0200 Subject: [PATCH 1/3] Test: remove unecessary toggle that is failing the test --- src/Mod/Part/parttests/regression_tests.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Mod/Part/parttests/regression_tests.py b/src/Mod/Part/parttests/regression_tests.py index db9d2216e0..ab56f1c694 100644 --- a/src/Mod/Part/parttests/regression_tests.py +++ b/src/Mod/Part/parttests/regression_tests.py @@ -75,7 +75,6 @@ class RegressionTests(unittest.TestCase): PointSketch.MapMode = "Deactivated" PointSketch.addGeometry(Part.Point(Base.Vector(0.000000, 0.000000, 0))) - PointSketch.toggleConstruction(0) PointSketch.addConstraint(Sketcher.Constraint("Coincident", 0, 1, -1, 1)) From 2e38cbdf3a5ff5562fad9f0caab38e3cdac272de Mon Sep 17 00:00:00 2001 From: PaddleStroke Date: Tue, 3 Sep 2024 18:27:34 +0200 Subject: [PATCH 2/3] Sketcher: Point DSH : remove unecessary "toggleConstruction(%d)", --- src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h index 617b740d4b..4bf65ea2ee 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h +++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerPoint.h @@ -81,15 +81,10 @@ private: try { Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Add sketch point")); Gui::cmdAppObjectArgs(sketchgui->getObject(), - "addGeometry(Part.Point(App.Vector(%f,%f,0)))", + "addGeometry(Part.Point(App.Vector(%f,%f,0)), %s)", editPoint.x, - editPoint.y); - - if (isConstructionMode()) { - Gui::cmdAppObjectArgs(sketchgui->getObject(), - "toggleConstruction(%d)", - getHighestCurveIndex()); - } + editPoint.y, + isConstructionMode() ? "True" : "False"); Gui::Command::commitCommand(); } From 4f93df136bed1e103f8e0a204cbf58c498cbb20a Mon Sep 17 00:00:00 2001 From: PaddleStroke Date: Tue, 3 Sep 2024 18:28:54 +0200 Subject: [PATCH 3/3] Sketcher: CommandConstraints: Make sure points are created as constructions in few functions. --- src/Mod/Sketcher/Gui/CommandConstraints.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Mod/Sketcher/Gui/CommandConstraints.cpp b/src/Mod/Sketcher/Gui/CommandConstraints.cpp index cc38f23b54..2b74ad7faf 100644 --- a/src/Mod/Sketcher/Gui/CommandConstraints.cpp +++ b/src/Mod/Sketcher/Gui/CommandConstraints.cpp @@ -406,7 +406,7 @@ void SketcherGui::makeTangentToEllipseviaNewPoint(Sketcher::SketchObject* Obj, try { // Add a point - Gui::cmdAppObjectArgs(Obj, "addGeometry(Part.Point(App.Vector(%f,%f,0)))", PoE.x, PoE.y); + Gui::cmdAppObjectArgs(Obj, "addGeometry(Part.Point(App.Vector(%f,%f,0)), True)", PoE.x, PoE.y); int GeoIdPoint = Obj->getHighestCurveIndex(); // Point on first object @@ -486,7 +486,7 @@ void SketcherGui::makeTangentToArcOfEllipseviaNewPoint(Sketcher::SketchObject* O try { // Add a point - Gui::cmdAppObjectArgs(Obj, "addGeometry(Part.Point(App.Vector(%f,%f,0)))", PoE.x, PoE.y); + Gui::cmdAppObjectArgs(Obj, "addGeometry(Part.Point(App.Vector(%f,%f,0)), True)", PoE.x, PoE.y); int GeoIdPoint = Obj->getHighestCurveIndex(); // Point on first object @@ -583,7 +583,7 @@ void SketcherGui::makeTangentToArcOfHyperbolaviaNewPoint(Sketcher::SketchObject* try { // Add a point - Gui::cmdAppObjectArgs(Obj, "addGeometry(Part.Point(App.Vector(%f,%f,0)))", PoH.x, PoH.y); + Gui::cmdAppObjectArgs(Obj, "addGeometry(Part.Point(App.Vector(%f,%f,0)), True)", PoH.x, PoH.y); int GeoIdPoint = Obj->getHighestCurveIndex(); // Point on first object @@ -673,7 +673,7 @@ void SketcherGui::makeTangentToArcOfParabolaviaNewPoint(Sketcher::SketchObject* try { // Add a point - Gui::cmdAppObjectArgs(Obj, "addGeometry(Part.Point(App.Vector(%f,%f,0)))", PoP.x, PoP.y); + Gui::cmdAppObjectArgs(Obj, "addGeometry(Part.Point(App.Vector(%f,%f,0)), True)", PoP.x, PoP.y); int GeoIdPoint = Obj->getHighestCurveIndex(); // Point on first object @@ -6150,7 +6150,7 @@ void CmdSketcherConstrainPerpendicular::activated(int iMsg) try { // Add a point Gui::cmdAppObjectArgs(Obj, - "addGeometry(Part.Point(App.Vector(%f,%f,0)))", + "addGeometry(Part.Point(App.Vector(%f,%f,0)), True)", PoO.x, PoO.y); int GeoIdPoint = Obj->getHighestCurveIndex(); @@ -6351,7 +6351,7 @@ void CmdSketcherConstrainPerpendicular::applyConstraint(std::vector& try { // Add a point Gui::cmdAppObjectArgs(Obj, - "addGeometry(Part.Point(App.Vector(%f,%f,0)))", + "addGeometry(Part.Point(App.Vector(%f,%f,0)), True)", PoO.x, PoO.y); int GeoIdPoint = Obj->getHighestCurveIndex();