Commit a90975d1 authored by Dick Hollenbeck's avatar Dick Hollenbeck
Browse files

FP_LIB_TABLE::ROW::SetType() ensures sensible value of "KiCad" if nothing good comes in.

parent e0a0f596

common/fp_lib_table.cpp

+9 −16
Original line number Diff line number Diff line
@@ -42,28 +42,21 @@ 
using namespace FP_LIB_TABLE_T;





FP_LIB_TABLE::FP_LIB_TABLE( FP_LIB_TABLE* aFallBackTable ) :

    fallBack( aFallBackTable )

void FP_LIB_TABLE::ROW::SetType( const wxString& aType )

{

    // not copying fall back, simply search aFallBackTable separately

    // if "nickName not found".

    type = IO_MGR::EnumFromStr( aType );



    if( IO_MGR::PCB_FILE_T( -1 ) == type )

        type = IO_MGR::KICAD;

}





/*

void FP_LIB_TABLE::Paste( const FP_LIB_TABLE& aOther, int aDestNdx )

{

    if( aDestNdx == -1 )

        aDestNdx = rows.size() - 1;

    else if( unsigned( aDestNdx ) >= rows.size() )

        return;     // bad caller.

    else

FP_LIB_TABLE::FP_LIB_TABLE( FP_LIB_TABLE* aFallBackTable ) :

    fallBack( aFallBackTable )

{



        rows.assign( aOther.rows.begin(), aOther.rows.end() );

    }

    // not copying fall back, simply search aFallBackTable separately

    // if "nickName not found".

}

*/





void FP_LIB_TABLE::Parse( FP_LIB_TABLE_LEXER* in ) throw( IO_ERROR, PARSE_ERROR )

include/fp_lib_table.h

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ public: 
         * Function SetType

         * changes the type represented by this row.

         */

        void SetType( const wxString& aType )       { type = IO_MGR::EnumFromStr( aType ); }

        void SetType( const wxString& aType );



        /**

         * Function GetFullURI