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

Merge pull request #2346 from KLayout/bugfix/issue-2343 

Fixed issue #2343 (loss of collinear points in copy_tree and other pl…
This commit is contained in:
Matthias Köfferlein 2026-05-20 19:03:59 +02:00 committed by GitHub
parent 8488c59c15 39c95a11de
commit 337c910ce0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/db/db/dbLayoutUtils.cc
View File

@ -218,6 +218,7 @@ copy_or_propagate_shapes (db::Layout &target,
db::Cell &target_cell = target.cell (cm->second);
transformer->insert_transformed (target_cell.shapes (target_layer), source_cell.shapes (source_layer), trans * propagate_trans);
}
}

2
src/db/db/dbPolygon.h
View File

@ -1581,7 +1581,7 @@ public:
void translate (const polygon<C> &d, const T &t, db::generic_repository<C> &, db::ArrayRepository &)
{
*this = d;
transform (t);
transform (t, false);
}
/**

31
src/db/unit_tests/dbLayoutTests.cc
View File

@ -1009,3 +1009,34 @@ TEST(100_UndoOfDeleteLayer)
EXPECT_EQ (l.get_properties (li).to_string (), "1/0");
EXPECT_EQ (l.get_properties (li2).to_string (), "2/0");
}
// issue #2343
TEST(101_CopyTreeDoesNotModifyPolygons)
{
db::Manager m;
db::Layout l (&m);
db::Cell &top = l.cell (l.add_cell ("TOP"));
l.insert_layer (db::LayerProperties (1, 0));
std::unique_ptr<db::Layout> t (new db::Layout ());
db::Cell &ttop = t->cell (t->add_cell ("TOP"));
unsigned int tl1 = t->insert_layer (db::LayerProperties (1, 0));
std::vector<db::Point> pts = {
{ 0, 0 }, { 0, 1000 }, { 500, 1000 }, { 1500, 1000 }, { 1000, 1000 }, { 1000, 0 }
};
db::Polygon poly;
poly.assign_hull (pts.begin (), pts.end (), false /*don't compress*/, false /*don't remove reflected*/);
ttop.shapes (tl1).insert (poly);
EXPECT_EQ (l2s (*t), "begin_lib 0.001\nbegin_cell {TOP}\nboundary 1 0 {0 0} {0 1000} {500 1000} {1500 1000} {1000 1000} {1000 0} {0 0}\nend_cell\nend_lib\n");
db::CellMapping cm;
cm.create_single_mapping (l, top.cell_index (), *t, ttop.cell_index ());
l.copy_tree_shapes (*t, cm);
// polygon is still not normalized
EXPECT_EQ (l2s (l), "begin_lib 0.001\nbegin_cell {TOP}\nboundary 1 0 {0 0} {0 1000} {500 1000} {1500 1000} {1000 1000} {1000 0} {0 0}\nend_cell\nend_lib\n");
}