haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kicad2step: Simplified unit conversion 

Instead of using 'm_inch' flag, dimensions are converted in place.
This commit is contained in:
Maciej Suminski 2018-06-19 10:01:32 +02:00
parent 04a462e48f
commit 7ef97e0bca
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
utils/kicad2step/kicad2step.cpp
View File

@ -54,7 +54,6 @@ private:
wxString m_outputFile; wxString m_outputFile;
double m_xOrigin; double m_xOrigin;
double m_yOrigin; double m_yOrigin;
bool m_inch;
}; };
static const wxCmdLineEntryDesc cmdLineDesc[] = static const wxCmdLineEntryDesc cmdLineDesc[] =
@ -97,7 +96,6 @@ bool KICAD2MCAD::OnInit()
m_useGridOrigin = false; m_useGridOrigin = false;
m_useDrillOrigin = false; m_useDrillOrigin = false;
m_includeVirtual = true; m_includeVirtual = true;
m_inch = false;
m_xOrigin = 0.0; m_xOrigin = 0.0;
m_yOrigin = 0.0; m_yOrigin = 0.0;
@ -173,7 +171,16 @@ bool KICAD2MCAD::OnCmdLineParsed( wxCmdLineParser& parser )
if( !tunit.compare( "in" ) || !tunit.compare( "inch" ) ) if( !tunit.compare( "in" ) || !tunit.compare( "inch" ) )
{ {
m_inch = true; m_xOrigin *= 25.4;
m_yOrigin *= 25.4;
}
else if( tunit.compare( "mm" ) )
{
parser.Usage();
return false;
}
}
}
} }
else if( tunit.compare( "mm" ) ) else if( tunit.compare( "mm" ) )
{ {
@ -235,10 +242,7 @@ int KICAD2MCAD::OnRun()
KICADPCB pcb; KICADPCB pcb;
if( m_inch ) pcb.SetOrigin( m_xOrigin, m_yOrigin );
pcb.SetOrigin( m_xOrigin * 25.4, m_yOrigin * 25.4 );
else
pcb.SetOrigin( m_xOrigin, m_yOrigin );
if( pcb.ReadFile( m_filename ) ) if( pcb.ReadFile( m_filename ) )
{ {