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

Merge branch 'master' of github.com:KLayout/klayout into 25d-view-enhancements

This commit is contained in:
Matthias Koefferlein 2021-09-22 07:51:24 +02:00
parent 4da0a38857 897bcf1ed8
commit df4e6ce262
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/db/db/dbOriginalLayerRegion.cc
View File

@ -204,6 +204,16 @@ OriginalLayerRegion::count () const
return n;
} else if (! iter.layout ()) {
// for Shapes-based iterators just use the shape count
if (iter.shapes ()) {
return iter.shapes ()->size (iter.shape_flags () & db::ShapeIterator::Regions);
} else {
return 0;
}
} else {
// otherwise we can utilize the CellCounter

13
src/db/unit_tests/dbRegionTests.cc
View File

@ -2094,3 +2094,16 @@ TEST(issue_277)
r.set_min_coherence (false); // needs to merge again
EXPECT_EQ (r.sized (1).merged (false, 1).to_string (), "");
}
TEST(issue_909)
{
db::Shapes s1;
s1.insert(db::Box(0, 0, 100, 100));
db::Shapes s2;
s2.insert(db::Box(0, 0, 200, 300));
db::Region r1 = db::Region (db::RecursiveShapeIterator (s1));
db::Region r2 = db::Region (db::RecursiveShapeIterator (s2));
db::Region r = r1 + r2;
EXPECT_EQ (r.to_string (), "(0,0;0,100;100,100;100,0);(0,0;0,300;200,300;200,0)");
}