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

Fix footprint wizard setup of gEDA libraries. 

Fixes: lp:1753164
* https://bugs.launchpad.net/kicad/+bug/1753164
This commit is contained in:
Jeff Young 2018-03-03 20:07:59 +00:00
parent c77d13292b
commit c294a54c57
2 changed files with 4 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pcbnew/dialogs/wizard_add_fplib.cpp
View File

@ -201,33 +201,7 @@ wxString WIZARD_FPLIB_TABLE::LIBRARY::GetPluginName() const
if( !m_plugin )
return _( "UNKNOWN" );
switch( *m_plugin )
{
case IO_MGR::LEGACY:
return wxT( "Legacy" );
case IO_MGR::KICAD_SEXP:
return wxT( "KiCad" );
case IO_MGR::EAGLE:
return wxT( "Eagle" );
case IO_MGR::GEDA_PCB:
return wxT( "Geda-PCB" );
case IO_MGR::GITHUB:
return wxT( "Github" );
default:
return _( "UNKNOWN" );
}
/*PLUGIN* p = IO_MGR::PluginFind( *m_plugin );
if( !p )
return _( "UNKNOWN" );
return p->PluginName();*/
return IO_MGR::ShowType( *m_plugin );
}

12
pcbnew/io_mgr.cpp
View File

@ -76,10 +76,6 @@ void IO_MGR::PluginRelease( PLUGIN* aPlugin )
const wxString IO_MGR::ShowType( PCB_FILE_T aType )
{
// keep this function in sync with EnumFromStr() relative to the
// text spellings. If you change the spellings, you will obsolete
// library tables, so don't do change, only additions are ok.
const auto& plugins = PLUGIN_REGISTRY::Instance()->AllPlugins();
for( const auto& plugin : plugins )
@ -90,16 +86,12 @@ const wxString IO_MGR::ShowType( PCB_FILE_T aType )
}
}
return wxString::Format( _( "Unknown PCB_FILE_T value: %d" ), aType );
return wxString::Format( _( "UNKNOWN (%d)" ), aType );
}
IO_MGR::PCB_FILE_T IO_MGR::EnumFromStr( const wxString& aType )
{
// keep this function in sync with ShowType() relative to the
// text spellings. If you change the spellings, you will obsolete
// library tables, so don't do change, only additions are ok.
const auto& plugins = PLUGIN_REGISTRY::Instance()->AllPlugins();
for( const auto& plugin : plugins )
@ -205,6 +197,8 @@ void IO_MGR::Save( PCB_FILE_T aFileType, const wxString& aFileName, BOARD* aBoar
THROW_IO_ERROR( wxString::Format( FMT_NOTFOUND, ShowType( aFileType ).GetData() ) );
}
// These text strings are "truth" for identifying the plugins. If you change the spellings,
// you will obsolete library tables, so don't do it. Additions are OK.
static IO_MGR::REGISTER_PLUGIN registerEaglePlugin( IO_MGR::EAGLE, wxT("Eagle"), []() -> PLUGIN* { return new EAGLE_PLUGIN; } );
static IO_MGR::REGISTER_PLUGIN registerKicadPlugin( IO_MGR::KICAD_SEXP, wxT("KiCad"), []() -> PLUGIN* { return new PCB_IO; } );
static IO_MGR::REGISTER_PLUGIN registerPcadPlugin( IO_MGR::PCAD, wxT("P-Cad"), []() -> PLUGIN* { return new PCAD_PLUGIN; } );