From 74c64958f471720480a28b77b5162868bd8f76f9 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Fri, 19 Apr 2013 09:14:27 +0200 Subject: [PATCH] Pcbnew: fix bug in pcb_parser: incorrect pad local solder paste margin ratio value read when not 0. ( This also fixes bug 1170535 ) --- pcbnew/netlist_reader_common.cpp | 6 ++++++ pcbnew/pcb_parser.cpp | 3 ++- pcbnew/xchgmod.cpp | 1 - 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pcbnew/netlist_reader_common.cpp b/pcbnew/netlist_reader_common.cpp index f0cc2c58bc..87acf9bf8c 100644 --- a/pcbnew/netlist_reader_common.cpp +++ b/pcbnew/netlist_reader_common.cpp @@ -250,6 +250,12 @@ void NETLIST_READER::TestFootprintsMatchingAndExchange() if( newModule ) { + wxString msg; + msg.Printf( _( "Module ref %s, change footprint %s to %s\n" ), + GetChars( module->GetReference() ), + GetChars( module->GetLibRef() ), + GetChars( cmp_info->m_Footprint ) ); + m_messageWindow->AppendText( msg ); // Change old module to the new module (and delete the old one) m_pcbframe->Exchange_Module( module, newModule, NULL ); } diff --git a/pcbnew/pcb_parser.cpp b/pcbnew/pcb_parser.cpp index c8a1229152..607da461e7 100644 --- a/pcbnew/pcb_parser.cpp +++ b/pcbnew/pcb_parser.cpp @@ -2182,7 +2182,8 @@ D_PAD* PCB_PARSER::parseD_PAD() throw( IO_ERROR, PARSE_ERROR ) break; case T_solder_paste_margin_ratio: - pad->SetLocalSolderPasteMarginRatio( parseBoardUnits( T_solder_paste_margin_ratio ) ); + pad->SetLocalSolderPasteMarginRatio( + parseDouble( "pad local solder paste margin ratio value" ) ); NeedRIGHT(); break; diff --git a/pcbnew/xchgmod.cpp b/pcbnew/xchgmod.cpp index f0290bec13..dafa481d23 100644 --- a/pcbnew/xchgmod.cpp +++ b/pcbnew/xchgmod.cpp @@ -177,7 +177,6 @@ int DIALOG_EXCHANGE_MODULE::Maj_ListeCmp( const wxString& reference, FILE* FichCmp, * NewFile; char line[1024]; wxString msg; -// char* quiet_gcc_4_4_3; if( old_name == new_name ) return 0;