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

Rename Save -> SaveBoard, Load -> LoadBoard in PLUGIN.

This commit is contained in:
Alex Shvartzkop 2023-08-13 05:11:58 +03:00
parent 2e5430a874
commit a0d96cea9f
30 changed files with 94 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcbnew/files.cpp
View File

@ -750,7 +750,7 @@ bool PCB_EDIT_FRAME::OpenProjectFiles( const std::vector<wxString>& aFileSet, in
unsigned startTime = GetRunningMicroSecs(); unsigned startTime = GetRunningMicroSecs();
#endif #endif
loadedBoard = pi->Load( fullFileName, nullptr, &props, &Prj(), &progressReporter ); loadedBoard = pi->LoadBoard( fullFileName, nullptr, &props, &Prj(), &progressReporter );
#if USE_INSTRUMENTATION #if USE_INSTRUMENTATION
unsigned stopTime = GetRunningMicroSecs(); unsigned stopTime = GetRunningMicroSecs();
@ -1068,7 +1068,7 @@ bool PCB_EDIT_FRAME::SavePcbFile( const wxString& aFileName, bool addToHistory,
{ {
PLUGIN::RELEASER pi( IO_MGR::PluginFind( IO_MGR::KICAD_SEXP ) ); PLUGIN::RELEASER pi( IO_MGR::PluginFind( IO_MGR::KICAD_SEXP ) );
pi->Save( tempFile, GetBoard(), nullptr ); pi->SaveBoard( tempFile, GetBoard(), nullptr );
} }
catch( const IO_ERROR& ioe ) catch( const IO_ERROR& ioe )
{ {
@ -1170,7 +1170,7 @@ bool PCB_EDIT_FRAME::SavePcbCopy( const wxString& aFileName, bool aCreateProject
wxASSERT( pcbFileName.IsAbsolute() ); wxASSERT( pcbFileName.IsAbsolute() );
pi->Save( pcbFileName.GetFullPath(), GetBoard(), nullptr ); pi->SaveBoard( pcbFileName.GetFullPath(), GetBoard(), nullptr );
} }
catch( const IO_ERROR& ioe ) catch( const IO_ERROR& ioe )
{ {

4
pcbnew/io_mgr.cpp
View File

@ -169,7 +169,7 @@ BOARD* IO_MGR::Load( PCB_FILE_T aFileType, const wxString& aFileName, BOARD* aAp
if( (PLUGIN*) pi ) // test pi->plugin if( (PLUGIN*) pi ) // test pi->plugin
{ {
return pi->Load( aFileName, aAppendToMe, aProperties, aProject, aProgressReporter ); return pi->LoadBoard( aFileName, aAppendToMe, aProperties, aProject, aProgressReporter );
} }
THROW_IO_ERROR( wxString::Format( FMT_NOTFOUND, ShowType( aFileType ).GetData() ) ); THROW_IO_ERROR( wxString::Format( FMT_NOTFOUND, ShowType( aFileType ).GetData() ) );
@ -184,7 +184,7 @@ void IO_MGR::Save( PCB_FILE_T aFileType, const wxString& aFileName, BOARD* aBoar
if( (PLUGIN*) pi ) // test pi->plugin if( (PLUGIN*) pi ) // test pi->plugin
{ {
pi->Save( aFileName, aBoard, aProperties ); // virtual pi->SaveBoard( aFileName, aBoard, aProperties ); // virtual
return; return;
} }

8
pcbnew/io_mgr.h
View File

@ -192,8 +192,8 @@ public:
static PCB_FILE_T GuessPluginTypeFromLibPath( const wxString& aLibPath ); static PCB_FILE_T GuessPluginTypeFromLibPath( const wxString& aLibPath );
/** /**
* Find the requested #PLUGIN and if found, calls the #PLUGIN::Load() function * Find the requested #PLUGIN and if found, calls the #PLUGIN::LoadBoard() function
* on it using the arguments passed to this function. After the #PLUGIN::Load() * on it using the arguments passed to this function. After the #PLUGIN::LoadBoard()
* function returns, the #PLUGIN is Released() as part of this call. * function returns, the #PLUGIN is Released() as part of this call.
* *
* @param aFileType is the #PCB_FILE_T of file to load. * @param aFileType is the #PCB_FILE_T of file to load.
@ -316,7 +316,7 @@ public:
* wrong, using line number and character offsets of the input file if * wrong, using line number and character offsets of the input file if
* possible. * possible.
*/ */
virtual BOARD* Load( const wxString& aFileName, BOARD* aAppendToMe, virtual BOARD* LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
const STRING_UTF8_MAP* aProperties = nullptr, PROJECT* aProject = nullptr, const STRING_UTF8_MAP* aProperties = nullptr, PROJECT* aProject = nullptr,
PROGRESS_REPORTER* aProgressReporter = nullptr ); PROGRESS_REPORTER* aProgressReporter = nullptr );
@ -348,7 +348,7 @@ public:
* *
* @throw IO_ERROR if there is a problem saving or exporting. * @throw IO_ERROR if there is a problem saving or exporting.
*/ */
virtual void Save( const wxString& aFileName, BOARD* aBoard, virtual void SaveBoard( const wxString& aFileName, BOARD* aBoard,
const STRING_UTF8_MAP* aProperties = nullptr ); const STRING_UTF8_MAP* aProperties = nullptr );
/** /**

4
pcbnew/kicad_clipboard.cpp
View File

@ -332,7 +332,7 @@ BOARD_ITEM* CLIPBOARD_IO::Parse()
} }
void CLIPBOARD_IO::Save( const wxString& aFileName, BOARD* aBoard, void CLIPBOARD_IO::SaveBoard( const wxString& aFileName, BOARD* aBoard,
const STRING_UTF8_MAP* aProperties ) const STRING_UTF8_MAP* aProperties )
{ {
init( aProperties ); init( aProperties );
@ -377,7 +377,7 @@ void CLIPBOARD_IO::Save( const wxString& aFileName, BOARD* aBoard,
} }
BOARD* CLIPBOARD_IO::Load( const wxString& aFileName, BOARD* aAppendToMe, BOARD* CLIPBOARD_IO::LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
const STRING_UTF8_MAP* aProperties, PROJECT* aProject, const STRING_UTF8_MAP* aProperties, PROJECT* aProject,
PROGRESS_REPORTER* aProgressReporter ) PROGRESS_REPORTER* aProgressReporter )
{ {

4
pcbnew/kicad_clipboard.h
View File

@ -47,7 +47,7 @@ public:
/* /*
* Saves the entire board to the clipboard formatted using the PCB_PLUGIN formatting * Saves the entire board to the clipboard formatted using the PCB_PLUGIN formatting
*/ */
void Save( const wxString& aFileName, BOARD* aBoard, void SaveBoard( const wxString& aFileName, BOARD* aBoard,
const STRING_UTF8_MAP* aProperties = nullptr ) override; const STRING_UTF8_MAP* aProperties = nullptr ) override;
/* /*
@ -58,7 +58,7 @@ public:
BOARD_ITEM* Parse(); BOARD_ITEM* Parse();
BOARD* Load( const wxString& aFileName, BOARD* aAppendToMe, BOARD* LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
const STRING_UTF8_MAP* aProperties = nullptr, PROJECT* aProject = nullptr, const STRING_UTF8_MAP* aProperties = nullptr, PROJECT* aProject = nullptr,
PROGRESS_REPORTER* aProgressReporter = nullptr ) override; PROGRESS_REPORTER* aProgressReporter = nullptr ) override;

8
pcbnew/plugin.cpp
View File

@ -35,8 +35,9 @@
BOARD* PLUGIN::Load( const wxString& aFileName, BOARD* aAppendToMe, const STRING_UTF8_MAP* aProperties, BOARD* PLUGIN::LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
PROJECT* aProject, PROGRESS_REPORTER* aProgressReporter ) const STRING_UTF8_MAP* aProperties, PROJECT* aProject,
PROGRESS_REPORTER* aProgressReporter )
{ {
NOT_IMPLEMENTED( __FUNCTION__ ); NOT_IMPLEMENTED( __FUNCTION__ );
} }
@ -47,7 +48,8 @@ std::vector<FOOTPRINT*> PLUGIN::GetImportedCachedLibraryFootprints()
NOT_IMPLEMENTED( __FUNCTION__ ); NOT_IMPLEMENTED( __FUNCTION__ );
} }
void PLUGIN::Save( const wxString& aFileName, BOARD* aBoard, const STRING_UTF8_MAP* aProperties )
void PLUGIN::SaveBoard( const wxString& aFileName, BOARD* aBoard, const STRING_UTF8_MAP* aProperties )
{ {
// not pure virtual so that plugins only have to implement subset of the PLUGIN interface. // not pure virtual so that plugins only have to implement subset of the PLUGIN interface.
NOT_IMPLEMENTED( __FUNCTION__ ); NOT_IMPLEMENTED( __FUNCTION__ );

5
pcbnew/plugins/altium/altium_circuit_maker_plugin.cpp
View File

@ -62,8 +62,9 @@ const wxString ALTIUM_CIRCUIT_MAKER_PLUGIN::GetFileExtension() const
} }
BOARD* ALTIUM_CIRCUIT_MAKER_PLUGIN::Load( const wxString& aFileName, BOARD* aAppendToMe, BOARD* ALTIUM_CIRCUIT_MAKER_PLUGIN::LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
const STRING_UTF8_MAP* aProperties, PROJECT* aProject, const STRING_UTF8_MAP* aProperties,
PROJECT* aProject,
PROGRESS_REPORTER* aProgressReporter ) PROGRESS_REPORTER* aProgressReporter )
{ {
m_props = aProperties; m_props = aProperties;

4
pcbnew/plugins/altium/altium_circuit_maker_plugin.h
View File

@ -33,8 +33,8 @@ class ALTIUM_CIRCUIT_MAKER_PLUGIN : public PLUGIN
public: public:
const wxString PluginName() const override; const wxString PluginName() const override;
BOARD* Load( const wxString& aFileName, BOARD* aAppendToMe, const STRING_UTF8_MAP* aProperties, BOARD* LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
PROJECT* aProject = nullptr, const STRING_UTF8_MAP* aProperties, PROJECT* aProject = nullptr,
PROGRESS_REPORTER* aProgressReporter = nullptr ) override; PROGRESS_REPORTER* aProgressReporter = nullptr ) override;
const wxString GetFileExtension() const override; const wxString GetFileExtension() const override;

5
pcbnew/plugins/altium/altium_circuit_studio_plugin.cpp
View File

@ -62,8 +62,9 @@ const wxString ALTIUM_CIRCUIT_STUDIO_PLUGIN::GetFileExtension() const
} }
BOARD* ALTIUM_CIRCUIT_STUDIO_PLUGIN::Load( const wxString& aFileName, BOARD* aAppendToMe, BOARD* ALTIUM_CIRCUIT_STUDIO_PLUGIN::LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
const STRING_UTF8_MAP* aProperties, PROJECT* aProject, const STRING_UTF8_MAP* aProperties,
PROJECT* aProject,
PROGRESS_REPORTER* aProgressReporter ) PROGRESS_REPORTER* aProgressReporter )
{ {
m_props = aProperties; m_props = aProperties;

5
pcbnew/plugins/altium/altium_circuit_studio_plugin.h
View File

@ -33,8 +33,9 @@ class ALTIUM_CIRCUIT_STUDIO_PLUGIN : public PLUGIN
public: public:
const wxString PluginName() const override; const wxString PluginName() const override;
BOARD* Load( const wxString& aFileName, BOARD* aAppendToMe, const STRING_UTF8_MAP* aProperties, BOARD* LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
PROJECT* aProject, PROGRESS_REPORTER* aProgressReporter = nullptr ) override; const STRING_UTF8_MAP* aProperties, PROJECT* aProject,
PROGRESS_REPORTER* aProgressReporter = nullptr ) override;
const wxString GetFileExtension() const override; const wxString GetFileExtension() const override;

6
pcbnew/plugins/altium/altium_designer_plugin.cpp
View File

@ -50,9 +50,9 @@ ALTIUM_DESIGNER_PLUGIN::~ALTIUM_DESIGNER_PLUGIN()
} }
const wxString ALTIUM_DESIGNER_PLUGIN::PluginName() const BOARD* ALTIUM_DESIGNER_PLUGIN::LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
{ const STRING_UTF8_MAP* aProperties, PROJECT* aProject,
return wxT( "Altium Designer" ); PROGRESS_REPORTER* aProgressReporter )
} }

4
pcbnew/plugins/altium/altium_designer_plugin.h
View File

@ -35,8 +35,8 @@ public:
const wxString PluginName() const override; const wxString PluginName() const override;
BOARD* Load( const wxString& aFileName, BOARD* aAppendToMe, const STRING_UTF8_MAP* aProperties, BOARD* LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
PROJECT* aProject = nullptr, const STRING_UTF8_MAP* aProperties, PROJECT* aProject = nullptr,
PROGRESS_REPORTER* aProgressReporter = nullptr ) override; PROGRESS_REPORTER* aProgressReporter = nullptr ) override;
const wxString GetFileExtension() const override; const wxString GetFileExtension() const override;

2
pcbnew/plugins/altium/solidworks_pcb_plugin.cpp
View File

@ -52,7 +52,7 @@ const wxString SOLIDWORKS_PCB_PLUGIN::GetFileExtension() const
} }
BOARD* SOLIDWORKS_PCB_PLUGIN::Load( const wxString& aFileName, BOARD* aAppendToMe, BOARD* SOLIDWORKS_PCB_PLUGIN::LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
const STRING_UTF8_MAP* aProperties, PROJECT* aProject, const STRING_UTF8_MAP* aProperties, PROJECT* aProject,
PROGRESS_REPORTER* aProgressReporter ) PROGRESS_REPORTER* aProgressReporter )
{ {

4
pcbnew/plugins/altium/solidworks_pcb_plugin.h
View File

@ -28,8 +28,8 @@ class SOLIDWORKS_PCB_PLUGIN : public PLUGIN
public: public:
const wxString PluginName() const override; const wxString PluginName() const override;
BOARD* Load( const wxString& aFileName, BOARD* aAppendToMe, const STRING_UTF8_MAP* aProperties, BOARD* LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
PROJECT* aProject = nullptr, const STRING_UTF8_MAP* aProperties, PROJECT* aProject = nullptr,
PROGRESS_REPORTER* aProgressReporter = nullptr ) override; PROGRESS_REPORTER* aProgressReporter = nullptr ) override;
const wxString GetFileExtension() const override; const wxString GetFileExtension() const override;

2
pcbnew/plugins/cadstar/cadstar_pcb_archive_plugin.cpp
View File

@ -106,7 +106,7 @@ std::vector<FOOTPRINT*> CADSTAR_PCB_ARCHIVE_PLUGIN::GetImportedCachedLibraryFoot
} }
BOARD* CADSTAR_PCB_ARCHIVE_PLUGIN::Load( const wxString& aFileName, BOARD* aAppendToMe, BOARD* CADSTAR_PCB_ARCHIVE_PLUGIN::LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
const STRING_UTF8_MAP* aProperties, PROJECT* aProject, const STRING_UTF8_MAP* aProperties, PROJECT* aProject,
PROGRESS_REPORTER* aProgressReporter ) PROGRESS_REPORTER* aProgressReporter )
{ {

3
pcbnew/plugins/cadstar/cadstar_pcb_archive_plugin.h
View File

@ -46,6 +46,9 @@ public:
const wxString GetFileExtension() const override; const wxString GetFileExtension() const override;
BOARD* LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
const STRING_UTF8_MAP* aProperties = nullptr, PROJECT* aProject = nullptr,
PROGRESS_REPORTER* aProgressReporter = nullptr ) override;
std::vector<FOOTPRINT*> GetImportedCachedLibraryFootprints() override; std::vector<FOOTPRINT*> GetImportedCachedLibraryFootprints() override;

2
pcbnew/plugins/eagle/eagle_plugin.cpp
View File

@ -283,7 +283,7 @@ VECTOR2I inline EAGLE_PLUGIN::kicad_fontsize( const ECOORD& d, int aTextThicknes
} }
BOARD* EAGLE_PLUGIN::Load( const wxString& aFileName, BOARD* aAppendToMe, BOARD* EAGLE_PLUGIN::LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
const STRING_UTF8_MAP* aProperties, PROJECT* aProject, const STRING_UTF8_MAP* aProperties, PROJECT* aProject,
PROGRESS_REPORTER* aProgressReporter ) PROGRESS_REPORTER* aProgressReporter )
{ {

2
pcbnew/plugins/eagle/eagle_plugin.h
View File

@ -131,7 +131,7 @@ class EAGLE_PLUGIN : public PLUGIN, public LAYER_REMAPPABLE_PLUGIN
public: public:
const wxString PluginName() const override; const wxString PluginName() const override;
BOARD* Load( const wxString& aFileName, BOARD* aAppendToMe, BOARD* LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
const STRING_UTF8_MAP* aProperties = nullptr, PROJECT* aProject = nullptr, const STRING_UTF8_MAP* aProperties = nullptr, PROJECT* aProject = nullptr,
PROGRESS_REPORTER* aProgressReporter = nullptr ) override; PROGRESS_REPORTER* aProgressReporter = nullptr ) override;

2
pcbnew/plugins/fabmaster/fabmaster_plugin.cpp
View File

@ -57,7 +57,7 @@ const wxString FABMASTER_PLUGIN::GetFileExtension() const
} }
BOARD* FABMASTER_PLUGIN::Load( const wxString &aFileName, BOARD *aAppendToMe, BOARD* FABMASTER_PLUGIN::LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
const STRING_UTF8_MAP* aProperties, PROJECT* aProject, const STRING_UTF8_MAP* aProperties, PROJECT* aProject,
PROGRESS_REPORTER* aProgressReporter ) PROGRESS_REPORTER* aProgressReporter )
{ {

2
pcbnew/plugins/fabmaster/fabmaster_plugin.h
View File

@ -38,7 +38,7 @@ class FABMASTER_PLUGIN : public PLUGIN
public: public:
const wxString PluginName() const override; const wxString PluginName() const override;
BOARD* Load( const wxString& aFileName, BOARD* aAppendToMe, BOARD* LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
const STRING_UTF8_MAP* aProperties = nullptr, PROJECT* aProject = nullptr, const STRING_UTF8_MAP* aProperties = nullptr, PROJECT* aProject = nullptr,
PROGRESS_REPORTER* aProgressReporter = nullptr ) override; PROGRESS_REPORTER* aProgressReporter = nullptr ) override;

5
pcbnew/plugins/kicad/pcb_plugin.cpp
View File

@ -267,7 +267,8 @@ long long FP_CACHE::GetTimestamp( const wxString& aLibPath )
} }
void PCB_PLUGIN::Save( const wxString& aFileName, BOARD* aBoard, const STRING_UTF8_MAP* aProperties ) void PCB_PLUGIN::SaveBoard( const wxString& aFileName, BOARD* aBoard,
const STRING_UTF8_MAP* aProperties )
{ {
LOCALE_IO toggle; // toggles on, then off, the C locale. LOCALE_IO toggle; // toggles on, then off, the C locale.
@ -2255,7 +2256,7 @@ PCB_PLUGIN::~PCB_PLUGIN()
} }
BOARD* PCB_PLUGIN::Load( const wxString& aFileName, BOARD* aAppendToMe, BOARD* PCB_PLUGIN::LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
const STRING_UTF8_MAP* aProperties, PROJECT* aProject, const STRING_UTF8_MAP* aProperties, PROJECT* aProject,
PROGRESS_REPORTER* aProgressReporter ) PROGRESS_REPORTER* aProgressReporter )
{ {

4
pcbnew/plugins/kicad/pcb_plugin.h
View File

@ -282,10 +282,10 @@ public:
m_queryUserCallback = std::move( aCallback ); m_queryUserCallback = std::move( aCallback );
} }
void Save( const wxString& aFileName, BOARD* aBoard, void SaveBoard( const wxString& aFileName, BOARD* aBoard,
const STRING_UTF8_MAP* aProperties = nullptr ) override; const STRING_UTF8_MAP* aProperties = nullptr ) override;
BOARD* Load( const wxString& aFileName, BOARD* aAppendToMe, BOARD* LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
const STRING_UTF8_MAP* aProperties = nullptr, PROJECT* aProject = nullptr, const STRING_UTF8_MAP* aProperties = nullptr, PROJECT* aProject = nullptr,
PROGRESS_REPORTER* aProgressReporter = nullptr ) override; PROGRESS_REPORTER* aProgressReporter = nullptr ) override;

2
pcbnew/plugins/legacy/legacy_plugin.cpp
View File

@ -405,7 +405,7 @@ static inline long hexParse( const char* next, const char** out = nullptr )
} }
BOARD* LEGACY_PLUGIN::Load( const wxString& aFileName, BOARD* aAppendToMe, BOARD* LEGACY_PLUGIN::LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
const STRING_UTF8_MAP* aProperties, PROJECT* aProject, const STRING_UTF8_MAP* aProperties, PROJECT* aProject,
PROGRESS_REPORTER* aProgressReporter ) PROGRESS_REPORTER* aProgressReporter )
{ {

2
pcbnew/plugins/legacy/legacy_plugin.h
View File

@ -73,7 +73,7 @@ public:
return wxT( "brd" ); return wxT( "brd" );
} }
BOARD* Load( const wxString& aFileName, BOARD* aAppendToMe, BOARD* LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
const STRING_UTF8_MAP* aProperties = nullptr, PROJECT* aProject = nullptr, const STRING_UTF8_MAP* aProperties = nullptr, PROJECT* aProject = nullptr,
PROGRESS_REPORTER* aProgressReporter = nullptr ) override; PROGRESS_REPORTER* aProgressReporter = nullptr ) override;

2
pcbnew/plugins/pcad/pcad_plugin.cpp
View File

@ -66,7 +66,7 @@ const wxString PCAD_PLUGIN::GetFileExtension() const
} }
BOARD* PCAD_PLUGIN::Load( const wxString& aFileName, BOARD* aAppendToMe, BOARD* PCAD_PLUGIN::LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
const STRING_UTF8_MAP* aProperties, PROJECT* aProject, const STRING_UTF8_MAP* aProperties, PROJECT* aProject,
PROGRESS_REPORTER* aProgressReporter ) PROGRESS_REPORTER* aProgressReporter )
{ {

6
pcbnew/plugins/pcad/pcad_plugin.h
View File

@ -40,10 +40,8 @@ public:
const wxString PluginName() const override; const wxString PluginName() const override;
BOARD* Load( const wxString& aFileName, BOARD* LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
BOARD* aAppendToMe, const STRING_UTF8_MAP* aProperties = nullptr, PROJECT* aProject = nullptr,
const STRING_UTF8_MAP* aProperties = nullptr,
PROJECT* aProject = nullptr,
PROGRESS_REPORTER* aProgressReporter = nullptr ) override; PROGRESS_REPORTER* aProgressReporter = nullptr ) override;
const wxString GetFileExtension() const override; const wxString GetFileExtension() const override;

2
pcbnew/router/router_tool.cpp
View File

@ -616,7 +616,7 @@ void ROUTER_TOOL::saveRouterDebugLog()
PCB_PLUGIN pcb_io; PCB_PLUGIN pcb_io;
pcb_io.Save( fname_dump.GetFullPath(), m_iface->GetBoard(), nullptr ); pcb_io.SaveBoard( fname_dump.GetFullPath(), m_iface->GetBoard(), nullptr );
PROJECT* prj = m_iface->GetBoard()->GetProject(); PROJECT* prj = m_iface->GetBoard()->GetProject();
prj->GetProjectFile().SaveAs( cwd, "pns" ); prj->GetProjectFile().SaveAs( cwd, "pns" );

2
pcbnew/tools/pcb_control.cpp
View File

@ -1271,7 +1271,7 @@ int PCB_CONTROL::AppendBoard( PLUGIN& pi, wxString& fileName )
WX_PROGRESS_REPORTER progressReporter( editFrame, _( "Loading PCB" ), 1 ); WX_PROGRESS_REPORTER progressReporter( editFrame, _( "Loading PCB" ), 1 );
editFrame->GetDesignSettings().m_NetSettings->m_NetClasses.clear(); editFrame->GetDesignSettings().m_NetSettings->m_NetClasses.clear();
pi.Load( fileName, brd, &props, nullptr, &progressReporter ); pi.LoadBoard( fileName, brd, &props, nullptr, &progressReporter );
} }
catch( const IO_ERROR& ioe ) catch( const IO_ERROR& ioe )
{ {

2
qa/pcbnew_utils/board_file_utils.cpp
View File

@ -65,7 +65,7 @@ std::string GetPcbnewTestDataDir()
void DumpBoardToFile( BOARD& board, const std::string& aFilename ) void DumpBoardToFile( BOARD& board, const std::string& aFilename )
{ {
PCB_PLUGIN io; PCB_PLUGIN io;
io.Save( aFilename, &board ); io.SaveBoard( aFilename, &board );
} }

2
qa/tools/pns/pns_log_viewer_frame.cpp
View File

@ -898,7 +898,7 @@ static BOARD* loadBoard( const std::string& filename )
try try
{ {
brd = pi->Load( wxString( filename.c_str() ), nullptr, nullptr ); brd = pi->LoadBoard( wxString( filename.c_str() ), nullptr, nullptr );
} }
catch( const IO_ERROR& ) catch( const IO_ERROR& )
{ {