Commit efd99637 authored by Wayne Stambaugh's avatar Wayne Stambaugh
Browse files

Pcbnew: minor Geda and KiCad plugin improvements. 

* Make GPCB_PLUGIN::EnumerateFootprints() read the directory contents
  instead of loading the entire cache.
* Make KICAD_PLUGIN::EnumerateFootprints() read the directory contents
  instead of loading the entire cache.
parents 031ab96f 2d9385b4

pcbnew/gpcb_plugin.cpp

+23 −2
Original line number Original line Diff line number Diff line
@@ -882,19 +882,40 @@ wxArrayString GPCB_PLUGIN::FootprintEnumerate( const wxString& aLibraryPath, 
                                               const PROPERTIES* aProperties )

                                               const PROPERTIES* aProperties )

{

{

    LOCALE_IO     toggle;     // toggles on, then off, the C locale.

    LOCALE_IO     toggle;     // toggles on, then off, the C locale.

    wxArrayString ret;

    wxDir         dir( aLibraryPath );



    if( !dir.IsOpened() )

    {

        THROW_IO_ERROR( wxString::Format( _( "footprint library path '%s' does not exist" ),

                                          GetChars( aLibraryPath ) ) );

    }





    init( aProperties );

    init( aProperties );





#if 1                         // Set to 0 to only read directory contents, not load cache.

    cacheLib( aLibraryPath );

    cacheLib( aLibraryPath );





    const MODULE_MAP& mods = m_cache->GetModules();

    const MODULE_MAP& mods = m_cache->GetModules();





    wxArrayString ret;





    for( MODULE_CITER it = mods.begin();  it != mods.end();  ++it )

    for( MODULE_CITER it = mods.begin();  it != mods.end();  ++it )

    {

    {

        ret.Add( FROM_UTF8( it->first.c_str() ) );

        ret.Add( FROM_UTF8( it->first.c_str() ) );

    }

    }

#else

    wxString fpFileName;

    wxString wildcard = wxT( "*." ) + GedaPcbFootprintLibFileExtension;



    if( dir.GetFirst( &fpFileName, wildcard, wxDIR_FILES ) )

    {

        do

        {

            wxFileName fn( aLibraryPath, fpFileName );

            ret.Add( fn.GetName() );

        } while( dir.GetNext( &fpFileName ) );

    }

#endif





    return ret;

    return ret;

}

}

pcbnew/kicad_plugin.cpp

+25 −3
Original line number Original line Diff line number Diff line
@@ -1688,22 +1688,44 @@ void PCB_IO::cacheLib( const wxString& aLibraryPath, const wxString& aFootprintN 
}

}









wxArrayString PCB_IO::FootprintEnumerate( const wxString& aLibraryPath, const PROPERTIES* aProperties )

wxArrayString PCB_IO::FootprintEnumerate( const wxString&   aLibraryPath,

                                          const PROPERTIES* aProperties )

{

{

    LOCALE_IO     toggle;     // toggles on, then off, the C locale.

    LOCALE_IO     toggle;     // toggles on, then off, the C locale.

    wxArrayString ret;

    wxDir         dir( aLibraryPath );



    if( !dir.IsOpened() )

    {

        THROW_IO_ERROR( wxString::Format( _( "footprint library path '%s' does not exist" ),

                                          GetChars( aLibraryPath ) ) );

    }





    init( aProperties );

    init( aProperties );





#if 1                         // Set to 0 to only read directory contents, not load cache.

    cacheLib( aLibraryPath );

    cacheLib( aLibraryPath );





    const MODULE_MAP& mods = m_cache->GetModules();

    const MODULE_MAP& mods = m_cache->GetModules();





    wxArrayString ret;





    for( MODULE_CITER it = mods.begin();  it != mods.end();  ++it )

    for( MODULE_CITER it = mods.begin();  it != mods.end();  ++it )

    {

    {

        ret.Add( FROM_UTF8( it->first.c_str() ) );

        ret.Add( FROM_UTF8( it->first.c_str() ) );

    }

    }

#else

    wxString fpFileName;

    wxString wildcard = wxT( "*." ) + KiCadFootprintFileExtension;



    if( dir.GetFirst( &fpFileName, wildcard, wxDIR_FILES ) )

    {

        do

        {

            wxFileName fn( aLibraryPath, fpFileName );

            ret.Add( fn.GetName() );

        } while( dir.GetNext( &fpFileName ) );

    }

#endif





    return ret;

    return ret;

}

}