Footprint library table work, minor fixes, and code cleaning.
* Fix a bug when full file name and path are passed to FOOTPRINT_INFO:: ReadFootprintFiles() which I created in bug fix lp:593989. * Fix a wxString debug assertion in EDA_APP::InitEDA_Appl() when the KICAD environment variable is defined as an empty string. * Add error dialog when libraries cannot be found in system search path when loading footprint using the select footprint dialog. * Add footprint library name column to the EDA_LIST_DIALOG when selecting footprints from the list. * Allow reading all columns from the selected row in EDA_LIST_DIALOG. * Remove redundant sort from EDA_LIST_DIALOG constructor * Add library name member variable and accessors to FOOTPRINT_INFO. * Make headers translatable for Eeschema select component from list dialog. * Add some helper methods to FPID for identifying the FPID type and validity. * Remove a bunch of trailing whitespace and add missing license comments.
This commit is contained in:
+30
-30
@@ -612,40 +612,40 @@ void PCB_PARSER::parseTITLE_BLOCK() throw( IO_ERROR, PARSE_ERROR )
|
||||
break;
|
||||
|
||||
case T_comment:
|
||||
{
|
||||
int commentNumber = parseInt( "comment" );
|
||||
|
||||
switch( commentNumber )
|
||||
{
|
||||
int commentNumber = parseInt( "comment" );
|
||||
|
||||
switch( commentNumber )
|
||||
{
|
||||
case 1:
|
||||
NextTok();
|
||||
titleBlock.SetComment1( FromUTF8() );
|
||||
break;
|
||||
|
||||
case 2:
|
||||
NextTok();
|
||||
titleBlock.SetComment2( FromUTF8() );
|
||||
break;
|
||||
|
||||
case 3:
|
||||
NextTok();
|
||||
titleBlock.SetComment3( FromUTF8() );
|
||||
break;
|
||||
|
||||
case 4:
|
||||
NextTok();
|
||||
titleBlock.SetComment4( FromUTF8() );
|
||||
break;
|
||||
|
||||
default:
|
||||
wxString err;
|
||||
err.Printf( wxT( "%d is not a valid title block comment number" ), commentNumber );
|
||||
THROW_PARSE_ERROR( err, CurSource(), CurLine(), CurLineNumber(), CurOffset() );
|
||||
}
|
||||
|
||||
case 1:
|
||||
NextTok();
|
||||
titleBlock.SetComment1( FromUTF8() );
|
||||
break;
|
||||
|
||||
case 2:
|
||||
NextTok();
|
||||
titleBlock.SetComment2( FromUTF8() );
|
||||
break;
|
||||
|
||||
case 3:
|
||||
NextTok();
|
||||
titleBlock.SetComment3( FromUTF8() );
|
||||
break;
|
||||
|
||||
case 4:
|
||||
NextTok();
|
||||
titleBlock.SetComment4( FromUTF8() );
|
||||
break;
|
||||
|
||||
default:
|
||||
wxString err;
|
||||
err.Printf( wxT( "%d is not a valid title block comment number" ), commentNumber );
|
||||
THROW_PARSE_ERROR( err, CurSource(), CurLine(), CurLineNumber(), CurOffset() );
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
default:
|
||||
Expecting( "title, date, rev, company, or comment" );
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user