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

user defined eeschema component fields should fill next available component field slot

This commit is contained in:
Dick Hollenbeck 2010-07-31 11:21:16 -05:00
parent e2d4b16b0c 43d7b7237e
commit cb35b5633a
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
eeschema/read_from_file_schematic_items_descriptions.cpp
View File

@ -703,17 +703,20 @@ int ReadPartDescr( wxWindow* frame, char* Line, FILE* f, wxString& aMsgDiag,
if( fieldNdx >= component->GetFieldCount() ) if( fieldNdx >= component->GetFieldCount() )
{ {
// add as many fields as needed so the m_FieldId's are // The first MANDATOR_FIELDS _must_ be constructed within
// contiguous, no gaps. // the SCH_COMPONENT constructor. This assert is simply here
while( fieldNdx >= component->GetFieldCount() ) // to guard against a change in that constructor.
{ wxASSERT( component->GetFieldCount() >= MANDATORY_FIELDS );
int newNdx = component->GetFieldCount();
SCH_FIELD field( wxPoint( 0, 0 ), newNdx, component, // Ignore the _supplied_ fieldNdx. It is not important anymore
fieldName ); // if within the user defined fields region (i.e. >= MANDATORY_FIELDS).
// We freely renumber the index to fit the next available field slot.
fieldNdx = component->GetFieldCount(); // new has this index after insertion
SCH_FIELD field( wxPoint( 0, 0 ), fieldNdx, component, fieldName );
component->AddField( field ); component->AddField( field );
} }
}
else else
{ {
component->GetField( fieldNdx )->m_Name = fieldName; component->GetField( fieldNdx )->m_Name = fieldName;

4
eeschema/template_fieldnames.h
View File

@ -24,7 +24,9 @@ enum NumFieldType {
FOOTPRINT, ///< Field Name Module PCB, i.e. "16DIP300" FOOTPRINT, ///< Field Name Module PCB, i.e. "16DIP300"
DATASHEET, ///< name of datasheet DATASHEET, ///< name of datasheet
MANDATORY_FIELDS, ///< the first 4 are mandatory or fixed, and instantiated in FIELD constructors /// The first 4 are mandatory, and must be instantiated in SCH_COMPONENT
/// and LIB_COMPONENT constructors
MANDATORY_FIELDS,
FIELD1 = MANDATORY_FIELDS, FIELD1 = MANDATORY_FIELDS,
FIELD2, FIELD2,