From 23f49f014b2f716acacf826715f3a21baa264ac0 Mon Sep 17 00:00:00 2001 From: Jon Evans Date: Wed, 7 Mar 2018 22:14:24 -0500 Subject: [PATCH] Code style fixes --- gerbview/excellon_read_drill_file.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gerbview/excellon_read_drill_file.cpp b/gerbview/excellon_read_drill_file.cpp index 5799303ea6..c3f6230228 100644 --- a/gerbview/excellon_read_drill_file.cpp +++ b/gerbview/excellon_read_drill_file.cpp @@ -537,6 +537,7 @@ bool EXCELLON_IMAGE::readToolInformation( char*& aText ) return true; } + bool EXCELLON_IMAGE::Execute_Drill_Command( char*& text ) { D_CODE* tool; @@ -548,9 +549,9 @@ bool EXCELLON_IMAGE::Execute_Drill_Command( char*& text ) { case 'X': case 'Y': + // Decode the coordinate format if( !m_format_known ) { - // Scan the first entry to decode format int nbdigits = 0; int integer = m_GerbMetric ? fmtIntegerMM : fmtIntegerInch; int mantissa; @@ -558,7 +559,7 @@ bool EXCELLON_IMAGE::Execute_Drill_Command( char*& text ) while( IsNumber( *read ) ) { - if( (*read >= '0') && (*read <='9') ) + if( ( *read >= '0' ) && ( *read <='9' ) ) nbdigits++; read++; @@ -574,10 +575,12 @@ bool EXCELLON_IMAGE::Execute_Drill_Command( char*& text ) ReadXYCoord( text ); break; + case 'G': // G85 is found here for oval holes m_PreviousPos = m_CurrentPos; Execute_EXCELLON_G_Command( text ); break; + case 0: // E.O.L: execute command tool = GetDCODE( m_Current_Tool );