luke/klayout
1
0
Fork 0
mirror of https://github.com/KLayout/klayout.git synced 2026-09-01 18:37:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'lefdef-enhancments' of https://github.com/KLayout/klayout into lefdef-enhancments

Browse Source
This commit is contained in:
Matthias Koefferlein
2020-04-18 18:00:54 +02:00
parent 54cf57c772 d4a333966b
commit 70d8334f8c
3 changed files with 64 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/streamers/lefdef/db_plugin/dbDEFImporter.cc
+62 -41
View File
@@ -770,15 +770,70 @@ DEFImporter::read_nets (db::Layout &layout, db::Cell &design, double scale, bool
nondefaultrule = get ();
} else if ((was_shield = test ("SHIELD")) == true || test ("NOSHIELD") || test ("ROUTED") || test ("FIXED") || test ("COVER")) {
} else {
if (was_shield) {
take ();
bool prefixed = false;
if ((was_shield = test ("SHIELD")) == true || test ("NOSHIELD") || test ("ROUTED") || test ("FIXED") || test ("COVER")) {
if (was_shield) {
take ();
}
prefixed = true;
}
read_single_net (nondefaultrule, layout, design, scale, prop_id, specialnets);
bool any = false;
if (in_subnet) {
if (test ("POLYGON")) {
std::string ln = get ();
db::Polygon p;
read_polygon (p, scale);
std::pair <bool, unsigned int> dl = open_layer (layout, ln, Routing);
if (dl.first) {
if (prop_id != 0) {
design.shapes (dl.second).insert (db::object_with_properties<db::Polygon> (p, prop_id));
} else {
design.shapes (dl.second).insert (p);
}
}
any = true;
} else if (test ("RECT")) {
std::string ln = get ();
db::Polygon p;
read_rect (p, scale);
std::pair <bool, unsigned int> dl = open_layer (layout, ln, Routing);
if (dl.first) {
if (prop_id != 0) {
design.shapes (dl.second).insert (db::object_with_properties<db::Polygon> (p, prop_id));
} else {
design.shapes (dl.second).insert (p);
}
}
any = true;
} else if (prefixed) {
read_single_net (nondefaultrule, layout, design, scale, prop_id, specialnets);
any = true;
} else {
// lazily skip everything else
while (! peek ("+") && ! peek ("-") && ! peek (";")) {
take ();
}
}
if (any && in_subnet) {
in_subnet = false;
@@ -792,42 +847,6 @@ DEFImporter::read_nets (db::Layout &layout, db::Cell &design, double scale, bool
}
} else if (test ("POLYGON")) {
std::string ln = get ();
db::Polygon p;
read_polygon (p, scale);
std::pair <bool, unsigned int> dl = open_layer (layout, ln, Routing);
if (dl.first) {
if (prop_id != 0) {
design.shapes (dl.second).insert (db::object_with_properties<db::Polygon> (p, prop_id));
} else {
design.shapes (dl.second).insert (p);
}
}
} else if (test ("RECT")) {
std::string ln = get ();
db::Polygon p;
read_rect (p, scale);
std::pair <bool, unsigned int> dl = open_layer (layout, ln, Routing);
if (dl.first) {
if (prop_id != 0) {
design.shapes (dl.second).insert (db::object_with_properties<db::Polygon> (p, prop_id));
} else {
design.shapes (dl.second).insert (p);
}
}
} else {
while (! peek ("+") && ! peek ("-") && ! peek (";")) {
take ();
}
}
}
@@ -1398,6 +1417,8 @@ DEFImporter::do_read (db::Layout &layout)
if (! groups.empty () && options ().separate_groups ()) {
db::LayoutLocker locker (&layout);
others_cell = &layout.cell (layout.add_cell ("NOGROUP"));
design.insert (db::CellInstArray (others_cell->cell_index (), db::Trans ()));