electron-rare/kicad-source-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Shorten class name for legibility

Browse Source
This commit is contained in:
Jon Evans
2025-07-15 22:14:52 -04:00
parent 90397a3310
commit e1ea6a1302
42 changed files with 170 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
eeschema/CMakeLists.txt
+1 -1
View File
@@ -433,7 +433,7 @@ set( EESCHEMA_SRCS
api/api_sch_utils.cpp
libraries/legacy_symbol_library.cpp
libraries/symbol_library_manager_adapter.cpp
libraries/symbol_library_adapter.cpp
netlist_exporters/netlist_exporter_allegro.cpp
netlist_exporters/netlist_exporter_base.cpp
eeschema/cross-probing.cpp
+2 -2
View File
@@ -43,7 +43,7 @@
#include <advanced_config.h>
#include <pgm_base.h>
#include <libraries/symbol_library_manager_adapter.h>
#include <libraries/symbol_library_adapter.h>
#include <widgets/sch_design_block_pane.h>
#include <wx/log.h>
#include <trace_helpers.h>
@@ -886,7 +886,7 @@ void SCH_EDIT_FRAME::KiwayMailIn( KIWAY_EXPRESS& mail )
aError.message );
} );
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &Prj() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &Prj() );
adapter->LoadOne( fn.GetName() );
}
}
eeschema/dialogs/dialog_edit_symbols_libid.cpp
+4 -4
View File
@@ -34,7 +34,7 @@
#include <sch_symbol.h>
#include <sch_reference_list.h>
#include <schematic.h>
#include <libraries/symbol_library_manager_adapter.h>
#include <libraries/symbol_library_adapter.h>
#include <trace_helpers.h>
#include <widgets/wx_grid.h>
@@ -577,7 +577,7 @@ void DIALOG_EDIT_SYMBOLS_LIBID::onCellBrowseLib( wxGridEvent& event )
void DIALOG_EDIT_SYMBOLS_LIBID::onClickOrphansButton( wxCommandEvent& event )
{
std::vector<wxString> libs = PROJECT_SCH::SymbolLibManager( &Prj() )->GetLibraryNames();
std::vector<wxString> libs = PROJECT_SCH::SymbolLibAdapter( &Prj() )->GetLibraryNames();
std::vector<wxString> aliasNames;
wxArrayString candidateSymbNames;
@@ -606,7 +606,7 @@ void DIALOG_EDIT_SYMBOLS_LIBID::onClickOrphansButton( wxCommandEvent& event )
try
{
aliasNames = PROJECT_SCH::SymbolLibManager( &Prj() )->GetSymbolNames( lib );
aliasNames = PROJECT_SCH::SymbolLibAdapter( &Prj() )->GetSymbolNames( lib );
}
catch( const IO_ERROR& ) {} // ignore, it is handled below
@@ -737,7 +737,7 @@ bool DIALOG_EDIT_SYMBOLS_LIBID::TransferDataFromWindow()
try
{
symbol = PROJECT_SCH::SymbolLibManager( &Prj() )->LoadSymbol( id );
symbol = PROJECT_SCH::SymbolLibAdapter( &Prj() )->LoadSymbol( id );
}
catch( const IO_ERROR& ioe )
{
eeschema/dialogs/dialog_symbol_remap.cpp
+2 -2
View File
@@ -33,7 +33,7 @@
#include "widgets/wx_html_report_panel.h"
#include <libraries/legacy_symbol_library.h>
#include <libraries/symbol_library_manager_adapter.h>
#include <libraries/symbol_library_adapter.h>
#include <core/kicad_algo.h>
#include <symbol_viewer_frame.h>
#include <project_rescue.h>
@@ -316,7 +316,7 @@ bool DIALOG_SYMBOL_REMAP::remapSymbolToLibTable( SCH_SYMBOL* aSymbol )
wxString libFileName = lib.GetFullFileName();
if( std::optional<wxString> nickname =
PROJECT_SCH::SymbolLibManager( &Prj() )->FindLibraryByURI( libFileName ) )
PROJECT_SCH::SymbolLibAdapter( &Prj() )->FindLibraryByURI( libFileName ) )
{
LIB_ID id = aSymbol->GetLibId();
eeschema/dialogs/panel_sym_lib_table.cpp
+3 -3
View File
@@ -56,7 +56,7 @@
#include <wx/filedlg.h>
#include <wx/msgdlg.h>
#include <project_sch.h>
#include <libraries/symbol_library_manager_adapter.h>
#include <libraries/symbol_library_adapter.h>
#include <widgets/grid_button.h>
@@ -161,7 +161,7 @@ protected:
// Errored rows should have the warning button, so we show their error
// Configurable libraries will have the options button, so we launch the config
// Chained tables will have the open button, so we request the table be opened
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &m_project );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &m_project );
auto libTable = static_cast<SYMBOL_LIB_TABLE_GRID*>( m_grid->GetTable() );
const LIBRARY_TABLE_ROW& row = libTable->at( aEvent.GetRow() );
@@ -290,7 +290,7 @@ void PANEL_SYM_LIB_TABLE::setupGrid( WX_GRID* aGrid )
aCurrGrid->SetColSize( aCol, std::max( prevWidth, aCurrGrid->GetColSize( aCol ) ) );
};
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( m_project );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( m_project );
for( int ii = 0; ii < aGrid->GetNumberRows(); ++ii )
{
eeschema/eeschema.cpp
+2 -2
View File
@@ -35,7 +35,7 @@
#include <eeschema_settings.h>
#include <sch_edit_frame.h>
#include <design_block_lib_table.h>
#include <libraries/symbol_library_manager_adapter.h>
#include <libraries/symbol_library_adapter.h>
#include <symbol_edit_frame.h>
#include <symbol_viewer_frame.h>
#include <symbol_chooser_frame.h>
@@ -496,7 +496,7 @@ void IFACE::PreloadLibraries( PROJECT* aProject )
std::shared_ptr<BACKGROUND_JOB_REPORTER> reporter =
m_libraryPreloadBackgroundJob->m_reporter;
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( aProject );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( aProject );
int elapsed = 0;
eeschema/erc/erc.cpp
+2 -2
View File
@@ -58,7 +58,7 @@
#include <progress_reporter.h>
#include <kiway.h>
#include <pgm_base.h>
#include <libraries/symbol_library_manager_adapter.h>
#include <libraries/symbol_library_adapter.h>
/* ERC tests :
@@ -1450,7 +1450,7 @@ int ERC_TESTER::TestLibSymbolIssues()
wxCHECK( m_schematic, 0 );
LIBRARY_MANAGER& manager = Pgm().GetLibraryManager();
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &m_schematic->Project() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &m_schematic->Project() );
wxString msg;
int err_count = 0;
eeschema/generate_alias_info.cpp
+4 -4
View File
@@ -23,7 +23,7 @@
#include <string_utils.h>
#include <template_fieldnames.h>
#include <lib_symbol.h>
#include <libraries/symbol_library_manager_adapter.h>
#include <libraries/symbol_library_adapter.h>
#include <wx/log.h>
static const wxString DescriptionFormat = wxS(
@@ -50,7 +50,7 @@ static const wxString LinkFormat = wxS( "<a href=\"__HREF__\">__TEXT__</a>" );
class FOOTPRINT_INFO_GENERATOR
{
public:
FOOTPRINT_INFO_GENERATOR( SYMBOL_LIBRARY_MANAGER_ADAPTER* aLibs, LIB_ID const& aLibId, int aUnit ) :
FOOTPRINT_INFO_GENERATOR( SYMBOL_LIBRARY_ADAPTER* aLibs, LIB_ID const& aLibId, int aUnit ) :
m_html( DescriptionFormat ),
m_libs( aLibs ),
m_lib_id( aLibId ),
@@ -255,14 +255,14 @@ protected:
private:
wxString m_html;
SYMBOL_LIBRARY_MANAGER_ADAPTER* m_libs;
SYMBOL_LIBRARY_ADAPTER* m_libs;
LIB_ID const m_lib_id;
LIB_SYMBOL* m_symbol;
int m_unit;
};
wxString GenerateAliasInfo( SYMBOL_LIBRARY_MANAGER_ADAPTER* aLibs, LIB_ID const& aLibId, int aUnit )
wxString GenerateAliasInfo( SYMBOL_LIBRARY_ADAPTER* aLibs, LIB_ID const& aLibId, int aUnit )
{
FOOTPRINT_INFO_GENERATOR gen( aLibs, aLibId, aUnit );
gen.GenerateHtml();
eeschema/generate_alias_info.h
+2 -2
View File
@@ -24,12 +24,12 @@
#include <wx/string.h>
class LIB_ID;
class SYMBOL_LIBRARY_MANAGER_ADAPTER;
class SYMBOL_LIBRARY_ADAPTER;
/**
* Return an HTML page describing a #LIB_ID in a #SYMBOL_LIB_TABLE. This is suitable for inclusion
* in a HTML_WINDOW (wxHtmlWindow).
*/
wxString GenerateAliasInfo( SYMBOL_LIBRARY_MANAGER_ADAPTER* aLibs, LIB_ID const& aLibId, int aUnit );
wxString GenerateAliasInfo( SYMBOL_LIBRARY_ADAPTER* aLibs, LIB_ID const& aLibId, int aUnit );
#endif // GENERATE_ALIAS_INFO_H
eeschema/libraries/symbol_library_manager_adapter.cpp → eeschema/libraries/symbol_library_adapter.cpp
+40 -40
View File
@@ -27,7 +27,7 @@
#include <lib_symbol.h>
#include <locale_io.h>
#include <libraries/symbol_library_manager_adapter.h>
#include <libraries/symbol_library_adapter.h>
#include <pgm_base.h>
#include <project.h>
#include <thread_pool.h>
@@ -35,22 +35,22 @@
#include <settings/settings_manager.h>
std::map<wxString, LIB_DATA> SYMBOL_LIBRARY_MANAGER_ADAPTER::GlobalLibraries;
std::map<wxString, LIB_DATA> SYMBOL_LIBRARY_ADAPTER::GlobalLibraries;
std::mutex SYMBOL_LIBRARY_MANAGER_ADAPTER::GlobalLibraryMutex;
std::mutex SYMBOL_LIBRARY_ADAPTER::GlobalLibraryMutex;
const char* SYMBOL_LIBRARY_MANAGER_ADAPTER::PropPowerSymsOnly = "pwr_sym_only";
const char* SYMBOL_LIBRARY_MANAGER_ADAPTER::PropNonPowerSymsOnly = "non_pwr_sym_only";
const char* SYMBOL_LIBRARY_ADAPTER::PropPowerSymsOnly = "pwr_sym_only";
const char* SYMBOL_LIBRARY_ADAPTER::PropNonPowerSymsOnly = "non_pwr_sym_only";
SYMBOL_LIBRARY_MANAGER_ADAPTER::SYMBOL_LIBRARY_MANAGER_ADAPTER( LIBRARY_MANAGER& aManager ) :
SYMBOL_LIBRARY_ADAPTER::SYMBOL_LIBRARY_ADAPTER( LIBRARY_MANAGER& aManager ) :
LIBRARY_MANAGER_ADAPTER( aManager ),
m_loadTotal( 0 )
{
}
void SYMBOL_LIBRARY_MANAGER_ADAPTER::ProjectChanged()
void SYMBOL_LIBRARY_ADAPTER::ProjectChanged()
{
abortLoad();
@@ -61,7 +61,7 @@ void SYMBOL_LIBRARY_MANAGER_ADAPTER::ProjectChanged()
}
std::optional<LIB_STATUS> SYMBOL_LIBRARY_MANAGER_ADAPTER::LoadOne( const wxString& aNickname )
std::optional<LIB_STATUS> SYMBOL_LIBRARY_ADAPTER::LoadOne( const wxString& aNickname )
{
LOCALE_IO toggle;
@@ -94,7 +94,7 @@ std::optional<LIB_STATUS> SYMBOL_LIBRARY_MANAGER_ADAPTER::LoadOne( const wxStrin
}
LIBRARY_RESULT<LIB_DATA*> SYMBOL_LIBRARY_MANAGER_ADAPTER::loadIfNeeded( const wxString& aNickname )
LIBRARY_RESULT<LIB_DATA*> SYMBOL_LIBRARY_ADAPTER::loadIfNeeded( const wxString& aNickname )
{
auto tryLoadFromScope =
[&]( LIBRARY_TABLE_SCOPE aScope, std::map<wxString, LIB_DATA>& aTarget,
@@ -165,7 +165,7 @@ LIBRARY_RESULT<LIB_DATA*> SYMBOL_LIBRARY_MANAGER_ADAPTER::loadIfNeeded( const wx
}
std::optional<const LIB_DATA*> SYMBOL_LIBRARY_MANAGER_ADAPTER::fetchIfLoaded(
std::optional<const LIB_DATA*> SYMBOL_LIBRARY_ADAPTER::fetchIfLoaded(
const wxString& aNickname ) const
{
if( m_libraries.contains( aNickname )
@@ -184,7 +184,7 @@ std::optional<const LIB_DATA*> SYMBOL_LIBRARY_MANAGER_ADAPTER::fetchIfLoaded(
}
std::optional<LIB_DATA*> SYMBOL_LIBRARY_MANAGER_ADAPTER::fetchIfLoaded(
std::optional<LIB_DATA*> SYMBOL_LIBRARY_ADAPTER::fetchIfLoaded(
const wxString& aNickname )
{
if( m_libraries.contains( aNickname ) && m_libraries.at( aNickname ).status.load_status == LOAD_STATUS::LOADED )
@@ -200,13 +200,13 @@ std::optional<LIB_DATA*> SYMBOL_LIBRARY_MANAGER_ADAPTER::fetchIfLoaded(
}
wxString SYMBOL_LIBRARY_MANAGER_ADAPTER::getUri( const LIBRARY_TABLE_ROW* aRow )
wxString SYMBOL_LIBRARY_ADAPTER::getUri( const LIBRARY_TABLE_ROW* aRow )
{
return LIBRARY_MANAGER::ExpandURI( aRow->URI(), Pgm().GetSettingsManager().Prj() );
}
std::vector<LIB_SYMBOL*> SYMBOL_LIBRARY_MANAGER_ADAPTER::GetSymbols( const wxString& aNickname,
std::vector<LIB_SYMBOL*> SYMBOL_LIBRARY_ADAPTER::GetSymbols( const wxString& aNickname,
SYMBOL_TYPE aType )
{
std::vector<LIB_SYMBOL*> symbols;
@@ -243,7 +243,7 @@ std::vector<LIB_SYMBOL*> SYMBOL_LIBRARY_MANAGER_ADAPTER::GetSymbols( const wxStr
}
std::vector<wxString> SYMBOL_LIBRARY_MANAGER_ADAPTER::GetSymbolNames( const wxString& aNickname,
std::vector<wxString> SYMBOL_LIBRARY_ADAPTER::GetSymbolNames( const wxString& aNickname,
SYMBOL_TYPE aType )
{
// TODO(JE) can we kill wxArrayString in internal API?
@@ -268,7 +268,7 @@ std::vector<wxString> SYMBOL_LIBRARY_MANAGER_ADAPTER::GetSymbolNames( const wxSt
}
LIB_SYMBOL* SYMBOL_LIBRARY_MANAGER_ADAPTER::LoadSymbol( const wxString& aNickname,
LIB_SYMBOL* SYMBOL_LIBRARY_ADAPTER::LoadSymbol( const wxString& aNickname,
const wxString& aName )
{
if( std::optional<const LIB_DATA*> lib = fetchIfLoaded( aNickname ) )
@@ -290,21 +290,21 @@ LIB_SYMBOL* SYMBOL_LIBRARY_MANAGER_ADAPTER::LoadSymbol( const wxString& aNicknam
}
SYMBOL_LIBRARY_MANAGER_ADAPTER::SAVE_T SYMBOL_LIBRARY_MANAGER_ADAPTER::SaveSymbol(
SYMBOL_LIBRARY_ADAPTER::SAVE_T SYMBOL_LIBRARY_ADAPTER::SaveSymbol(
const wxString& aNickname, const LIB_SYMBOL* aSymbol, bool aOverwrite )
{
wxCHECK_MSG( false, SAVE_SKIPPED, "Unimplemented!" );
}
void SYMBOL_LIBRARY_MANAGER_ADAPTER::DeleteSymbol( const wxString& aNickname,
void SYMBOL_LIBRARY_ADAPTER::DeleteSymbol( const wxString& aNickname,
const wxString& aSymbolName )
{
wxCHECK_MSG( false, /* void */, "Unimplemented!" );
}
bool SYMBOL_LIBRARY_MANAGER_ADAPTER::IsSymbolLibWritable( const wxString& aLib )
bool SYMBOL_LIBRARY_ADAPTER::IsSymbolLibWritable( const wxString& aLib )
{
if( m_libraries.contains( aLib ) )
return m_libraries[aLib].plugin->IsLibraryWritable( getUri( m_libraries[aLib].row ) );
@@ -316,7 +316,7 @@ bool SYMBOL_LIBRARY_MANAGER_ADAPTER::IsSymbolLibWritable( const wxString& aLib )
}
bool SYMBOL_LIBRARY_MANAGER_ADAPTER::IsLibraryLoaded( const wxString& aNickname )
bool SYMBOL_LIBRARY_ADAPTER::IsLibraryLoaded( const wxString& aNickname )
{
// TODO: row->IsOK() doesn't actually tell you if a library is loaded
// Once we are preloading libraries we can cache the status of plugin load instead
@@ -331,7 +331,7 @@ bool SYMBOL_LIBRARY_MANAGER_ADAPTER::IsLibraryLoaded( const wxString& aNickname
}
void SYMBOL_LIBRARY_MANAGER_ADAPTER::AsyncLoad()
void SYMBOL_LIBRARY_ADAPTER::AsyncLoad()
{
// TODO(JE) any reason to clean these up earlier?
std::erase_if( m_futures,
@@ -459,7 +459,7 @@ void SYMBOL_LIBRARY_MANAGER_ADAPTER::AsyncLoad()
}
void SYMBOL_LIBRARY_MANAGER_ADAPTER::abortLoad()
void SYMBOL_LIBRARY_ADAPTER::abortLoad()
{
if( m_futures.empty() )
return;
@@ -476,7 +476,7 @@ void SYMBOL_LIBRARY_MANAGER_ADAPTER::abortLoad()
}
std::optional<float> SYMBOL_LIBRARY_MANAGER_ADAPTER::AsyncLoadProgress() const
std::optional<float> SYMBOL_LIBRARY_ADAPTER::AsyncLoadProgress() const
{
if( m_loadTotal == 0 )
return std::nullopt;
@@ -486,14 +486,14 @@ std::optional<float> SYMBOL_LIBRARY_MANAGER_ADAPTER::AsyncLoadProgress() const
}
void SYMBOL_LIBRARY_MANAGER_ADAPTER::BlockUntilLoaded()
void SYMBOL_LIBRARY_ADAPTER::BlockUntilLoaded()
{
for( const std::future<void>& future : m_futures )
future.wait();
}
std::optional<LIBRARY_ERROR> SYMBOL_LIBRARY_MANAGER_ADAPTER::LibraryError(
std::optional<LIBRARY_ERROR> SYMBOL_LIBRARY_ADAPTER::LibraryError(
const wxString& aNickname ) const
{
if( m_libraries.contains( aNickname ) )
@@ -510,7 +510,7 @@ std::optional<LIBRARY_ERROR> SYMBOL_LIBRARY_MANAGER_ADAPTER::LibraryError(
}
std::optional<wxString> SYMBOL_LIBRARY_MANAGER_ADAPTER::FindLibraryByURI( const wxString& aURI ) const
std::optional<wxString> SYMBOL_LIBRARY_ADAPTER::FindLibraryByURI( const wxString& aURI ) const
{
for( const LIBRARY_TABLE_ROW* row : m_manager.Rows( LIBRARY_TABLE_TYPE::SYMBOL ) )
{
@@ -522,7 +522,7 @@ std::optional<wxString> SYMBOL_LIBRARY_MANAGER_ADAPTER::FindLibraryByURI( const
}
std::vector<wxString> SYMBOL_LIBRARY_MANAGER_ADAPTER::GetLibraryNames() const
std::vector<wxString> SYMBOL_LIBRARY_ADAPTER::GetLibraryNames() const
{
std::vector<wxString> ret;
@@ -536,7 +536,7 @@ std::vector<wxString> SYMBOL_LIBRARY_MANAGER_ADAPTER::GetLibraryNames() const
}
std::optional<wxString> SYMBOL_LIBRARY_MANAGER_ADAPTER::GetLibraryDescription( const wxString& aNickname ) const
std::optional<wxString> SYMBOL_LIBRARY_ADAPTER::GetLibraryDescription( const wxString& aNickname ) const
{
if( std::optional<const LIB_DATA*> optRow = fetchIfLoaded( aNickname ); optRow )
return ( *optRow )->row->Description();
@@ -545,8 +545,8 @@ std::optional<wxString> SYMBOL_LIBRARY_MANAGER_ADAPTER::GetLibraryDescription( c
}
bool SYMBOL_LIBRARY_MANAGER_ADAPTER::HasLibrary( const wxString& aNickname,
bool aCheckEnabled ) const
bool SYMBOL_LIBRARY_ADAPTER::HasLibrary( const wxString& aNickname,
bool aCheckEnabled ) const
{
if( std::optional<const LIB_DATA*> r = fetchIfLoaded( aNickname ); r.has_value() )
return !aCheckEnabled || !( *r )->row->Disabled();
@@ -555,7 +555,7 @@ bool SYMBOL_LIBRARY_MANAGER_ADAPTER::HasLibrary( const wxString& aNickname,
}
bool SYMBOL_LIBRARY_MANAGER_ADAPTER::DeleteLibrary( const wxString& aNickname )
bool SYMBOL_LIBRARY_ADAPTER::DeleteLibrary( const wxString& aNickname )
{
if( LIBRARY_RESULT<LIB_DATA*> result = loadIfNeeded( aNickname ); result.has_value() )
{
@@ -576,7 +576,7 @@ bool SYMBOL_LIBRARY_MANAGER_ADAPTER::DeleteLibrary( const wxString& aNickname )
}
bool SYMBOL_LIBRARY_MANAGER_ADAPTER::CreateLibrary( const wxString& aNickname )
bool SYMBOL_LIBRARY_ADAPTER::CreateLibrary( const wxString& aNickname )
{
LOCALE_IO toggle;
@@ -600,7 +600,7 @@ bool SYMBOL_LIBRARY_MANAGER_ADAPTER::CreateLibrary( const wxString& aNickname )
}
std::optional<LIB_STATUS> SYMBOL_LIBRARY_MANAGER_ADAPTER::GetLibraryStatus( const wxString& aNickname ) const
std::optional<LIB_STATUS> SYMBOL_LIBRARY_ADAPTER::GetLibraryStatus( const wxString& aNickname ) const
{
if( m_libraries.contains( aNickname ) )
return m_libraries.at( aNickname ).status;
@@ -612,7 +612,7 @@ std::optional<LIB_STATUS> SYMBOL_LIBRARY_MANAGER_ADAPTER::GetLibraryStatus( cons
}
std::vector<std::pair<wxString, LIB_STATUS>> SYMBOL_LIBRARY_MANAGER_ADAPTER::GetLibraryStatuses() const
std::vector<std::pair<wxString, LIB_STATUS>> SYMBOL_LIBRARY_ADAPTER::GetLibraryStatuses() const
{
std::vector<std::pair<wxString, LIB_STATUS>> ret;
@@ -636,7 +636,7 @@ std::vector<std::pair<wxString, LIB_STATUS>> SYMBOL_LIBRARY_MANAGER_ADAPTER::Get
}
std::vector<wxString> SYMBOL_LIBRARY_MANAGER_ADAPTER::GetAvailableExtraFields(
std::vector<wxString> SYMBOL_LIBRARY_ADAPTER::GetAvailableExtraFields(
const wxString& aNickname )
{
std::vector<wxString> fields;
@@ -659,7 +659,7 @@ std::vector<wxString> SYMBOL_LIBRARY_MANAGER_ADAPTER::GetAvailableExtraFields(
}
bool SYMBOL_LIBRARY_MANAGER_ADAPTER::SupportsSubLibraries( const wxString& aNickname ) const
bool SYMBOL_LIBRARY_ADAPTER::SupportsSubLibraries( const wxString& aNickname ) const
{
if( std::optional<const LIB_DATA*> result = fetchIfLoaded( aNickname ) )
{
@@ -671,7 +671,7 @@ bool SYMBOL_LIBRARY_MANAGER_ADAPTER::SupportsSubLibraries( const wxString& aNick
}
std::vector<SUB_LIBRARY> SYMBOL_LIBRARY_MANAGER_ADAPTER::GetSubLibraries(
std::vector<SUB_LIBRARY> SYMBOL_LIBRARY_ADAPTER::GetSubLibraries(
const wxString& aNickname ) const
{
std::vector<SUB_LIBRARY> ret;
@@ -695,7 +695,7 @@ std::vector<SUB_LIBRARY> SYMBOL_LIBRARY_MANAGER_ADAPTER::GetSubLibraries(
}
bool SYMBOL_LIBRARY_MANAGER_ADAPTER::SupportsConfigurationDialog( const wxString& aNickname ) const
bool SYMBOL_LIBRARY_ADAPTER::SupportsConfigurationDialog( const wxString& aNickname ) const
{
if( std::optional<const LIB_DATA*> result = fetchIfLoaded( aNickname ) )
return ( *result )->plugin->SupportsConfigurationDialog();
@@ -704,7 +704,7 @@ bool SYMBOL_LIBRARY_MANAGER_ADAPTER::SupportsConfigurationDialog( const wxString
}
void SYMBOL_LIBRARY_MANAGER_ADAPTER::ShowConfigurationDialog( const wxString& aNickname,
void SYMBOL_LIBRARY_ADAPTER::ShowConfigurationDialog( const wxString& aNickname,
wxWindow* aParent ) const
{
std::optional<const LIB_DATA*> optRow = fetchIfLoaded( aNickname );
@@ -717,7 +717,7 @@ void SYMBOL_LIBRARY_MANAGER_ADAPTER::ShowConfigurationDialog( const wxString& aN
}
int SYMBOL_LIBRARY_MANAGER_ADAPTER::GetModifyHash() const
int SYMBOL_LIBRARY_ADAPTER::GetModifyHash() const
{
int hash = 0;
@@ -735,7 +735,7 @@ int SYMBOL_LIBRARY_MANAGER_ADAPTER::GetModifyHash() const
}
bool SYMBOL_LIBRARY_MANAGER_ADAPTER::IsWritable( const wxString& aNickname ) const
bool SYMBOL_LIBRARY_ADAPTER::IsWritable( const wxString& aNickname ) const
{
if( std::optional<const LIB_DATA*> result = fetchIfLoaded( aNickname ) )
{
eeschema/libraries/symbol_library_manager_adapter.h → eeschema/libraries/symbol_library_adapter.h
+2 -2
View File
@@ -75,14 +75,14 @@ struct SUB_LIBRARY
* and linked to one project in particular. This is what can return actual concrete
* schematic library content (symbols).
*/
class SYMBOL_LIBRARY_MANAGER_ADAPTER : public LIBRARY_MANAGER_ADAPTER
class SYMBOL_LIBRARY_ADAPTER : public LIBRARY_MANAGER_ADAPTER
{
public:
static const char* PropPowerSymsOnly;
static const char* PropNonPowerSymsOnly;
public:
SYMBOL_LIBRARY_MANAGER_ADAPTER( LIBRARY_MANAGER& aManager );
SYMBOL_LIBRARY_ADAPTER( LIBRARY_MANAGER& aManager );
LIBRARY_TABLE_TYPE Type() const override { return LIBRARY_TABLE_TYPE::SYMBOL; }
eeschema/netlist_exporters/netlist_exporter_xml.cpp
+1 -1
View File
@@ -42,7 +42,7 @@
#include <symbol_lib_table.h>
#include <set>
#include <libraries/symbol_library_manager_adapter.h>
#include <libraries/symbol_library_adapter.h>
static bool sortPinsByNumber( SCH_PIN* aPin1, SCH_PIN* aPin2 );
eeschema/project_rescue.cpp
+3 -3
View File
@@ -40,7 +40,7 @@
#include <cctype>
#include <map>
#include <pgm_base.h>
#include <libraries/symbol_library_manager_adapter.h>
#include <libraries/symbol_library_adapter.h>
// Helper sort function, used in getSymbols, to sort a symbol list by lib_id
@@ -383,7 +383,7 @@ void RESCUE_SYMBOL_LIB_TABLE_CANDIDATE::FindRescues( RESCUER& aRescuer,
}
// Get the library symbol from the symbol library table.
lib_match = SchGetLibSymbol( symbol_id, PROJECT_SCH::SymbolLibManager( aRescuer.GetPrj() ) );
lib_match = SchGetLibSymbol( symbol_id, PROJECT_SCH::SymbolLibAdapter( aRescuer.GetPrj() ) );
if( !cache_match && !lib_match )
continue;
@@ -779,7 +779,7 @@ void SYMBOL_LIB_TABLE_RESCUER::OpenRescueLibrary()
wxFileName fn = GetRescueLibraryFileName( m_schematic );
LIBRARY_MANAGER& manager = Pgm().GetLibraryManager();
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( m_prj );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( m_prj );
// If a rescue library already exists copy the contents of that library so we do not
// lose any previous rescues.
eeschema/project_sch.cpp
+5 -5
View File
@@ -26,7 +26,7 @@
#include <symbol_lib_table.h>
#include <project_sch.h>
#include <libraries/legacy_symbol_library.h>
#include <libraries/symbol_library_manager_adapter.h>
#include <libraries/symbol_library_adapter.h>
static std::mutex s_symbolTableMutex;
@@ -179,7 +179,7 @@ SYMBOL_LIB_TABLE* PROJECT_SCH::SchSymbolLibTable( PROJECT* aProject )
#endif
SYMBOL_LIBRARY_MANAGER_ADAPTER* PROJECT_SCH::SymbolLibManager( PROJECT* aProject )
SYMBOL_LIBRARY_ADAPTER* PROJECT_SCH::SymbolLibAdapter( PROJECT* aProject )
{
LIBRARY_MANAGER& mgr = Pgm().GetLibraryManager();
std::optional<LIBRARY_MANAGER_ADAPTER*> adapter = mgr.Adapter( LIBRARY_TABLE_TYPE::SYMBOL );
@@ -187,13 +187,13 @@ SYMBOL_LIBRARY_MANAGER_ADAPTER* PROJECT_SCH::SymbolLibManager( PROJECT* aProject
if( !adapter )
{
mgr.RegisterAdapter( LIBRARY_TABLE_TYPE::SYMBOL,
std::make_unique<SYMBOL_LIBRARY_MANAGER_ADAPTER>( mgr ) );
std::make_unique<SYMBOL_LIBRARY_ADAPTER>( mgr ) );
std::optional<LIBRARY_MANAGER_ADAPTER*> created = mgr.Adapter( LIBRARY_TABLE_TYPE::SYMBOL );
wxCHECK( created && ( *created )->Type() == LIBRARY_TABLE_TYPE::SYMBOL, nullptr );
return static_cast<SYMBOL_LIBRARY_MANAGER_ADAPTER*>( *created );
return static_cast<SYMBOL_LIBRARY_ADAPTER*>( *created );
}
wxCHECK( ( *adapter )->Type() == LIBRARY_TABLE_TYPE::SYMBOL, nullptr );
return static_cast<SYMBOL_LIBRARY_MANAGER_ADAPTER*>( *adapter );
return static_cast<SYMBOL_LIBRARY_ADAPTER*>( *adapter );
}
eeschema/project_sch.h
+3 -5
View File
@@ -27,7 +27,7 @@ class SYMBOL_LIB_TABLE;
class PROJECT;
class SEARCH_STACK;
class LEGACY_SYMBOL_LIBS;
class SYMBOL_LIBRARY_MANAGER_ADAPTER;
class SYMBOL_LIBRARY_ADAPTER;
class PROJECT_SCH
{
@@ -41,10 +41,8 @@ public:
/// Accessor for Eeschema search stack.
static SEARCH_STACK* SchSearchS( PROJECT* aProject );
/// Accessor for project symbol library table.
//static SYMBOL_LIB_TABLE* SchSymbolLibTable( PROJECT* aProject );
static SYMBOL_LIBRARY_MANAGER_ADAPTER* SymbolLibManager( PROJECT* aProject );
/// Accessor for project symbol library manager adapter.
static SYMBOL_LIBRARY_ADAPTER* SymbolLibAdapter( PROJECT* aProject );
private:
PROJECT_SCH() {}
eeschema/sch_base_frame.cpp
+5 -5
View File
@@ -46,7 +46,7 @@
#include <preview_items/selection_area.h>
#include <project_sch.h>
#include <libraries/legacy_symbol_library.h>
#include <libraries/symbol_library_manager_adapter.h>
#include <libraries/symbol_library_adapter.h>
#include <symbol_lib_table.h>
#include <sch_base_frame.h>
#include <dialogs/dialog_sch_find.h>
@@ -75,7 +75,7 @@
#endif
LIB_SYMBOL* SchGetLibSymbol( const LIB_ID& aLibId, SYMBOL_LIBRARY_MANAGER_ADAPTER* aLibMgr,
LIB_SYMBOL* SchGetLibSymbol( const LIB_ID& aLibId, SYMBOL_LIBRARY_ADAPTER* aLibMgr,
LEGACY_SYMBOL_LIB* aCacheLib, wxWindow* aParent, bool aShowErrorMsg )
{
wxCHECK_MSG( aLibMgr, nullptr, wxS( "Invalid symbol library manager adapter." ) );
@@ -278,7 +278,7 @@ LIB_SYMBOL* SCH_BASE_FRAME::GetLibSymbol( const LIB_ID& aLibId, bool aUseCacheLi
LEGACY_SYMBOL_LIB* cache =
( aUseCacheLib ) ? PROJECT_SCH::LegacySchLibs( &Prj() )->GetCacheLibrary() : nullptr;
return SchGetLibSymbol( aLibId, PROJECT_SCH::SymbolLibManager( &Prj() ), cache, this,
return SchGetLibSymbol( aLibId, PROJECT_SCH::SymbolLibAdapter( &Prj() ), cache, this,
aShowErrorMsg );
}
@@ -657,7 +657,7 @@ void SCH_BASE_FRAME::GetLibraryItemsForListDialog( wxArrayString& aHeaders,
{
COMMON_SETTINGS* cfg = Pgm().GetCommonSettings();
PROJECT_FILE& project = Prj().GetProjectFile();
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &Prj() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &Prj() );
std::vector<wxString> libNicknames = adapter->GetLibraryNames();
aHeaders.Add( _( "Library" ) );
@@ -753,7 +753,7 @@ wxString SCH_BASE_FRAME::SelectLibrary( const wxString& aDialogTitle, const wxSt
Prj().SetRString( PROJECT::SCH_LIB_PATH, fn.GetPath() );
LIBRARY_TABLE_SCOPE scope = tableChooser.GetUseGlobalTable() ? LIBRARY_TABLE_SCOPE::GLOBAL : LIBRARY_TABLE_SCOPE::PROJECT;
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &Prj() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &Prj() );
if( adapter->HasLibrary( libraryName, false ) )
{
eeschema/sch_base_frame.h
+2 -2
View File
@@ -54,7 +54,7 @@ class LIB_SYMBOL;
class LEGACY_SYMBOL_LIB;
class SYMBOL_LIBRARY_FILTER;
class LIB_ID;
class SYMBOL_LIBRARY_MANAGER_ADAPTER;
class SYMBOL_LIBRARY_ADAPTER;
class EESCHEMA_SETTINGS;
class SYMBOL_EDITOR_SETTINGS;
struct SCH_SELECTION_FILTER_OPTIONS;
@@ -98,7 +98,7 @@ class wxFileSystemWatcherEvent;
*
* @return The symbol found in the library or NULL if the symbol was not found.
*/
LIB_SYMBOL* SchGetLibSymbol( const LIB_ID& aLibId, SYMBOL_LIBRARY_MANAGER_ADAPTER* aLibMgr,
LIB_SYMBOL* SchGetLibSymbol( const LIB_ID& aLibId, SYMBOL_LIBRARY_ADAPTER* aLibMgr,
LEGACY_SYMBOL_LIB* aCacheLib = nullptr, wxWindow* aParent = nullptr,
bool aShowErrorMsg = false );
eeschema/sch_io/altium/sch_io_altium.cpp
+2 -2
View File
@@ -36,7 +36,7 @@
#include <project_sch.h>
#include <project/project_file.h>
#include <project/net_settings.h>
#include <libraries/symbol_library_manager_adapter.h>
#include <libraries/symbol_library_adapter.h>
#include <lib_id.h>
#include <sch_pin.h>
@@ -4841,7 +4841,7 @@ void SCH_IO_ALTIUM::doEnumerateSymbolLib( const wxString& aLibraryPath,
ensureLoadedLibrary( aLibraryPath, aProperties );
bool powerSymbolsOnly = ( aProperties &&
aProperties->contains( SYMBOL_LIBRARY_MANAGER_ADAPTER::PropPowerSymsOnly ) );
aProperties->contains( SYMBOL_LIBRARY_ADAPTER::PropPowerSymsOnly ) );
auto it = m_libCache.find( aLibraryPath );
eeschema/sch_io/cadstar/sch_io_cadstar_archive.cpp
+2 -2
View File
@@ -34,7 +34,7 @@
#include <wildcards_and_files_ext.h>
#include <wx_filename.h>
#include <libraries/library_table.h>
#include <libraries/symbol_library_manager_adapter.h>
#include <libraries/symbol_library_adapter.h>
#include <wx/dir.h>
#include <wx/wfstream.h>
#include <wx/txtstrm.h>
@@ -103,7 +103,7 @@ SCH_SHEET* SCH_IO_CADSTAR_ARCHIVE::LoadSchematicFile( const wxString& aFi
csaLoader.Load( aSchematic, rootSheet );
// Save symbols to project library
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &aSchematic->Project() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &aSchematic->Project() );
LIBRARY_TABLE* table = adapter->ProjectTable().value_or( nullptr );
wxCHECK_MSG( table, nullptr, "Could not load symbol lib table." );
eeschema/sch_io/database/sch_io_database.cpp
+1 -1
View File
@@ -26,7 +26,7 @@
#include <boost/algorithm/string.hpp>
#include <libraries/symbol_library_manager_adapter.h>
#include <libraries/symbol_library_adapter.h>
#include <database/database_connection.h>
#include <database/database_lib_settings.h>
#include <fmt.h>
eeschema/sch_io/database/sch_io_database.h
+2 -2
View File
@@ -77,7 +77,7 @@ public:
// Database libraries can never be written using the symbol editing API
bool IsLibraryWritable( const wxString& aLibraryPath ) override { return false; }
void SetLibraryManagerAdapter( SYMBOL_LIBRARY_MANAGER_ADAPTER* aAdapter ) override
void SetLibraryManagerAdapter( SYMBOL_LIBRARY_ADAPTER* aAdapter ) override
{
m_adapter = aAdapter;
}
@@ -105,7 +105,7 @@ private:
static std::optional<bool> boolFromAny( const std::any& aVal );
SYMBOL_LIBRARY_MANAGER_ADAPTER* m_adapter;
SYMBOL_LIBRARY_ADAPTER* m_adapter;
std::unique_ptr<DATABASE_LIB_SETTINGS> m_settings;
eeschema/sch_io/eagle/sch_io_eagle.cpp
+3 -3
View File
@@ -57,7 +57,7 @@
#include <string_utils.h>
#include <symbol_lib_table.h>
#include <wildcards_and_files_ext.h>
#include <libraries/symbol_library_manager_adapter.h>
#include <libraries/symbol_library_adapter.h>
// Eagle schematic axes are aligned with x increasing left to right and Y increasing bottom to top
@@ -422,7 +422,7 @@ SCH_SHEET* SCH_IO_EAGLE::LoadSchematicFile( const wxString& aFileName, SCHEMATIC
m_sheetPath.SetPageNumber( wxT( "1" ) );
}
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &aSchematic->Project() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &aSchematic->Project() );
LIBRARY_TABLE* table = adapter->ProjectTable().value_or( nullptr );
wxCHECK_MSG( table, nullptr, "Could not load symbol lib table." );
@@ -1982,7 +1982,7 @@ void SCH_IO_EAGLE::loadInstance( const std::unique_ptr<EINSTANCE>& aInstance,
// Save the pin positions
LIB_SYMBOL* libSymbol =
PROJECT_SCH::SymbolLibManager( &m_schematic->Project() )->LoadSymbol( symbol->GetLibId() );
PROJECT_SCH::SymbolLibAdapter( &m_schematic->Project() )->LoadSymbol( symbol->GetLibId() );
wxCHECK( libSymbol, /*void*/ );
eeschema/sch_io/easyedapro/sch_io_easyedapro.cpp
+2 -2
View File
@@ -47,7 +47,7 @@
#include <core/map_helpers.h>
#include <project_sch.h>
#include <libraries/library_table.h>
#include <libraries/symbol_library_manager_adapter.h>
#include <libraries/symbol_library_adapter.h>
struct SCH_IO_EASYEDAPRO::PRJ_DATA
@@ -604,7 +604,7 @@ SCH_SHEET* SCH_IO_EASYEDAPRO::LoadSchematicFile( const wxString& aFileName,
IO_RELEASER<SCH_IO> sch_plugin( SCH_IO_MGR::FindPlugin( SCH_IO_MGR::SCH_KICAD ) );
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &aSchematic->Project() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &aSchematic->Project() );
LIBRARY_TABLE* table = adapter->ProjectTable().value_or( nullptr );
wxCHECK_MSG( table, nullptr, "Could not load symbol lib table." );
eeschema/sch_io/http_lib/sch_io_http_lib.cpp
+1 -1
View File
@@ -25,7 +25,7 @@
#include <lib_symbol.h>
#include <symbol_lib_table.h>
#include <libraries/symbol_library_manager_adapter.h>
#include <libraries/symbol_library_adapter.h>
#include <http_lib/http_lib_connection.h>
#include "sch_io_http_lib.h"
eeschema/sch_io/http_lib/sch_io_http_lib.h
+2 -2
View File
@@ -70,7 +70,7 @@ public:
bool IsLibraryWritable( const wxString& aLibraryPath ) override { return false; }
void SetLibraryManagerAdapter( SYMBOL_LIBRARY_MANAGER_ADAPTER* aAdapter ) override
void SetLibraryManagerAdapter( SYMBOL_LIBRARY_ADAPTER* aAdapter ) override
{
m_adapter = aAdapter;
}
@@ -97,7 +97,7 @@ private:
const HTTP_LIB_PART& aPart );
private:
SYMBOL_LIBRARY_MANAGER_ADAPTER* m_adapter;
SYMBOL_LIBRARY_ADAPTER* m_adapter;
/// Generally will be null if no valid connection is established
std::unique_ptr<HTTP_LIB_CONNECTION> m_conn;
eeschema/sch_io/sch_io.h
+2 -2
View File
@@ -32,7 +32,7 @@
#include <i18n_utility.h>
#include <wx/arrstr.h>
class SYMBOL_LIBRARY_MANAGER_ADAPTER;
class SYMBOL_LIBRARY_ADAPTER;
/**
* Base class that schematic file and library loading and saving plugins should derive from.
@@ -356,7 +356,7 @@ public:
* Some library plugins need to interface with other loaded libraries.
* To do this, they receive a reference to the project-specific manager adapter.
*/
virtual void SetLibraryManagerAdapter( SYMBOL_LIBRARY_MANAGER_ADAPTER* aAdapter ) {}
virtual void SetLibraryManagerAdapter( SYMBOL_LIBRARY_ADAPTER* aAdapter ) {}
//-----</PUBLIC SCH_IO API>------------------------------------------------
eeschema/sch_screen.cpp
+2 -2
View File
@@ -66,7 +66,7 @@
// TODO(JE) Debugging only
#include <core/profile.h>
#include <libraries/symbol_library_manager_adapter.h>
#include <libraries/symbol_library_adapter.h>
#include "sch_bus_entry.h"
#include "sch_shape.h"
@@ -670,7 +670,7 @@ void SCH_SCREEN::UpdateSymbolLinks( REPORTER* aReporter )
wxString msg;
std::vector<SCH_SYMBOL*> symbols;
SYMBOL_LIBRARY_MANAGER_ADAPTER* libs = PROJECT_SCH::SymbolLibManager( &Schematic()->Project() );
SYMBOL_LIBRARY_ADAPTER* libs = PROJECT_SCH::SymbolLibAdapter( &Schematic()->Project() );
// This will be a nullptr if an s-expression schematic is loaded.
LEGACY_SYMBOL_LIBS* legacyLibs = PROJECT_SCH::LegacySchLibs( &Schematic()->Project() );
eeschema/sheet.cpp
+4 -4
View File
@@ -49,7 +49,7 @@
#include <advanced_config.h>
#include <pgm_base.h>
#include <libraries/symbol_library_manager_adapter.h>
#include <libraries/symbol_library_adapter.h>
#include "printing/sch_printout.h"
@@ -285,7 +285,7 @@ bool SCH_EDIT_FRAME::LoadSheetFromFile( SCH_SHEET* aSheet, SCH_SHEET_PATH* aCurr
}
}
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &Prj() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &Prj() );
std::optional<LIBRARY_TABLE*> optTable = adapter->ProjectTable();
wxCHECK( optTable, false );
LIBRARY_TABLE* projectTable = *optTable;
@@ -345,7 +345,7 @@ bool SCH_EDIT_FRAME::LoadSheetFromFile( SCH_SHEET* aSheet, SCH_SHEET_PATH* aCurr
// library links are valid but it's better than nothing.
for( const wxString& name : names )
{
if( !PROJECT_SCH::SymbolLibManager( &Prj() )->HasLibrary( name ) )
if( !PROJECT_SCH::SymbolLibAdapter( &Prj() )->HasLibrary( name ) )
newLibNames.Add( name );
}
@@ -376,7 +376,7 @@ bool SCH_EDIT_FRAME::LoadSheetFromFile( SCH_SHEET* aSheet, SCH_SHEET_PATH* aCurr
for( const wxString& name : names )
{
if( !PROJECT_SCH::SymbolLibManager( &Prj() )->HasLibrary( name ) )
if( !PROJECT_SCH::SymbolLibAdapter( &Prj() )->HasLibrary( name ) )
newLibNames.Add( name );
else
duplicateLibNames.Add( name );
eeschema/symbol_editor/lib_symbol_library_manager.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include <template_fieldnames.h>
#include <lib_symbol.h>
#include <sch_field.h>
#include <libraries/symbol_library_manager_adapter.h>
#include <libraries/symbol_library_adapter.h>
// TODO(JE) library tables -- this class doesn't need to exist anymore
@@ -44,7 +44,7 @@ void LIB_SYMBOL_LIBRARY_MANAGER::Sync( const wxString& aForceRefresh,
m_logger->Activate();
{
getAdapter()->Sync( aForceRefresh, aProgressCallback );
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &m_frame.Prj() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &m_frame.Prj() );
m_syncHash = adapter->GetModifyHash();
}
m_logger->Deactivate();
eeschema/symbol_editor/symbol_edit_frame.cpp
+11 -11
View File
@@ -83,7 +83,7 @@
#include <wildcards_and_files_ext.h>
#include <panel_sym_lib_table.h>
#include <string_utils.h>
#include <libraries/symbol_library_manager_adapter.h>
#include <libraries/symbol_library_adapter.h>
#include <wx/msgdlg.h>
#include <wx/combobox.h>
#include <wx/log.h>
@@ -836,7 +836,7 @@ bool SYMBOL_EDIT_FRAME::IsSymbolFromLegacyLibrary() const
{
if( m_symbol )
{
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &Prj() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &Prj() );
if( auto row = adapter->GetRow( m_symbol->GetLibNickname() ); row.has_value() )
{
@@ -855,7 +855,7 @@ wxString SYMBOL_EDIT_FRAME::GetCurLib() const
if( !libNickname.empty() )
{
if( !PROJECT_SCH::SymbolLibManager( &Prj() )->HasLibrary( libNickname ) )
if( !PROJECT_SCH::SymbolLibAdapter( &Prj() )->HasLibrary( libNickname ) )
{
Prj().SetRString( PROJECT::SCH_LIBEDIT_CUR_LIB, wxEmptyString );
libNickname = wxEmptyString;
@@ -870,7 +870,7 @@ wxString SYMBOL_EDIT_FRAME::SetCurLib( const wxString& aLibNickname )
{
wxString old = GetCurLib();
if( aLibNickname.empty() || !PROJECT_SCH::SymbolLibManager( &Prj() )->HasLibrary( aLibNickname ) )
if( aLibNickname.empty() || !PROJECT_SCH::SymbolLibAdapter( &Prj() )->HasLibrary( aLibNickname ) )
Prj().SetRString( PROJECT::SCH_LIBEDIT_CUR_LIB, wxEmptyString );
else
Prj().SetRString( PROJECT::SCH_LIBEDIT_CUR_LIB, aLibNickname );
@@ -1146,7 +1146,7 @@ wxString SYMBOL_EDIT_FRAME::AddLibraryFile( bool aCreateNew )
if( libName.IsEmpty() )
return wxEmptyString;
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &Prj() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &Prj() );
if( adapter->HasLibrary( libName ) )
{
@@ -1200,7 +1200,7 @@ void SYMBOL_EDIT_FRAME::DdAddLibrary( wxString aLibFile )
if( libName.IsEmpty() )
return;
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &Prj() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &Prj() );
if( adapter->HasLibrary( libName ) )
{
@@ -1630,7 +1630,7 @@ void SYMBOL_EDIT_FRAME::KiwayMailIn( KIWAY_EXPRESS& mail )
wxString libNickname;
wxString msg;
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &Prj() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &Prj() );
std::optional<const LIBRARY_TABLE_ROW*> libTableRow = adapter->FindRowByURI( uri );
if( !libTableRow )
@@ -1674,7 +1674,7 @@ void SYMBOL_EDIT_FRAME::KiwayMailIn( KIWAY_EXPRESS& mail )
// Check if the currently selected symbol library been removed or disabled.
if( !currentLib.empty()
&& !PROJECT_SCH::SymbolLibManager( &Prj() )->HasLibrary( currentLib, true ) )
&& !PROJECT_SCH::SymbolLibAdapter( &Prj() )->HasLibrary( currentLib, true ) )
{
SetCurLib( wxEmptyString );
emptyScreen();
@@ -1689,7 +1689,7 @@ void SYMBOL_EDIT_FRAME::KiwayMailIn( KIWAY_EXPRESS& mail )
case MAIL_REFRESH_SYMBOL:
{
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &Prj() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &Prj() );
LIB_SYMBOL* symbol = GetCurSymbol();
wxLogTrace( traceLibWatch, "Received refresh symbol request for %s", payload );
@@ -1921,7 +1921,7 @@ bool SYMBOL_EDIT_FRAME::addLibTableEntry( const wxString& aLibFile, LIBRARY_TABL
wxFileName libTableFileName( Prj().GetProjectPath(),
SYMBOL_LIB_TABLE::GetSymbolLibTableFileName() );
wxString libNickname = fn.GetName();
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &Prj() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &Prj() );
const ENV_VAR_MAP& envVars = Pgm().GetLocalEnvVariables();
if( adapter->HasLibrary( libNickname ) )
@@ -1982,7 +1982,7 @@ bool SYMBOL_EDIT_FRAME::addLibTableEntry( const wxString& aLibFile, LIBRARY_TABL
bool SYMBOL_EDIT_FRAME::replaceLibTableEntry( const wxString& aLibNickname,
const wxString& aLibFile )
{
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &Prj() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &Prj() );
LIBRARY_TABLE* table = nullptr;
LIBRARY_TABLE_SCOPE scope = LIBRARY_TABLE_SCOPE::GLOBAL;
eeschema/symbol_editor/symbol_editor.cpp
+4 -4
View File
@@ -50,7 +50,7 @@
#include "symbol_saveas_type.h"
#include <widgets/symbol_library_save_as_filedlg_hook.h>
#include <io/kicad/kicad_io_utils.h>
#include <libraries/symbol_library_manager_adapter.h>
#include <libraries/symbol_library_adapter.h>
void SYMBOL_EDIT_FRAME::UpdateTitle()
@@ -147,7 +147,7 @@ bool SYMBOL_EDIT_FRAME::LoadSymbol( const LIB_ID& aLibId, int aUnit, int aBodySt
{
LIB_ID libId = aLibId;
LIBRARY_MANAGER& manager = Pgm().GetLibraryManager();
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &Prj() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &Prj() );
// Some libraries can't be edited, so load the underlying chosen symbol
if( auto optRow = manager.GetRow( LIBRARY_TABLE_TYPE::SYMBOL, aLibId.GetLibNickname() );
@@ -231,7 +231,7 @@ bool SYMBOL_EDIT_FRAME::LoadSymbolFromCurrentLib( const wxString& aSymbolName, i
try
{
symbol = PROJECT_SCH::SymbolLibManager( &Prj() )->LoadSymbol( GetCurLib(), aSymbolName );
symbol = PROJECT_SCH::SymbolLibAdapter( &Prj() )->LoadSymbol( GetCurLib(), aSymbolName );
}
catch( const IO_ERROR& ioe )
{
@@ -1507,7 +1507,7 @@ bool SYMBOL_EDIT_FRAME::saveLibrary( const wxString& aLibrary, bool aNewFile )
SCH_IO_MGR::SCH_FILE_T fileType = SCH_IO_MGR::SCH_FILE_T::SCH_KICAD;
PROJECT& prj = Prj();
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &prj );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &prj );
m_toolManager->RunAction( ACTIONS::cancelInteractive );
eeschema/symbol_library_manager.cpp
+12 -12
View File
@@ -42,7 +42,7 @@
#include <confirm.h>
#include <string_utils.h>
#include <libraries/library_manager.h>
#include <libraries/symbol_library_manager_adapter.h>
#include <libraries/symbol_library_adapter.h>
#include "lib_logger.h"
@@ -74,7 +74,7 @@ bool SYMBOL_LIBRARY_MANAGER::HasModifications() const
int SYMBOL_LIBRARY_MANAGER::GetHash() const
{
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &m_frame.Prj() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &m_frame.Prj() );
return adapter->GetModifyHash();
}
@@ -301,7 +301,7 @@ bool SYMBOL_LIBRARY_MANAGER::IsLibraryReadOnly( const wxString& aLibrary ) const
wxCHECK_MSG( LibraryExists( aLibrary ), true,
wxString::Format( "Library missing: %s", aLibrary ) );
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &m_frame.Prj() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &m_frame.Prj() );
return !adapter->IsSymbolLibWritable( aLibrary );
}
@@ -311,7 +311,7 @@ bool SYMBOL_LIBRARY_MANAGER::IsLibraryLoaded( const wxString& aLibrary ) const
wxCHECK_MSG( LibraryExists( aLibrary ), false,
wxString::Format( "Library missing: %s", aLibrary ) );
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &m_frame.Prj() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &m_frame.Prj() );
return adapter->IsLibraryLoaded( aLibrary );
}
@@ -331,7 +331,7 @@ std::list<LIB_SYMBOL*> SYMBOL_LIBRARY_MANAGER::EnumerateSymbols( const wxString&
}
else
{
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &m_frame.Prj() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &m_frame.Prj() );
std::vector<LIB_SYMBOL*> symbols = adapter->GetSymbols( aLibrary );
std::copy( symbols.begin(), symbols.end(), std::back_inserter( ret ) );
@@ -354,7 +354,7 @@ LIB_SYMBOL* SYMBOL_LIBRARY_MANAGER::GetBufferedSymbol( const wxString& aSymbolNa
if( !bufferedSymbol ) // no buffer symbol found
{
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &m_frame.Prj() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &m_frame.Prj() );
// create a copy of the symbol
try
@@ -573,7 +573,7 @@ LIB_SYMBOL* SYMBOL_LIBRARY_MANAGER::GetSymbol( const wxString& aSymbolName,
}
// Get the original symbol
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &m_frame.Prj() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &m_frame.Prj() );
LIB_SYMBOL* symbol = nullptr;
try
@@ -603,7 +603,7 @@ bool SYMBOL_LIBRARY_MANAGER::SymbolExists( const wxString& aSymbolName,
if( libBufIt != m_libs.end() )
return libBufIt->second.GetBuffer( aSymbolName ) != nullptr;
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &m_frame.Prj() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &m_frame.Prj() );
try
{
@@ -645,7 +645,7 @@ bool SYMBOL_LIBRARY_MANAGER::LibraryExists( const wxString& aLibrary, bool aChec
if( m_libs.count( aLibrary ) > 0 )
return true;
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &m_frame.Prj() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &m_frame.Prj() );
return adapter->HasLibrary( aLibrary, aCheckEnabled );
}
@@ -701,7 +701,7 @@ size_t SYMBOL_LIBRARY_MANAGER::GetDerivedSymbolNames( const wxString& aSymbolNam
size_t SYMBOL_LIBRARY_MANAGER::GetLibraryCount() const
{
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &m_frame.Prj() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &m_frame.Prj() );
return adapter->GetLibraryNames().size();
}
@@ -743,7 +743,7 @@ bool SYMBOL_LIBRARY_MANAGER::addLibrary( const wxString& aFilePath, bool aCreate
{
wxCHECK( schFileType != SCH_IO_MGR::SCH_FILE_T::SCH_LEGACY, false );
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &m_frame.Prj() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &m_frame.Prj() );
if( !adapter->CreateLibrary( libName ) )
{
@@ -763,7 +763,7 @@ std::set<LIB_SYMBOL*> SYMBOL_LIBRARY_MANAGER::getOriginalSymbols( const wxString
std::set<LIB_SYMBOL*> symbols;
wxCHECK( LibraryExists( aLibrary ), symbols );
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &m_frame.Prj() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &m_frame.Prj() );
for( LIB_SYMBOL* symbol : adapter->GetSymbols( aLibrary ) )
symbols.insert( symbol );
eeschema/symbol_tree_model_adapter.cpp
+6 -6
View File
@@ -36,7 +36,7 @@
#include <symbol_lib_table.h>
#include <string_utils.h>
#include <trace_helpers.h>
#include <libraries/symbol_library_manager_adapter.h>
#include <libraries/symbol_library_adapter.h>
bool SYMBOL_TREE_MODEL_ADAPTER::m_show_progress = true;
@@ -45,7 +45,7 @@ bool SYMBOL_TREE_MODEL_ADAPTER::m_show_progress = true;
wxObjectDataPtr<LIB_TREE_MODEL_ADAPTER>
SYMBOL_TREE_MODEL_ADAPTER::Create( SCH_BASE_FRAME* aParent,
SYMBOL_LIBRARY_MANAGER_ADAPTER* aManager )
SYMBOL_LIBRARY_ADAPTER* aManager )
{
auto* adapter = new SYMBOL_TREE_MODEL_ADAPTER( aParent, aManager );
return wxObjectDataPtr<LIB_TREE_MODEL_ADAPTER>( adapter );
@@ -53,7 +53,7 @@ SYMBOL_TREE_MODEL_ADAPTER::Create( SCH_BASE_FRAME* aParent,
SYMBOL_TREE_MODEL_ADAPTER::SYMBOL_TREE_MODEL_ADAPTER( SCH_BASE_FRAME* aParent,
SYMBOL_LIBRARY_MANAGER_ADAPTER* aLibs ) :
SYMBOL_LIBRARY_ADAPTER* aLibs ) :
LIB_TREE_MODEL_ADAPTER( aParent, "pinned_symbol_libs",
aParent->GetViewerSettingsBase()->m_LibTree ),
m_adapter( aLibs ),
@@ -202,9 +202,9 @@ void SYMBOL_TREE_MODEL_ADAPTER::AddLibraries( SCH_BASE_FRAME* aFrame )
void SYMBOL_TREE_MODEL_ADAPTER::AddLibrary( wxString const& aLibNickname, bool pinned )
{
SYMBOL_LIBRARY_MANAGER_ADAPTER::SYMBOL_TYPE type =
( GetFilter() != nullptr ) ? SYMBOL_LIBRARY_MANAGER_ADAPTER::SYMBOL_TYPE::POWER_ONLY
: SYMBOL_LIBRARY_MANAGER_ADAPTER::SYMBOL_TYPE::ALL_SYMBOLS;
SYMBOL_LIBRARY_ADAPTER::SYMBOL_TYPE type =
( GetFilter() != nullptr ) ? SYMBOL_LIBRARY_ADAPTER::SYMBOL_TYPE::POWER_ONLY
: SYMBOL_LIBRARY_ADAPTER::SYMBOL_TYPE::ALL_SYMBOLS;
std::vector<LIB_SYMBOL*> symbols = m_adapter->GetSymbols( aLibNickname, type );
std::vector<LIB_TREE_ITEM*> comp_list;
eeschema/symbol_tree_model_adapter.h
+4 -4
View File
@@ -24,7 +24,7 @@
#include <lib_tree_model_adapter.h>
class SYMBOL_LIBRARY_MANAGER_ADAPTER;
class SYMBOL_LIBRARY_ADAPTER;
class SCH_BASE_FRAME;
class SYMBOL_TREE_MODEL_ADAPTER : public LIB_TREE_MODEL_ADAPTER
@@ -43,7 +43,7 @@ public:
* @param aLibs library set from which parts will be loaded
*/
static wxObjectDataPtr<LIB_TREE_MODEL_ADAPTER> Create( SCH_BASE_FRAME* aParent,
SYMBOL_LIBRARY_MANAGER_ADAPTER* aLibs );
SYMBOL_LIBRARY_ADAPTER* aLibs );
/**
* Add all the libraries in a SYMBOL_LIB_TABLE to the model.
@@ -60,7 +60,7 @@ protected:
/**
* Constructor; takes a set of libraries to be included in the search.
*/
SYMBOL_TREE_MODEL_ADAPTER( SCH_BASE_FRAME* aParent, SYMBOL_LIBRARY_MANAGER_ADAPTER* aManager );
SYMBOL_TREE_MODEL_ADAPTER( SCH_BASE_FRAME* aParent, SYMBOL_LIBRARY_ADAPTER* aManager );
PROJECT::LIB_TYPE_T getLibType() override { return PROJECT::LIB_TYPE_T::SYMBOL_LIB; }
@@ -72,7 +72,7 @@ private:
*/
static bool m_show_progress;
SYMBOL_LIBRARY_MANAGER_ADAPTER* m_adapter;
SYMBOL_LIBRARY_ADAPTER* m_adapter;
std::set<wxString> m_pending_load_libraries;
std::unique_ptr<wxTimer> m_check_pending_libraries_timer;
eeschema/symbol_tree_synchronizing_adapter.cpp
+3 -3
View File
@@ -35,7 +35,7 @@
#include <project_sch.h>
#include <string_utils.h>
#include <symbol_preview_widget.h>
#include <libraries/symbol_library_manager_adapter.h>
#include <libraries/symbol_library_adapter.h>
#include <widgets/wx_panel.h>
@@ -82,7 +82,7 @@ void SYMBOL_TREE_SYNCHRONIZING_ADAPTER::Sync( const wxString& aForceRefresh,
m_lastSyncHash = m_libMgr->GetHash();
int i = 0, max = GetLibrariesCount();
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &m_frame->Prj() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &m_frame->Prj() );
// Process already stored libraries
for( auto it = m_tree.m_Children.begin(); it != m_tree.m_Children.end(); )
@@ -273,7 +273,7 @@ void SYMBOL_TREE_SYNCHRONIZING_ADAPTER::GetValue( wxVariant& aVariant, wxDataVie
{
if( node->m_Type == LIB_TREE_NODE::TYPE::LIBRARY )
{
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager(
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter(
&m_frame->Prj() );
if( auto optRow = adapter->GetRow( node->m_LibId.GetLibNickname() ) )
eeschema/symbol_viewer_frame.cpp
+8 -8
View File
@@ -68,7 +68,7 @@
#include <default_values.h>
#include <string_utils.h>
#include <libraries/symbol_library_manager_adapter.h>
#include <libraries/symbol_library_adapter.h>
#include "eda_pattern_match.h"
@@ -357,7 +357,7 @@ LIB_SYMBOL* SYMBOL_VIEWER_FRAME::GetSelectedSymbol() const
LIB_SYMBOL* symbol = nullptr;
if( m_currentSymbol.IsValid() )
symbol = PROJECT_SCH::SymbolLibManager( &Prj() )->LoadSymbol( m_currentSymbol );
symbol = PROJECT_SCH::SymbolLibAdapter( &Prj() )->LoadSymbol( m_currentSymbol );
return symbol;
}
@@ -488,7 +488,7 @@ bool SYMBOL_VIEWER_FRAME::ReCreateLibList()
COMMON_SETTINGS* cfg = Pgm().GetCommonSettings();
PROJECT_FILE& project = Kiway().Prj().GetProjectFile();
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &Prj() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &Prj() );
std::vector<wxString> libNicknames = adapter->GetLibraryNames();
std::vector<wxString> pinnedMatches;
std::vector<wxString> otherMatches;
@@ -521,7 +521,7 @@ bool SYMBOL_VIEWER_FRAME::ReCreateLibList()
if( m_listPowerOnly )
{
std::vector<wxString> symbolNames = adapter->GetSymbolNames(
aLib, SYMBOL_LIBRARY_MANAGER_ADAPTER::SYMBOL_TYPE::POWER_ONLY );
aLib, SYMBOL_LIBRARY_ADAPTER::SYMBOL_TYPE::POWER_ONLY );
if( symbolNames.empty() )
return;
@@ -621,7 +621,7 @@ bool SYMBOL_VIEWER_FRAME::ReCreateSymbolList()
if( libName.IsEmpty() )
return false;
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &Prj() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &Prj() );
std::vector<LIB_SYMBOL*> symbols = adapter->GetSymbols( libName );
std::set<wxString> excludes;
@@ -703,7 +703,7 @@ void SYMBOL_VIEWER_FRAME::ClickOnLibList( wxCommandEvent& event )
wxString selection = EscapeString( m_libList->GetBaseString( ii ), CTX_LIBID );
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &Prj() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &Prj() );
if( !adapter->HasLibrary( selection ) && selection.Find( '-' ) != wxNOT_FOUND )
{
@@ -1066,7 +1066,7 @@ void SYMBOL_VIEWER_FRAME::DisplayLibInfos()
if( m_libList && !m_libList->IsEmpty() && !libName.IsEmpty() )
{
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &Prj() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &Prj() );
LIBRARY_TABLE_ROW* row = adapter->GetRow( libName ).value_or( nullptr );
wxString title = row
@@ -1100,7 +1100,7 @@ void SYMBOL_VIEWER_FRAME::KiwayMailIn( KIWAY_EXPRESS& mail )
LIB_SYMBOL* symbol = GetSelectedSymbol();
wxCHECK2( symbol, break );
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &Prj() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &Prj() );
LIBRARY_TABLE_ROW* row =
adapter->GetRow( symbol->GetLibId().GetLibNickname() ).value_or( nullptr );
eeschema/tools/sch_drawing_tools.cpp
+1 -1
View File
@@ -344,7 +344,7 @@ int SCH_DRAWING_TOOLS::PlaceSymbol( const TOOL_EVENT& aEvent )
{
m_toolMgr->RunAction( ACTIONS::selectionClear );
SYMBOL_LIBRARY_MANAGER_ADAPTER* libs = PROJECT_SCH::SymbolLibManager( &m_frame->Prj() );
SYMBOL_LIBRARY_ADAPTER* libs = PROJECT_SCH::SymbolLibAdapter( &m_frame->Prj() );
LEGACY_SYMBOL_LIB* cache = PROJECT_SCH::LegacySchLibs( &m_frame->Prj() )->GetCacheLibrary();
std::set<UTF8> unique_libid;
eeschema/tools/sch_editor_control.cpp
+2 -3
View File
@@ -80,7 +80,7 @@
#include <wx/treectrl.h>
#include <wx/msgdlg.h>
#include <io/kicad/kicad_io_utils.h>
#include <libraries/symbol_library_manager_adapter.h>
#include <libraries/symbol_library_adapter.h>
#include <printing/dialog_print.h>
#ifdef KICAD_IPC_API
@@ -383,8 +383,7 @@ int SCH_EDITOR_CONTROL::ExportSymbolsToLibrary( const TOOL_EVENT& aEvent )
bool append = false;
SCH_COMMIT commit( m_frame );
LIBRARY_MANAGER& manager = Pgm().GetLibraryManager();
SYMBOL_LIBRARY_MANAGER_ADAPTER* adapter = PROJECT_SCH::SymbolLibManager( &m_frame->Prj() );
SYMBOL_LIBRARY_ADAPTER* adapter = PROJECT_SCH::SymbolLibAdapter( &m_frame->Prj() );
auto optRow = adapter->GetRow( targetLib );
wxCHECK( optRow, 0 );
eeschema/tools/sch_inspection_tool.cpp
+2 -2
View File
@@ -49,7 +49,7 @@
#include <dialogs/html_message_box.h>
#include <dialogs/dialog_erc.h>
#include <dialogs/dialog_book_reporter.h>
#include <libraries/symbol_library_manager_adapter.h>
#include <libraries/symbol_library_adapter.h>
#include <widgets/wx_html_report_box.h>
#include <widgets/symbol_diff_widget.h>
#include <math/util.h> // for KiROUND
@@ -368,7 +368,7 @@ void SCH_INSPECTION_TOOL::DiffSymbol( SCH_SYMBOL* symbol )
r->Report( "" );
SYMBOL_LIBRARY_MANAGER_ADAPTER* libs = PROJECT_SCH::SymbolLibManager( &m_frame->Prj() );
SYMBOL_LIBRARY_ADAPTER* libs = PROJECT_SCH::SymbolLibAdapter( &m_frame->Prj() );
if( !libs->HasLibrary( libName, false ) )
{
eeschema/widgets/panel_symbol_chooser.cpp
+4 -4
View File
@@ -28,7 +28,7 @@
#include <kiface_base.h>
#include <sch_base_frame.h>
#include <project_sch.h>
#include <libraries/symbol_library_manager_adapter.h>
#include <libraries/symbol_library_adapter.h>
#include <widgets/lib_tree.h>
#include <widgets/symbol_preview_widget.h>
#include <widgets/footprint_preview_widget.h>
@@ -77,7 +77,7 @@ PANEL_SYMBOL_CHOOSER::PANEL_SYMBOL_CHOOSER( SCH_BASE_FRAME* aFrame, wxWindow* aP
{
m_frame = aFrame;
SYMBOL_LIBRARY_MANAGER_ADAPTER* libmgr = PROJECT_SCH::SymbolLibManager( &m_frame->Prj() );
SYMBOL_LIBRARY_ADAPTER* libmgr = PROJECT_SCH::SymbolLibAdapter( &m_frame->Prj() );
COMMON_SETTINGS::SESSION& session = Pgm().GetCommonSettings()->m_Session;
PROJECT_FILE& project = m_frame->Prj().GetProjectFile();
@@ -547,7 +547,7 @@ void PANEL_SYMBOL_CHOOSER::showFootprintFor( LIB_ID const& aLibId )
try
{
symbol = PROJECT_SCH::SymbolLibManager( &m_frame->Prj() )->LoadSymbol( aLibId );
symbol = PROJECT_SCH::SymbolLibAdapter( &m_frame->Prj() )->LoadSymbol( aLibId );
}
catch( const IO_ERROR& ioe )
{
@@ -606,7 +606,7 @@ void PANEL_SYMBOL_CHOOSER::populateFootprintSelector( LIB_ID const& aLibId )
{
try
{
symbol = PROJECT_SCH::SymbolLibManager( &m_frame->Prj() )->LoadSymbol( aLibId );
symbol = PROJECT_SCH::SymbolLibAdapter( &m_frame->Prj() )->LoadSymbol( aLibId );
}
catch( const IO_ERROR& ioe )
{
eeschema/widgets/symbol_preview_widget.cpp
+2 -2
View File
@@ -24,7 +24,7 @@
#include <math/vector2wx.h>
#include <symbol_lib_table.h>
#include <lib_symbol.h>
#include <libraries/symbol_library_manager_adapter.h>
#include <libraries/symbol_library_adapter.h>
#include <sch_preview_panel.h>
#include <pgm_base.h>
#include <sch_painter.h>
@@ -193,7 +193,7 @@ void SYMBOL_PREVIEW_WIDGET::DisplaySymbol( const LIB_ID& aSymbolID, int aUnit, i
try
{
LIB_SYMBOL* tmp = PROJECT_SCH::SymbolLibManager( &m_kiway->Prj() )->LoadSymbol( aSymbolID );
LIB_SYMBOL* tmp = PROJECT_SCH::SymbolLibAdapter( &m_kiway->Prj() )->LoadSymbol( aSymbolID );
if( tmp )
symbol = tmp->Flatten();
qa/tests/eeschema/test_symbol_library.cpp
+3 -3
View File
@@ -23,7 +23,7 @@
#include <pgm_base.h>
#include "eeschema_test_utils.h"
#include <libraries/symbol_library_manager_adapter.h>
#include <libraries/symbol_library_adapter.h>
// NOTE: this is for the new symbol library manager adapter and
// library manager system. There is also test_symbol_library_manager.cpp
@@ -67,7 +67,7 @@ BOOST_AUTO_TEST_CASE( ProjectLibraryTable )
BOOST_REQUIRE( rows[0]->Nickname() == "Device" );
BOOST_REQUIRE( rows[0]->URI() == "${KIPRJMOD}/Device.kicad_sym" );
SYMBOL_LIBRARY_MANAGER_ADAPTER adapter( manager );
SYMBOL_LIBRARY_ADAPTER adapter( manager );
adapter.LoadOne( "Device" );
std::vector<LIB_SYMBOL*> symbols = adapter.GetSymbols( "Device" );
@@ -91,7 +91,7 @@ BOOST_AUTO_TEST_CASE( AsyncLoad )
manager.LoadGlobalTables();
Pgm().GetSettingsManager().LoadProject( "" );
SYMBOL_LIBRARY_MANAGER_ADAPTER adapter( manager );
SYMBOL_LIBRARY_ADAPTER adapter( manager );
auto tstart = std::chrono::high_resolution_clock::now();
adapter.AsyncLoad();