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

Fixed #114 (Custom line styles not loaded by tech)

This commit is contained in:
Matthias Koefferlein 2018-04-17 01:23:21 +02:00
parent 8bc0063fe6
commit 17e9e48831
1 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/laybasic/laybasic/layLayerProperties.cc
View File

@ -1357,20 +1357,40 @@ expand_wildcard_layers (const LayerPropertiesNode &lp, const LayerPropertiesList
void void
LayerPropertiesList::append (const LayerPropertiesList &other) LayerPropertiesList::append (const LayerPropertiesList &other)
{ {
lay::DitherPattern dp (other.dither_pattern ()); {
lay::DitherPattern dp (other.dither_pattern ());
std::map <unsigned int, unsigned int> index_map; std::map <unsigned int, unsigned int> index_map;
dp.merge (dither_pattern (), index_map); dp.merge (dither_pattern (), index_map);
for (lay::LayerPropertiesIterator l = begin_recursive (); l != end_recursive (); ++l) { for (lay::LayerPropertiesIterator l = begin_recursive (); l != end_recursive (); ++l) {
int dpi = l->dither_pattern (false /*local*/); int dpi = l->dither_pattern (false /*local*/);
std::map <unsigned int, unsigned int>::iterator m = index_map.find ((unsigned int) dpi); std::map <unsigned int, unsigned int>::iterator m = index_map.find ((unsigned int) dpi);
if (m != index_map.end ()) { if (m != index_map.end ()) {
l->set_dither_pattern (int (m->second)); l->set_dither_pattern (int (m->second));
}
} }
set_dither_pattern (dp);
} }
set_dither_pattern (dp); {
lay::LineStyles ls (other.line_styles ());
std::map <unsigned int, unsigned int> index_map;
ls.merge (line_styles (), index_map);
// remap the dither pattern index
for (lay::LayerPropertiesIterator l = begin_recursive (); l != end_recursive (); ++l) {
int lsi = l->line_style (false /*local*/);
std::map <unsigned int, unsigned int>::iterator m = index_map.find ((unsigned int) lsi);
if (m != index_map.end ()) {
l->set_line_style (int (m->second));
}
}
set_line_styles (ls);
}
for (lay::LayerPropertiesList::const_iterator l = other.begin_const (); l != other.end_const (); ++l) { for (lay::LayerPropertiesList::const_iterator l = other.begin_const (); l != other.end_const (); ++l) {
push_back (*l); push_back (*l);