From 6399f4693a19922e83db1e95bf76c49472f8686f Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Tue, 26 Nov 2019 23:03:55 +0100 Subject: [PATCH] Bugfixed MAG reader. --- src/plugins/streamers/magic/db_plugin/dbMAGReader.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/plugins/streamers/magic/db_plugin/dbMAGReader.cc b/src/plugins/streamers/magic/db_plugin/dbMAGReader.cc index 226b9c539..bab0ffe3d 100644 --- a/src/plugins/streamers/magic/db_plugin/dbMAGReader.cc +++ b/src/plugins/streamers/magic/db_plugin/dbMAGReader.cc @@ -283,6 +283,8 @@ MAGReader::do_read_part (db::Layout &layout, db::cell_index_type cell_index, tl: error (tl::to_string (tr ("Could not find 'magic' header line - is this a MAGIC file?"))); } + layout.add_meta_info (db::MetaInfo ("magic_lambda", "MAGIC lambda value", tl::to_string (m_lambda))); + bool valid_layer = false; unsigned int current_layer = 0; bool in_labels = false; @@ -496,9 +498,9 @@ MAGReader::read_cell_instance (tl::Extractor &ex, tl::TextInputStream &stream, L ex2.read (ysep); na = (unsigned long) std::max (0, xhi - xlo + 1); - a = db::DVector (xsep, 0); + a = db::DVector (xsep, 0) * m_lambda; nb = (unsigned long) std::max (0, yhi - ylo + 1); - b = db::DVector (ysep, 0); + b = db::DVector (ysep, 0) * m_lambda; } else if (ex2.test ("timestamp")) { // ignored @@ -514,7 +516,7 @@ MAGReader::read_cell_instance (tl::Extractor &ex, tl::TextInputStream &stream, L ex2.read (m22); ex2.read (dy); - trans = db::DCplxTrans (db::Matrix2d (m11, m12, m21, m22), db::DVector (dx, dy)); + trans = db::DCplxTrans (db::Matrix2d (m11, m12, m21, m22), db::DVector (dx, dy) * m_lambda); } else if (ex2.test ("box")) { // ignored