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

WIP: updated test data (bugfix: bulk does not have layer properties), Fixed Region::count and Region::hier_count (was counting non-polygons too)

This commit is contained in:
Matthias Koefferlein 2021-05-25 23:08:38 +02:00
parent 3789e38ce3
commit 19b28982e7
9 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,10 +224,10 @@ OriginalLayerRegion::count () const
size_t nn = 0;
if (iter.multiple_layers ()) {
for (std::vector<unsigned int>::const_iterator l = iter.layers ().begin (); l != iter.layers ().end (); ++l) {
nn += layout.cell (*c).shapes (*l).size (iter.shape_flags ());
nn += layout.cell (*c).shapes (*l).size (iter.shape_flags () & db::ShapeIterator::Regions);
}
} else {
nn += layout.cell (*c).shapes (iter.layer ()).size (iter.shape_flags ());
} else if (iter.layer () < layout.layers ()) {
nn += layout.cell (*c).shapes (iter.layer ()).size (iter.shape_flags () & db::ShapeIterator::Regions);
}
n += cc.weight (*c) * nn;
}
@ -265,10 +265,10 @@ OriginalLayerRegion::hier_count () const
}
if (iter.multiple_layers ()) {
for (std::vector<unsigned int>::const_iterator l = iter.layers ().begin (); l != iter.layers ().end (); ++l) {
n += layout.cell (*c).shapes (*l).size (iter.shape_flags ());
n += layout.cell (*c).shapes (*l).size (iter.shape_flags () & db::ShapeIterator::Regions);
}
} else {
n += layout.cell (*c).shapes (iter.layer ()).size (iter.shape_flags ());
} else if (iter.layer () < layout.layers ()) {
n += layout.cell (*c).shapes (iter.layer ()).size (iter.shape_flags () & db::ShapeIterator::Regions);
}
}

2
testdata/algo/lvs_test1_au.lvsdb.1 vendored
View File

@ -9,7 +9,7 @@ layout(
# This section lists the mask layers (drawing or derived) and their connections.
# Mask layers
layer(bulk '1/0')
layer(bulk)
layer(nwell '1/0')
layer(poly '3/0')
layer(poly_lbl '3/1')

2
testdata/algo/lvs_test1_au.lvsdb.2 vendored
View File

@ -9,7 +9,7 @@ layout(
# This section lists the mask layers (drawing or derived) and their connections.
# Mask layers
layer(bulk '1/0')
layer(bulk)
layer(nwell '1/0')
layer(poly '3/0')
layer(poly_lbl '3/1')

2
testdata/algo/lvs_test1b_au.lvsdb.1 vendored
View File

@ -9,7 +9,7 @@ layout(
# This section lists the mask layers (drawing or derived) and their connections.
# Mask layers
layer(bulk '1/0')
layer(bulk)
layer(nwell '1/0')
layer(poly '3/0')
layer(poly_lbl '3/1')

2
testdata/algo/lvs_test1b_au.lvsdb.2 vendored
View File

@ -9,7 +9,7 @@ layout(
# This section lists the mask layers (drawing or derived) and their connections.
# Mask layers
layer(bulk '1/0')
layer(bulk)
layer(nwell '1/0')
layer(poly '3/0')
layer(poly_lbl '3/1')

2
testdata/algo/lvs_test2_au.lvsdb.1 vendored
View File

@ -9,7 +9,7 @@ layout(
# This section lists the mask layers (drawing or derived) and their connections.
# Mask layers
layer(bulk '1/0')
layer(bulk)
layer(nwell '1/0')
layer(poly '3/0')
layer(poly_lbl '3/1')

2
testdata/algo/lvs_test2_au.lvsdb.2 vendored
View File

@ -9,7 +9,7 @@ layout(
# This section lists the mask layers (drawing or derived) and their connections.
# Mask layers
layer(bulk '1/0')
layer(bulk)
layer(nwell '1/0')
layer(poly '3/0')
layer(poly_lbl '3/1')

2
testdata/algo/lvs_test2b_au.lvsdb.1 vendored
View File

@ -9,7 +9,7 @@ layout(
# This section lists the mask layers (drawing or derived) and their connections.
# Mask layers
layer(bulk '1/0')
layer(bulk)
layer(nwell '1/0')
layer(poly '3/0')
layer(poly_lbl '3/1')

2
testdata/algo/lvs_test2b_au.lvsdb.2 vendored
View File

@ -9,7 +9,7 @@ layout(
# This section lists the mask layers (drawing or derived) and their connections.
# Mask layers
layer(bulk '1/0')
layer(bulk)
layer(nwell '1/0')
layer(poly '3/0')
layer(poly_lbl '3/1')