mirror of https://github.com/KLayout/klayout.git
DEF reader fix: TAPER has to disable NONDEFAULTRULE for the segment
This commit is contained in:
parent
44503facea
commit
d328901799
|
|
@ -475,12 +475,13 @@ DEFImporter::do_read (db::Layout &layout)
|
||||||
take ();
|
take ();
|
||||||
}
|
}
|
||||||
|
|
||||||
taperrule.clear ();
|
|
||||||
|
|
||||||
do {
|
do {
|
||||||
|
|
||||||
std::string ln = get ();
|
std::string ln = get ();
|
||||||
|
|
||||||
|
taperrule.clear ();
|
||||||
|
const std::string *rulename = 0;
|
||||||
|
|
||||||
db::Coord w = 0;
|
db::Coord w = 0;
|
||||||
if (specialnets) {
|
if (specialnets) {
|
||||||
w = db::coord_traits<db::Coord>::rounded (get_double () * scale);
|
w = db::coord_traits<db::Coord>::rounded (get_double () * scale);
|
||||||
|
|
@ -507,8 +508,10 @@ DEFImporter::do_read (db::Layout &layout)
|
||||||
while (true) {
|
while (true) {
|
||||||
if (test ("TAPER")) {
|
if (test ("TAPER")) {
|
||||||
taperrule.clear ();
|
taperrule.clear ();
|
||||||
|
rulename = &taperrule;
|
||||||
} else if (test ("TAPERRULE")) {
|
} else if (test ("TAPERRULE")) {
|
||||||
taperrule = get ();
|
taperrule = get ();
|
||||||
|
rulename = &taperrule;
|
||||||
} else if (test ("STYLE")) {
|
} else if (test ("STYLE")) {
|
||||||
sn = get_long ();
|
sn = get_long ();
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -520,8 +523,7 @@ DEFImporter::do_read (db::Layout &layout)
|
||||||
|
|
||||||
if (! specialnets) {
|
if (! specialnets) {
|
||||||
|
|
||||||
const std::string *rulename = &taperrule;
|
if (! rulename) {
|
||||||
if (rulename->empty ()) {
|
|
||||||
rulename = &nondefaultrule;
|
rulename = &nondefaultrule;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue