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

pcbnew: Correcting commit f84bd0d83 for 5.0/release 

Previous commit only functioned correctly in debug mode.  Also cleanup a
left-over debug printf() and revert a changed translated string.
This commit is contained in:
Seth Hillbrand 2018-08-30 13:25:18 -07:00
parent 34b920a74f
commit 83e6940592
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pcbnew/eagle_plugin.cpp
View File

@ -813,16 +813,12 @@ void EAGLE_PLUGIN::loadLibrary( wxXmlNode* aLib, const wxString* aLibName )
wxString pack_ref = package->GetAttribute( "name" ); wxString pack_ref = package->GetAttribute( "name" );
ReplaceIllegalFileNameChars( pack_ref, '_' ); ReplaceIllegalFileNameChars( pack_ref, '_' );
std::string pack_name = Convert<std::string>( pack_ref );
if(pack_name.length() == 0 ) m_xpath->Value( pack_ref.ToUTF8() );
printf("Empty!\n");
m_xpath->Value( pack_name.c_str() );
wxString key = aLibName ? makeKey( *aLibName, pack_ref ) : pack_ref; wxString key = aLibName ? makeKey( *aLibName, pack_ref ) : pack_ref;
MODULE* m = makeModule( package, pack_name ); MODULE* m = makeModule( package, pack_ref );
// add the templating MODULE to the MODULE template factory "m_templates" // add the templating MODULE to the MODULE template factory "m_templates"
std::pair<MODULE_ITER, bool> r = m_templates.insert( {key, m} ); std::pair<MODULE_ITER, bool> r = m_templates.insert( {key, m} );
@ -831,13 +827,12 @@ void EAGLE_PLUGIN::loadLibrary( wxXmlNode* aLib, const wxString* aLibName )
// && !( m_props && m_props->Value( "ignore_duplicates" ) ) // && !( m_props && m_props->Value( "ignore_duplicates" ) )
) )
{ {
wxString lib = aLibName ? FROM_UTF8( aLibName->c_str() ) : m_lib_path; wxString lib = aLibName ? *aLibName : m_lib_path;
wxString pkg = FROM_UTF8( pack_name.c_str() ); wxString pkg = pack_ref;
wxString emsg = wxString::Format( wxString emsg = wxString::Format(
_( "<package> name: \"%s\" : %s duplicated in eagle <library>: \"%s\"" ), _( "<package> name: \"%s\" duplicated in eagle <library>: \"%s\"" ),
GetChars( pkg ), GetChars( pkg ),
GetChars( key ),
GetChars( lib ) GetChars( lib )
); );
THROW_IO_ERROR( emsg ); THROW_IO_ERROR( emsg );