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

Fixed #592 (layer mapping issue) (#601)

This commit is contained in:
Matthias Köfferlein 2020-07-03 23:40:55 +02:00 committed by Matthias Koefferlein
parent 5ed1e27faf
commit c416c7faf9
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/db/db/dbStreamLayers.cc
View File

@ -305,7 +305,7 @@ LayerMap::prepare (db::Layout &layout)
// In addition, map other existing layers as well, so merging of layout is somewhat better supported
for (db::Layout::layer_iterator l = layout.begin_layers (); l != layout.end_layers (); ++l) {
if (mapped_layers.find ((*l).first) == mapped_layers.end ()) {
if (! (*l).second->is_null () && mapped_layers.find ((*l).first) == mapped_layers.end ()) {
map (*(*l).second, (*l).first);
}
}

38
src/db/unit_tests/dbStreamLayerTests.cc
View File

@ -407,3 +407,41 @@ TEST(6)
"layer_map('1/0';'3/10-*';'2/0 : 2/0';'2/42 : 2/42';'2/1-41,43-* : */*')"
);
}
// issue #592
TEST(7)
{
db::Layout ly;
unsigned int l1 = ly.insert_layer (db::LayerProperties (85, 0));
unsigned int l2 = ly.insert_layer (db::LayerProperties (185, 0));
ly.insert_layer ();
ly.insert_layer ();
db::LayerMap lm;
lm.map (db::LayerProperties (10001, 0), l1);
lm.map (db::LayerProperties (10000, 0), l2);
EXPECT_EQ (layers_to_string (ly), "85/0,185/0,,");
lm.prepare (ly);
EXPECT_EQ (layers_to_string (ly), "85/0,185/0,,");
std::pair<bool, unsigned int> p;
p = lm.logical (db::LayerProperties (85, 0));
EXPECT_EQ (p.first, false);
EXPECT_EQ (p.second, (unsigned int) 0);
p = lm.logical (db::LayerProperties (185, 0));
EXPECT_EQ (p.first, false);
EXPECT_EQ (p.second, (unsigned int) 0);
p = lm.logical (db::LayerProperties (10000, 0));
EXPECT_EQ (p.first, true);
EXPECT_EQ (p.second, (unsigned int) 1);
p = lm.logical (db::LayerProperties (10001, 0));
EXPECT_EQ (p.first, true);
EXPECT_EQ (p.second, (unsigned int) 0);
}