Commit 43d7b723 authored by Dick Hollenbeck's avatar Dick Hollenbeck
Browse files

user defined fields should fill next available component field slot

parent d48f6e00

eeschema/read_from_file_schematic_items_descriptions.cpp

+8 −6
Original line number Original line Diff line number Diff line
@@ -703,16 +703,18 @@ int ReadPartDescr( wxWindow* frame, char* Line, FILE* f, wxString& aMsgDiag, 




            if( fieldNdx >= component->GetFieldCount() )

            if( fieldNdx >= component->GetFieldCount() )

            {

            {

                // The first MANDATOR_FIELDS must be constructed within the SCH_COMPONENT

                // The first MANDATOR_FIELDS _must_ be constructed within

                // constructor.

                // the SCH_COMPONENT constructor.  This assert is simply here

                // to guard against a change in that constructor.

                wxASSERT( component->GetFieldCount() >= MANDATORY_FIELDS );

                wxASSERT( component->GetFieldCount() >= MANDATORY_FIELDS );





                // Ignore the fieldNdx, it is not important anymore if within

                // Ignore the _supplied_ fieldNdx.  It is not important anymore

                // the user defined fields region (i.e. >= MANDATORY_FIELDS).

                // if within the user defined fields region (i.e. >= MANDATORY_FIELDS).

                // We freely renumber the index to fit the next available field slot.





                int       newNdx = component->GetFieldCount();  // has this index after insertion

                fieldNdx = component->GetFieldCount();  // new has this index after insertion





                SCH_FIELD field( wxPoint( 0, 0 ), newNdx, component, fieldName );

                SCH_FIELD field( wxPoint( 0, 0 ), fieldNdx, component, fieldName );

                component->AddField( field );

                component->AddField( field );

            }

            }

            else

            else