Commit 74c64958 authored by jean-pierre charras's avatar jean-pierre charras

Pcbnew: fix bug in pcb_parser: incorrect pad local solder paste margin ratio...

Pcbnew: fix bug in pcb_parser: incorrect pad local solder paste margin ratio value read when not 0. ( This also fixes bug 1170535 )
parent 97ccebf3
...@@ -250,6 +250,12 @@ void NETLIST_READER::TestFootprintsMatchingAndExchange() ...@@ -250,6 +250,12 @@ void NETLIST_READER::TestFootprintsMatchingAndExchange()
if( newModule ) 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) // Change old module to the new module (and delete the old one)
m_pcbframe->Exchange_Module( module, newModule, NULL ); m_pcbframe->Exchange_Module( module, newModule, NULL );
} }
......
...@@ -2182,7 +2182,8 @@ D_PAD* PCB_PARSER::parseD_PAD() throw( IO_ERROR, PARSE_ERROR ) ...@@ -2182,7 +2182,8 @@ D_PAD* PCB_PARSER::parseD_PAD() throw( IO_ERROR, PARSE_ERROR )
break; break;
case T_solder_paste_margin_ratio: 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(); NeedRIGHT();
break; break;
......
...@@ -177,7 +177,6 @@ int DIALOG_EXCHANGE_MODULE::Maj_ListeCmp( const wxString& reference, ...@@ -177,7 +177,6 @@ int DIALOG_EXCHANGE_MODULE::Maj_ListeCmp( const wxString& reference,
FILE* FichCmp, * NewFile; FILE* FichCmp, * NewFile;
char line[1024]; char line[1024];
wxString msg; wxString msg;
// char* quiet_gcc_4_4_3;
if( old_name == new_name ) if( old_name == new_name )
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment