kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Sketcher: manage legacy negative circle-line distance (#22203)

Browse Source 
* manage legacy negative circle-line distance

* Add test for legacy negative circle-line distance
This commit is contained in:
Florian Foinant-Willig
2025-07-18 06:00:38 +02:00
committed by GitHub
parent 46d1345ca2
commit c968effe26
2 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/Sketcher/App/planegcs/Constraints.cpp
View File

@@ -2991,10 +2991,10 @@ void ConstraintC2LDistance::errorgrad(double* err, double* grad, double* param)
if (err) {
if (h < *circle.rad) {
*err = *circle.rad - *distance() - h;
*err = *circle.rad - std::abs(*distance()) - h;
}
else {
*err = *circle.rad + *distance() - h;
*err = *circle.rad + std::abs(*distance()) - h;
}
}
else if (grad) {

28
src/Mod/Sketcher/SketcherTests/TestSketcherSolver.py
View File

@@ -480,6 +480,34 @@ class TestSketcherSolver(unittest.TestCase):
msg="Reference constraint did not return the expected distance.",
)
def testCircleToLineDistance_Legacy_Negative(self):
# compare a driving negative distance to an expected positive reference one
sketch = self.Doc.addObject("Sketcher::SketchObject", "Sketch")
radius = 20
c_idx = sketch.addGeometry(Part.Circle(vec(0, 0), xy_normal, radius))
l_idx = sketch.addGeometry(
Part.LineSegment(vec(-radius, radius / 2), vec(radius, radius / 2))
)
sketch.addConstraint(
[Sketcher.Constraint("Block", c_idx), Sketcher.Constraint("Block", l_idx)]
)
expected_distance = radius / 2
ref_idx = sketch.addConstraint(
[
Sketcher.Constraint("Distance", c_idx, l_idx, -expected_distance),
Sketcher.Constraint("Distance", c_idx, l_idx, 0),
]
)[1]
sketch.setDriving(ref_idx, False)
self.assertSuccessfulSolve(sketch)
actual_distance = sketch.Constraints[ref_idx].Value
self.assertAlmostEqual(
expected_distance,
actual_distance,
delta=Precision.confusion(),
msg="Negative length constraint did not return the expected distance.",
)
def testRemovedExternalGeometryReference(self):
if "BUILD_PARTDESIGN" in FreeCAD.__cmake__:
body = self.Doc.addObject("PartDesign::Body", "Body")