Commit 7cf34678 authored by Dick Hollenbeck's avatar Dick Hollenbeck
Browse files

Show the "Description" field from fp-lib-table in pcbnew's module editor 'set... 

Show the "Description" field from fp-lib-table in pcbnew's module editor 'set current library' dialog.
parent 25bfd822

CMakeLists.txt

+0 −2
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ cmake_minimum_required( VERSION 2.8.4 FATAL_ERROR ) 
# Path to local CMake modules.

set( CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules )



message( STATUS "CMAKE_CXX_FLAGS_DEBUG:${CMAKE_CXX_FLAGS_DEBUG}" )



#

# KiCad build options should be added below.

#

common/displlst.cpp

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ EDA_LIST_DIALOG::EDA_LIST_DIALOG( EDA_DRAW_FRAME* aParent, const wxString& aTitl 


    m_filterBox->SetFocus();



    Layout();

    Fit();

}

common/fp_lib_table.cpp

+11 −0
Original line number Diff line number Diff line
@@ -139,6 +139,17 @@ bool FP_LIB_TABLE::IsFootprintLibWritable( const wxString& aNickname ) 
}





const wxString& FP_LIB_TABLE::GetDescription( const wxString& aNickname )

{

    // use no exception form of find row:

    const ROW* row = findRow( aNickname );

    if( row )

        return row->description;

    else

        return wxEmptyString;

}





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

{

    /*

include/fp_lib_table.h

+8 −2
Original line number Diff line number Diff line
@@ -462,6 +462,12 @@ public: 


    //-----</PLUGIN API SUBSET, REBASED ON aNickname>---------------------------



    /**

     * Function GetDescription

     * returns the library desicription from @a aNickname, or an empty string

     * if aNickname does not exist.

     */

    const wxString& GetDescription( const wxString& aNickname );



    /**

     * Function InsertRow
@@ -604,10 +610,10 @@ protected: 


    /**

     * Function findRow

     * returns a ROW if aNickName is found in this table or in any chained

     * returns a ROW if aNickname is found in this table or in any chained

     * fallBack table fragment, else NULL.

     */

    ROW* findRow( const wxString& aNickName ) const;

    ROW* findRow( const wxString& aNickname ) const;



    void reindex()

    {

pcbnew/librairi.cpp

+10 −8
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ 
#define FMT_LIBRARY         _( "Library" )                                      // window title

#define FMT_MOD_EXISTS      _( "Module %s already exists in library <%s>" )

#define FMT_NO_REF_ABORTED  _( "No reference, aborted" )

#define FMT_SELECT_LIB      _( "Select Active Library:" )

#define FMT_SELECT_LIB      _( "Select Active Library" )





static const wxString ModExportFileWildcard( _( "KiCad foot print export files (*.emp)|*.emp" ) );
@@ -800,19 +800,21 @@ void FOOTPRINT_EDIT_FRAME::Select_Active_Library() 


void FOOTPRINT_EDIT_FRAME::Select_Active_Library()

{

    if( m_footprintLibTable->IsEmpty() )

        return;



    wxArrayString headers;

    headers.Add( _( "Library" ) );



    headers.Add( _( "Nickname" ) );

    headers.Add( _( "Description" ) );



    std::vector< wxArrayString > itemsToDisplay;

    std::vector< wxString >      libNames = m_footprintLibTable->GetLogicalLibs();

    std::vector< wxString >      nicknames = m_footprintLibTable->GetLogicalLibs();



    for( unsigned i = 0; i < libNames.size(); i++ )

    for( unsigned i = 0; i < nicknames.size(); i++ )

    {

        wxArrayString item;

        item.Add( libNames[i] );



        item.Add( nicknames[i] );

        item.Add( m_footprintLibTable->GetDescription( nicknames[i] ) );



        itemsToDisplay.push_back( item );

    }