mirror of
https://github.com/KLayout/klayout.git
synced 2026-09-02 10:57:51 +02:00
Importing latest version of LStream package, bug fixes (mag instances, layer were duplicated)
This commit is contained in:
@@ -275,9 +275,15 @@ SaveLayoutOptions::get_valid_layers (const db::Layout &layout, std::vector <std:
|
||||
|
||||
}
|
||||
|
||||
if (lm == LP_OnlyNumbered) {
|
||||
if (lm == LP_AsIs) {
|
||||
|
||||
for (std::vector<std::pair <unsigned int, db::LayerProperties> >::const_iterator l = all_layers.begin (); l != all_layers.end (); ++l) {
|
||||
for (auto l = all_layers.begin (); l != all_layers.end (); ++l) {
|
||||
layers.push_back (*l);
|
||||
}
|
||||
|
||||
} else if (lm == LP_OnlyNumbered) {
|
||||
|
||||
for (auto l = all_layers.begin (); l != all_layers.end (); ++l) {
|
||||
if (l->second.layer >= 0 && l->second.datatype >= 0) {
|
||||
layers.push_back (*l);
|
||||
}
|
||||
@@ -285,7 +291,7 @@ SaveLayoutOptions::get_valid_layers (const db::Layout &layout, std::vector <std:
|
||||
|
||||
} else if (lm == LP_OnlyNamed) {
|
||||
|
||||
for (std::vector<std::pair <unsigned int, db::LayerProperties> >::const_iterator l = all_layers.begin (); l != all_layers.end (); ++l) {
|
||||
for (auto l = all_layers.begin (); l != all_layers.end (); ++l) {
|
||||
if (! l->second.name.empty ()) {
|
||||
layers.push_back (*l);
|
||||
}
|
||||
@@ -293,7 +299,7 @@ SaveLayoutOptions::get_valid_layers (const db::Layout &layout, std::vector <std:
|
||||
|
||||
} else if (lm == LP_AssignName) {
|
||||
|
||||
for (std::vector<std::pair <unsigned int, db::LayerProperties> >::const_iterator l = all_layers.begin (); l != all_layers.end (); ++l) {
|
||||
for (auto l = all_layers.begin (); l != all_layers.end (); ++l) {
|
||||
layers.push_back (*l);
|
||||
if (l->second.name.empty ()) {
|
||||
layers.back ().second = tl::sprintf ("L%dD%d", l->second.layer, l->second.datatype);
|
||||
@@ -304,7 +310,7 @@ SaveLayoutOptions::get_valid_layers (const db::Layout &layout, std::vector <std:
|
||||
|
||||
} else if (lm == LP_AssignNameWithPriority) {
|
||||
|
||||
for (std::vector<std::pair <unsigned int, db::LayerProperties> >::const_iterator l = all_layers.begin (); l != all_layers.end (); ++l) {
|
||||
for (auto l = all_layers.begin (); l != all_layers.end (); ++l) {
|
||||
layers.push_back (*l);
|
||||
if (l->second.name.empty ()) {
|
||||
layers.back ().second = tl::sprintf ("L%dD%d", l->second.layer, l->second.datatype);
|
||||
|
||||
@@ -405,7 +405,8 @@ public:
|
||||
LP_OnlyNamed = 1,
|
||||
LP_AssignName = 2,
|
||||
LP_AssignNameWithPriority = 3,
|
||||
LP_AssignNumber = 4
|
||||
LP_AssignNumber = 4,
|
||||
LP_AsIs = 5
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user