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

minor

This commit is contained in:
dickelbeck 2008-10-06 15:03:59 +00:00
parent cdf9a2291f
commit 7d1170c41e
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eeschema/component_class.h
View File

@ -158,8 +158,8 @@ public:
/** /**
* Function AddField * Function AddField
* adds a field to the component. The component takes over ownership * adds a field to the component. The field is copied as it is put into
* of the field. * the component.
* @param aField A const reference to the SCH_CMP_FIELD to add. * @param aField A const reference to the SCH_CMP_FIELD to add.
*/ */
void AddField( const SCH_CMP_FIELD& aField ); void AddField( const SCH_CMP_FIELD& aField );

8
eeschema/load_one_schematic_file.cpp
View File

@ -516,6 +516,8 @@ static int ReadPartDescr( wxWindow* frame, char* Line, FILE* f,
SCH_COMPONENT* component; SCH_COMPONENT* component;
int Failed = 0, newfmt = 0; int Failed = 0, newfmt = 0;
char* ptcar; char* ptcar;
wxString fieldName;
component = new SCH_COMPONENT(); component = new SCH_COMPONENT();
@ -671,8 +673,6 @@ static int ReadPartDescr( wxWindow* frame, char* Line, FILE* f,
int hjustify = GR_TEXT_HJUSTIFY_CENTER; int hjustify = GR_TEXT_HJUSTIFY_CENTER;
int vjustify = GR_TEXT_VJUSTIFY_CENTER; int vjustify = GR_TEXT_VJUSTIFY_CENTER;
wxString fieldName;
FieldUserName[0] = 0; FieldUserName[0] = 0;
/* Lecture du champ */ /* Lecture du champ */
@ -712,13 +712,11 @@ static int ReadPartDescr( wxWindow* frame, char* Line, FILE* f,
ReadDelimitedText( FieldUserName, ptcar, sizeof(FieldUserName) ); ReadDelimitedText( FieldUserName, ptcar, sizeof(FieldUserName) );
if( 0 == strlen(FieldUserName) ) if( !FieldUserName[0] )
fieldName = ReturnDefaultFieldName( fieldNdx ); fieldName = ReturnDefaultFieldName( fieldNdx );
else else
fieldName = CONV_FROM_UTF8( FieldUserName ); fieldName = CONV_FROM_UTF8( FieldUserName );
D(printf("FiledUserName=\"%s\"\n", FieldUserName );)
if( fieldNdx >= component->GetFieldCount() ) if( fieldNdx >= component->GetFieldCount() )
{ {
// add as many fields as needed so the m_FieldId's are contiguous, no gaps. // add as many fields as needed so the m_FieldId's are contiguous, no gaps.