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

Better to warn user and orphan nets than refuse to open board.

This commit is contained in:
Jeff Young 2020-01-16 18:10:10 +00:00
parent 384ff2539a
commit a91ca785e5
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pcbnew/pcb_parser.cpp
View File

@ -3024,20 +3024,31 @@ D_PAD* PCB_PARSER::parseD_PAD( MODULE* aParent )
case T_net: case T_net:
if( ! pad->SetNetCode( getNetCode( parseInt( "net number" ) ), /* aNoAssert */ true ) ) if( ! pad->SetNetCode( getNetCode( parseInt( "net number" ) ), /* aNoAssert */ true ) )
THROW_IO_ERROR( {
wxString::Format( _( "Invalid net ID in\nfile: \"%s\"\nline: %d\noffset: %d" ), wxLogError( wxString::Format( _( "Invalid net ID in\n"
CurSource(), CurLineNumber(), CurOffset() ) "file: '%s'\n"
); "line: %d\n"
"offset: %d" ),
CurSource(),
CurLineNumber(),
CurOffset() ) );
}
NeedSYMBOLorNUMBER(); NeedSYMBOLorNUMBER();
// Test validity of the netname in file for netcodes expected having a net name // Test validity of the netname in file for netcodes expected having a net name
if( m_board && pad->GetNetCode() > 0 && if( m_board && pad->GetNetCode() > 0 &&
FromUTF8() != m_board->FindNet( pad->GetNetCode() )->GetNetname() ) FromUTF8() != m_board->FindNet( pad->GetNetCode() )->GetNetname() )
THROW_IO_ERROR( {
wxString::Format( _( "Invalid net ID in\nfile: \"%s\"\nline: %d\noffset: %d" ), pad->SetNetCode( NETINFO_LIST::ORPHANED, /* aNoAssert */ true );
CurSource(), CurLineNumber(), CurOffset() ) wxLogError( wxString::Format( _( "Net name doesn't match net ID in\n"
); "file: '%s'\n"
"line: %d\n"
"offset: %d" ),
CurSource(),
CurLineNumber(),
CurOffset() ) );
}
NeedRIGHT(); NeedRIGHT();
break; break;