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

Code style fixes

This commit is contained in:
Jon Evans 2018-03-07 22:14:24 -05:00
parent 3e033aee0c
commit 23f49f014b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gerbview/excellon_read_drill_file.cpp
View File

@ -537,6 +537,7 @@ bool EXCELLON_IMAGE::readToolInformation( char*& aText )
return true; return true;
} }
bool EXCELLON_IMAGE::Execute_Drill_Command( char*& text ) bool EXCELLON_IMAGE::Execute_Drill_Command( char*& text )
{ {
D_CODE* tool; D_CODE* tool;
@ -548,9 +549,9 @@ bool EXCELLON_IMAGE::Execute_Drill_Command( char*& text )
{ {
case 'X': case 'X':
case 'Y': case 'Y':
// Decode the coordinate format
if( !m_format_known ) if( !m_format_known )
{ {
// Scan the first entry to decode format
int nbdigits = 0; int nbdigits = 0;
int integer = m_GerbMetric ? fmtIntegerMM : fmtIntegerInch; int integer = m_GerbMetric ? fmtIntegerMM : fmtIntegerInch;
int mantissa; int mantissa;
@ -558,7 +559,7 @@ bool EXCELLON_IMAGE::Execute_Drill_Command( char*& text )
while( IsNumber( *read ) ) while( IsNumber( *read ) )
{ {
if( (*read >= '0') && (*read <='9') ) if( ( *read >= '0' ) && ( *read <='9' ) )
nbdigits++; nbdigits++;
read++; read++;
@ -574,10 +575,12 @@ bool EXCELLON_IMAGE::Execute_Drill_Command( char*& text )
ReadXYCoord( text ); ReadXYCoord( text );
break; break;
case 'G': // G85 is found here for oval holes case 'G': // G85 is found here for oval holes
m_PreviousPos = m_CurrentPos; m_PreviousPos = m_CurrentPos;
Execute_EXCELLON_G_Command( text ); Execute_EXCELLON_G_Command( text );
break; break;
case 0: // E.O.L: execute command case 0: // E.O.L: execute command
tool = GetDCODE( m_Current_Tool ); tool = GetDCODE( m_Current_Tool );