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

Bugfix: 'merged' mode wasn't working in PCB import.

This commit is contained in:
Matthias Koefferlein 2017-10-08 23:07:10 +02:00
parent c50fe8cb57
commit 4f9857ace9
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ext/ext/extGerberImporter.cc
View File

@ -263,7 +263,6 @@ GerberFileReader::read_coord (tl::Extractor &ex)
void
GerberFileReader::swap_graphics_state (GraphicsState &state)
{
std::swap (m_merge, state.merge);
std::swap (m_inverse, state.inverse);
std::swap (m_global_trans, state.global_trans);
std::swap (m_s, state.m_s);

3
src/ext/ext/extGerberImporter.h
View File

@ -153,14 +153,13 @@ struct GerberMetaData
struct GraphicsState
{
GraphicsState ()
: merge (false), inverse (false),
: inverse (false),
m_rot (0.0), m_s (1.0), m_ox (false), m_oy (false), m_mx (false), m_my (false),
m_orot (0.0), m_os (1.0), m_omx (false), m_omy (false)
{
displacements.push_back (db::DVector ());
}
bool merge;
bool inverse;
db::DCplxTrans global_trans;
double m_rot;

10
src/ext/unit_tests/extGerberImport.cc
View File

@ -362,3 +362,13 @@ TEST(X2_4)
{
run_test (_this, "x2-4");
}
TEST(X2_5a)
{
run_test (_this, "x2-5a");
}
TEST(X2_5b)
{
run_test (_this, "x2-5b");
}