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

Ported oasis-fix to GDS2 reader too (reduction of zero-distance axes in AREF's)

This commit is contained in:
Matthias Koefferlein 2017-07-29 19:05:52 +02:00
parent 1b6c25513a
commit 919d2d56fa
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/db/dbGDS2ReaderBase.cc
View File

@ -1022,6 +1022,9 @@ GDS2ReaderBase::read_ref (db::Layout &layout, db::Cell & /*cell*/, bool array, t
int cols = get_ushort (); int cols = get_ushort ();
int rows = get_ushort (); int rows = get_ushort ();
cols = std::max (1, cols);
rows = std::max (1, rows);
// Array reference // Array reference
if (get_record () != sXY) { if (get_record () != sXY) {
error (tl::to_string (QObject::tr ("XY record expected"))); error (tl::to_string (QObject::tr ("XY record expected")));
@ -1041,6 +1044,15 @@ GDS2ReaderBase::read_ref (db::Layout &layout, db::Cell & /*cell*/, bool array, t
db::Vector c = v_conv (xy_data [1]) - xy; db::Vector c = v_conv (xy_data [1]) - xy;
db::Vector r = v_conv (xy_data [2]) - xy; db::Vector r = v_conv (xy_data [2]) - xy;
// Reduce axes with no displacement to dimension 1 - such
// axes only produce overlapping instances.
if (c == db::Vector ()) {
cols = 1;
}
if (r == db::Vector ()) {
rows = 1;
}
std::pair<bool, db::properties_id_type> pp = finish_element (layout.properties_repository ()); std::pair<bool, db::properties_id_type> pp = finish_element (layout.properties_repository ());
bool split_cols = false, split_rows = false; bool split_cols = false, split_rows = false;
@ -1056,9 +1068,6 @@ GDS2ReaderBase::read_ref (db::Layout &layout, db::Cell & /*cell*/, bool array, t
if (split_cols || split_rows) { if (split_cols || split_rows) {
cols = std::max (1, cols);
rows = std::max (1, rows);
db::DVector cd (db::DVector (c) * (1.0 / double (cols))); db::DVector cd (db::DVector (c) * (1.0 / double (cols)));
db::DVector rd (db::DVector (r) * (1.0 / double (rows))); db::DVector rd (db::DVector (r) * (1.0 / double (rows)));