luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Using floats for Polygon::smooth distance checks, so that precise measurements are taken

This commit is contained in:
Matthias Koefferlein 2025-12-22 21:02:22 +01:00
parent 6ad326e806
commit 989f80e1a6
2 changed files with 61 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/db/db/dbPolygonTools.cc
View File

@ -814,7 +814,7 @@ smooth_contour (db::Polygon::polygon_contour_iterator from, db::Polygon::polygon
if (keep_hv && (p1.x () == p0.x () || p1.y () == p0.y () || p2.x () == p1.x () || p2.y () == p1.y ())) {
// keep points which participate in either a vertical or horizontal edge
} else if (db::Coord (p1.distance(p0)) <= d && db::sprod_sign (p2 - p1, p0 - pm1) > 0 && std::abs (db::vprod (p2 - p1, p0 - pm1)) < 0.8 * p2.distance (p1) * p0.distance (pm1)) {
} else if (p1.double_distance (p0) <= d * (1.0 + db::epsilon) && db::sprod_sign (p2 - p1, p0 - pm1) > 0 && std::abs (db::vprod (p2 - p1, p0 - pm1)) < 0.8 * p2.distance (p1) * p0.distance (pm1)) {
// jog configurations with small edges are candidates
can_drop = true;
} else if (db::vprod_sign (p2 - p1, p1 - p0) < 0) {
@ -826,7 +826,7 @@ smooth_contour (db::Polygon::polygon_contour_iterator from, db::Polygon::polygon
}
for (size_t j = pi0; can_drop; ) {
if (std::abs (db::Edge (p0, p2).distance (org_points [j])) > d) {
if (std::abs (db::DEdge (db::DPoint (p0), db::DPoint (p2)).distance (db::DPoint (org_points [j]))) > d * (1.0 + db::epsilon)) {
can_drop = false;
}
if (j == pi2) {

59
src/db/unit_tests/dbPolygonToolsTests.cc
View File

@ -1366,6 +1366,65 @@ TEST(106)
EXPECT_EQ (smooth (p, 100, true).to_string (), "(0,0;0,73235;1200,90468;2300,114468;2800,138468;2800,154468;2000,186468;700,210468;0,219701;0,272971;126450,272971;126450,0)");
}
// smoothing, small units
TEST(107)
{
db::Point pattern [] = {
db::Point (1, 1),
db::Point (1, 2),
db::Point (2, 2),
db::Point (2, 4),
db::Point (3, 4),
db::Point (3, 5),
db::Point (4, 5),
db::Point (4, 7),
db::Point (5, 7),
db::Point (5, 8),
db::Point (6, 8),
db::Point (6, 9),
db::Point (7, 9),
db::Point (7, 16),
db::Point (8, 16),
db::Point (8, 17),
db::Point (9, 17),
db::Point (9, 18),
db::Point (10, 18),
db::Point (10, 19),
db::Point (12, 19),
db::Point (12, 20),
db::Point (16, 20),
db::Point (16, 21),
db::Point (17, 21),
db::Point (17, 22),
db::Point (18, 22),
db::Point (18, 23),
db::Point (24, 23),
db::Point (24, 15),
db::Point (23, 15),
db::Point (23, 14),
db::Point (22, 14),
db::Point (22, 12),
db::Point (21, 12),
db::Point (21, 10),
db::Point (20, 10),
db::Point (20, 8),
db::Point (19, 8),
db::Point (19, 6),
db::Point (18, 6),
db::Point (18, 4),
db::Point (17, 4),
db::Point (17, 3),
db::Point (16, 3),
db::Point (16, 1)
};
db::Polygon p;
p.assign_hull (&pattern[0], &pattern[0] + sizeof (pattern) / sizeof (pattern[0]));
EXPECT_EQ (smooth (p, 0, false).to_string (), "(1,1;1,2;2,2;2,4;3,4;3,5;4,5;4,7;5,7;5,8;6,8;6,9;7,9;7,16;8,16;8,17;9,17;9,18;10,18;10,19;12,19;12,20;16,20;16,21;17,21;17,22;18,22;18,23;24,23;24,15;23,15;23,14;22,14;22,12;21,12;21,10;20,10;20,8;19,8;19,6;18,6;18,4;17,4;17,3;16,3;16,1)");
EXPECT_EQ (smooth (p, 1, false).to_string (), "(1,1;2,4;4,5;4,7;7,9;7,16;10,18;18,22;24,23;24,15;22,14;18,4;17,4;16,1)");
}
// rounding
TEST(200)
{