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

LIB_MANAGER: exception handlers display error messages

This commit is contained in:
Maciej Suminski 2018-02-13 08:50:51 +01:00
parent 6f6a02615c
commit c9d9cec6ad
1 changed files with 48 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
eeschema/lib_manager.cpp
View File

@ -26,6 +26,7 @@
#include <class_libentry.h> #include <class_libentry.h>
#include <class_library.h> #include <class_library.h>
#include <lib_edit_frame.h> #include <lib_edit_frame.h>
#include <confirm.h>
#include <kiway.h> #include <kiway.h>
#include <profile.h> #include <profile.h>
@ -117,13 +118,19 @@ bool LIB_MANAGER::FlushLibrary( const wxString& aLibrary )
LIB_BUFFER& libBuf = it->second; LIB_BUFFER& libBuf = it->second;
wxArrayString aliases; wxArrayString aliases;
try { try
{
symTable()->EnumerateSymbolLib( aLibrary, aliases ); symTable()->EnumerateSymbolLib( aLibrary, aliases );
// TODO probably this could be implemented more efficiently // TODO probably this could be implemented more efficiently
for( const auto& alias : aliases ) for( const auto& alias : aliases )
symTable()->DeleteAlias( aLibrary, alias ); symTable()->DeleteAlias( aLibrary, alias );
} catch( IO_ERROR& e) {} }
catch( const IO_ERROR& e )
{
DisplayErrorMessage( &m_frame, wxString::Format( _( "Cannot flush "
"library changes ('%s')" ), aLibrary ), e.What() );
}
// Assume all libraries are successfully saved // Assume all libraries are successfully saved
bool res = true; bool res = true;
@ -273,9 +280,15 @@ wxArrayString LIB_MANAGER::GetAliasNames( const wxString& aLibrary ) const
if( it == m_libs.end() ) if( it == m_libs.end() )
{ {
try { try
{
symTable()->EnumerateSymbolLib( aLibrary, names ); symTable()->EnumerateSymbolLib( aLibrary, names );
} catch( IO_ERROR& e ) {} }
catch( const IO_ERROR& e )
{
DisplayErrorMessage( &m_frame, wxString::Format( _( "Cannot enumerate "
"library '%s'" ), aLibrary ), e.What() );
}
} }
else else
{ {
@ -309,7 +322,11 @@ std::list<LIB_ALIAS*> LIB_MANAGER::GetAliases( const wxString& aLibrary ) const
{ {
symTable()->LoadSymbolLib( aliases, aLibrary ); symTable()->LoadSymbolLib( aliases, aLibrary );
} }
catch( IO_ERROR& ) {} catch( const IO_ERROR& e )
{
DisplayErrorMessage( &m_frame, wxString::Format( _( "Cannot load "
"aliases from library '%s'" ), aLibrary ), e.What() );
}
std::copy( aliases.begin(), aliases.end(), std::back_inserter( ret ) ); std::copy( aliases.begin(), aliases.end(), std::back_inserter( ret ) );
} }
@ -329,14 +346,17 @@ LIB_PART* LIB_MANAGER::GetBufferedPart( const wxString& aAlias, const wxString&
if( !bufferedPart ) // no buffer part found if( !bufferedPart ) // no buffer part found
{ {
// create a copy of the part // create a copy of the part
try { try
{
LIB_ALIAS* alias = symTable()->LoadSymbol( aLibrary, aAlias ); LIB_ALIAS* alias = symTable()->LoadSymbol( aLibrary, aAlias );
wxCHECK( alias, nullptr ); wxCHECK( alias, nullptr );
bufferedPart = new LIB_PART( *alias->GetPart(), nullptr ); bufferedPart = new LIB_PART( *alias->GetPart(), nullptr );
libBuf.CreateBuffer( bufferedPart, new SCH_SCREEN( &m_frame.Kiway() ) ); libBuf.CreateBuffer( bufferedPart, new SCH_SCREEN( &m_frame.Kiway() ) );
} }
catch( IO_ERROR& e ) catch( const IO_ERROR& e )
{ {
DisplayErrorMessage( &m_frame, wxString::Format( _( "Cannot load "
"symbol '%s' from library '%s'" ), aAlias, aLibrary ), e.What() );
bufferedPart = nullptr; bufferedPart = nullptr;
} }
} }
@ -494,9 +514,15 @@ LIB_ALIAS* LIB_MANAGER::GetAlias( const wxString& aAlias, const wxString& aLibra
// Get the original part // Get the original part
LIB_ALIAS* alias = nullptr; LIB_ALIAS* alias = nullptr;
try { try
{
alias = symTable()->LoadSymbol( aLibrary, aAlias ); alias = symTable()->LoadSymbol( aLibrary, aAlias );
} catch( IO_ERROR& e ) {} }
catch( const IO_ERROR& e )
{
DisplayErrorMessage( &m_frame, wxString::Format( _( "Cannot load "
"symbol '%s' from library '%s'" ), aAlias, aLibrary ), e.What() );
}
return alias; return alias;
} }
@ -510,9 +536,13 @@ bool LIB_MANAGER::PartExists( const wxString& aAlias, const wxString& aLibrary )
if( libBufIt != m_libs.end() ) if( libBufIt != m_libs.end() )
return !!libBufIt->second.GetBuffer( aAlias ); return !!libBufIt->second.GetBuffer( aAlias );
try { try
{
alias = symTable()->LoadSymbol( aLibrary, aAlias ); alias = symTable()->LoadSymbol( aLibrary, aAlias );
} catch( IO_ERROR& e ) {} } catch( IO_ERROR& )
{
// checking if certain symbol exists, so its absence is perfectly fine
}
return alias != nullptr; return alias != nullptr;
} }
@ -624,7 +654,8 @@ std::set<LIB_PART*> LIB_MANAGER::getOriginalParts( const wxString& aLibrary )
std::set<LIB_PART*> parts; std::set<LIB_PART*> parts;
wxCHECK( LibraryExists( aLibrary ), parts ); wxCHECK( LibraryExists( aLibrary ), parts );
try { try
{
wxArrayString aliases; wxArrayString aliases;
symTable()->EnumerateSymbolLib( aLibrary, aliases ); symTable()->EnumerateSymbolLib( aLibrary, aliases );
@ -633,7 +664,11 @@ std::set<LIB_PART*> LIB_MANAGER::getOriginalParts( const wxString& aLibrary )
LIB_ALIAS* alias = symTable()->LoadSymbol( aLibrary, aliasName ); LIB_ALIAS* alias = symTable()->LoadSymbol( aLibrary, aliasName );
parts.insert( alias->GetPart() ); parts.insert( alias->GetPart() );
} }
} catch( IO_ERROR& e ) {} } catch( const IO_ERROR& e )
{
DisplayErrorMessage( &m_frame, wxString::Format( _( "Cannot enumerate "
"library '%s'" ), aLibrary ), e.What() );
}
return parts; return parts;
} }