AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-05 00:25:20 +00:00
Files Issues Releases Activity

Rename PCB IO classes/files

Browse Source
This commit is contained in:
Ian McInerney 2023-12-24 01:21:58 +00:00
parent 85f62c1fde
commit e6632bb983
70 changed files with 614 additions and 629 deletions
common
CMakeLists.txt
view
view.cpp
include
pad_shapes.hptree.h
kicad
kicad_manager_frame.cpp
pcbnew
dialogs
panel_pcbnew_color_settings.cpp
files.cppfootprint_libraries_utils.cpp
git
kigit_pcb_merge.cpp
kicad_clipboard.cppkicad_clipboard.h
pcb_io
altium
CMakeLists.txtpcb_io_altium_circuit_maker.cpppcb_io_altium_circuit_maker.hpcb_io_altium_circuit_studio.cpppcb_io_altium_circuit_studio.hpcb_io_altium_designer.cpppcb_io_altium_designer.hpcb_io_solidworks.cpppcb_io_solidworks.h
cadstar
CMakeLists.txtcadstar_pcb_archive_loader.hpcb_io_cadstar_archive.cpppcb_io_cadstar_archive.h
eagle
pcb_io_eagle.cpppcb_io_eagle.h
easyeda
CMakeLists.txtpcb_io_easyeda_parser.cpppcb_io_easyeda_parser.hpcb_io_easyeda_plugin.cpppcb_io_easyeda_plugin.h
easyedapro
CMakeLists.txtpcb_io_easyedapro.cpppcb_io_easyedapro.hpcb_io_easyedapro_parser.cpppcb_io_easyedapro_parser.h
fabmaster
CMakeLists.txtpcb_io_fabmaster.cpppcb_io_fabmaster.h
geda
pcb_io_geda.cpppcb_io_geda.h
ipc2581
CMakeLists.txtpcb_io_ipc2581.cpppcb_io_ipc2581.h
kicad_legacy
pcb_io_kicad_legacy.cpppcb_io_kicad_legacy.h
kicad_sexpr
pcb_io_kicad_sexpr.cpppcb_io_kicad_sexpr.hpcb_io_kicad_sexpr_parser.cpppcb_io_kicad_sexpr_parser.h
pcad
CMakeLists.txtpcb_io_pcad.cpppcb_io_pcad.h
pcb_io_mgr.cpp
pcbnew_jobs_handler.cpp
python/swig
pcbnew.i
router
router_tool.cpp
tools
pcb_control.cpppcb_selection.cpp
qa
pcbnew_utils
board_file_utils.cpp
include/pcbnew_utils
board_file_utils.h
qa_utils
pcb_test_frame.cpp
tests/pcbnew
pcb_io
altium
test_altium_pcblib_import.cpp
cadstar
test_cadstar_footprints.cpp
eagle
test_eagle_lbr_import.cpp
test_prettifier.cpp
tools
libeval_compiler
libeval_compiler_test.cpp
pcbnew_tools/tools/pcb_parser
pcb_parser_tool.cpp
pns
pns_log_file.cpppns_log_viewer_frame.cpp

10
common/CMakeLists.txt
View File

@ -722,11 +722,11 @@ set( PCB_COMMON_SRCS
# IO files
${CMAKE_SOURCE_DIR}/pcbnew/pcb_io/pcb_io.cpp
${CMAKE_SOURCE_DIR}/pcbnew/pcb_io/pcb_io_mgr.cpp
${CMAKE_SOURCE_DIR}/pcbnew/pcb_io/legacy/legacy_plugin.cpp
${CMAKE_SOURCE_DIR}/pcbnew/pcb_io/kicad/pcb_plugin.cpp
${CMAKE_SOURCE_DIR}/pcbnew/pcb_io/kicad/pcb_parser.cpp
${CMAKE_SOURCE_DIR}/pcbnew/pcb_io/eagle/eagle_plugin.cpp
${CMAKE_SOURCE_DIR}/pcbnew/pcb_io/geda/gpcb_plugin.cpp
${CMAKE_SOURCE_DIR}/pcbnew/pcb_io/kicad_legacy/pcb_io_kicad_legacy.cpp
${CMAKE_SOURCE_DIR}/pcbnew/pcb_io/kicad_sexpr/pcb_io_kicad_sexpr.cpp
${CMAKE_SOURCE_DIR}/pcbnew/pcb_io/kicad_sexpr/pcb_io_kicad_sexpr_parser.cpp
${CMAKE_SOURCE_DIR}/pcbnew/pcb_io/eagle/pcb_io_eagle.cpp
${CMAKE_SOURCE_DIR}/pcbnew/pcb_io/geda/pcb_io_geda.cpp
${CMAKE_SOURCE_DIR}/pcbnew/tools/pcb_grid_helper.cpp
${CMAKE_SOURCE_DIR}/pcbnew/tools/pcb_actions.cpp

2
common/view/view.cpp
View File

@ -193,7 +193,7 @@ private:
for( int i = 0; i < aCount; ++i )
{
// this fires on some eagle board after EAGLE_PLUGIN::Load()
// this fires on some eagle board after PCB_IO_EAGLE::Load()
wxASSERT( unsigned( aLayers[i] ) <= unsigned( VIEW::VIEW_MAX_LAYERS ) );
m_layers.push_back( aLayers[i] );

2
include/pad_shapes.h
View File

@ -29,7 +29,7 @@
/**
* The set of pad shapes, used with PAD::{Set,Get}Shape()
*
* --> DO NOT REORDER, legacy_plugin is dependent on the integer values <--
* --> DO NOT REORDER, PCB_IO_KICAD_LEGACY is dependent on the integer values <--
*/
enum class PAD_SHAPE : int
{

2
include/ptree.h
View File

@ -40,7 +40,7 @@ grammar. The tipping point depends on whether you want to read only a small
portion of a much larger document. If so, then using the ptree will likely be a
"faster to code" route. Documentation on how to navigate a ptree can be found on
the boost website and there are a number of examples in the
pcbnew/eagle_plugin.cpp file in this project. Powerful path navigation support
pcbnew/pcb_io_eagle.cpp file in this project. Powerful path navigation support
makes it easy to extract a subset of a ptree.
*/

2
kicad/kicad_manager_frame.cpp
View File

@ -70,7 +70,7 @@
#include <update_manager.h>
#include <../pcbnew/pcb_io/kicad/pcb_plugin.h> // for SEXPR_BOARD_FILE_VERSION def
#include <../pcbnew/pcb_io/kicad_sexpr/pcb_io_kicad_sexpr.h> // for SEXPR_BOARD_FILE_VERSION def
#ifdef __WXMAC__

4
pcbnew/dialogs/panel_pcbnew_color_settings.cpp
View File

@ -32,7 +32,7 @@
#include <footprint_preview_panel.h>
#include <drawing_sheet/ds_proxy_view_item.h>
#include <pcb_painter.h>
#include <pcb_io/kicad/pcb_plugin.h>
#include <pcb_io/kicad_sexpr/pcb_io_kicad_sexpr.h>
#include <wx/treebook.h>
@ -793,7 +793,7 @@ void PANEL_PCBNEW_COLOR_SETTINGS::createPreviewItems()
m_page->SetWidthMils( 6000 );
STRING_LINE_READER reader( g_previewBoard, wxT( "preview" ) );
PCB_PLUGIN pi;
PCB_IO_KICAD_SEXPR pi;
try
{

6
pcbnew/files.cpp
View File

@ -58,8 +58,8 @@
#include <project/net_settings.h>
#include <io/common/plugin_common_choose_project.h>
#include <pcb_io/pcb_io_mgr.h>
#include <pcb_io/cadstar/cadstar_pcb_archive_plugin.h>
#include <pcb_io/kicad/pcb_plugin.h>
#include <pcb_io/cadstar/pcb_io_cadstar_archive.h>
#include <pcb_io/kicad_sexpr/pcb_io_kicad_sexpr.h>
#include <dialogs/dialog_export_2581.h>
#include <dialogs/dialog_imported_layers.h>
#include <dialogs/dialog_import_choose_project.h>
@ -653,7 +653,7 @@ bool PCB_EDIT_FRAME::OpenProjectFiles( const std::vector<wxString>& aFileSet, in
if( m_importProperties )
props.insert( m_importProperties->begin(), m_importProperties->end() );
// EAGLE_PLUGIN can use this info to center the BOARD, but it does not yet.
// PCB_IO_EAGLE can use this info to center the BOARD, but it does not yet.
props["page_width"] = std::to_string( GetPageSizeIU().x );
props["page_height"] = std::to_string( GetPageSizeIU().y );

6
pcbnew/footprint_libraries_utils.cpp
View File

@ -42,8 +42,8 @@
#include <board_commit.h>
#include <footprint_edit_frame.h>
#include <wildcards_and_files_ext.h>
#include <pcb_io/kicad/pcb_plugin.h>
#include <pcb_io/legacy/legacy_plugin.h>
#include <pcb_io/kicad_legacy/pcb_io_kicad_legacy.h>
#include <pcb_io/kicad_sexpr/pcb_io_kicad_sexpr.h>
#include <env_paths.h>
#include <paths.h>
#include <settings/settings_manager.h>
@ -250,7 +250,7 @@ void FOOTPRINT_EDIT_FRAME::ExportFootprint( FOOTPRINT* aFootprint )
// Export as *.kicad_pcb format, using a strategy which is specifically chosen
// as an example on how it could also be used to send it to the system clipboard.
PCB_PLUGIN pcb_io(CTL_FOR_LIBRARY );
PCB_IO_KICAD_SEXPR pcb_io(CTL_FOR_LIBRARY );
/* This footprint should *already* be "normalized" in a way such that
orientation is zero, etc., since it came from the Footprint Editor.

12
pcbnew/git/kigit_pcb_merge.cpp
View File

@ -23,8 +23,8 @@
#include "kigit_pcb_merge.h"
#include <pcb_io/kicad/pcb_plugin.h>
#include <pcb_io/kicad/pcb_parser.h>
#include <pcb_io/kicad_sexpr/pcb_io_kicad_sexpr.h>
#include <pcb_io/kicad_sexpr/pcb_io_kicad_sexpr_parser.h>
#include <richio.h>
#include <board.h>
@ -111,11 +111,11 @@ int KIGIT_PCB_MERGE::Merge()
// Get the raw data from the blobs
BLOB_READER ancestor_reader( ancestor_blob );
PCB_PARSER ancestor_parser( &ancestor_reader, nullptr, nullptr );
PCB_IO_KICAD_SEXPR_PARSER ancestor_parser( &ancestor_reader, nullptr, nullptr );
BLOB_READER ours_reader( ours_blob );
PCB_PARSER ours_parser( &ours_reader, nullptr, nullptr );
PCB_IO_KICAD_SEXPR_PARSER ours_parser( &ours_reader, nullptr, nullptr );
BLOB_READER theirs_reader( theirs_blob );
PCB_PARSER theirs_parser( &theirs_reader, nullptr, nullptr );
PCB_IO_KICAD_SEXPR_PARSER theirs_parser( &theirs_reader, nullptr, nullptr );
std::unique_ptr<BOARD> ancestor_board;
std::unique_ptr<BOARD> ours_board;
@ -167,7 +167,7 @@ std::unique_ptr<BOARD> readBoard( wxString& aFilename )
// Take input from stdin
FILE_LINE_READER reader( aFilename );
PCB_PARSER parser( &reader, nullptr, nullptr );
PCB_IO_KICAD_SEXPR_PARSER parser( &reader, nullptr, nullptr );
std::unique_ptr<BOARD> board;
try

10
pcbnew/kicad_clipboard.cpp
View File

@ -37,13 +37,13 @@
#include <zone.h>
#include <locale_io.h>
#include <netinfo.h>
#include <pcb_io/kicad/pcb_parser.h>
#include <pcb_io/kicad/pcb_plugin.h>
#include <pcb_io/kicad_sexpr/pcb_io_kicad_sexpr.h>
#include <pcb_io/kicad_sexpr/pcb_io_kicad_sexpr_parser.h>
#include <kicad_clipboard.h>
#include "confirm.h"
CLIPBOARD_IO::CLIPBOARD_IO():
PCB_PLUGIN(CTL_FOR_CLIPBOARD ),
PCB_IO_KICAD_SEXPR(CTL_FOR_CLIPBOARD ),
m_formatter()
{
m_out = &m_formatter;
@ -318,7 +318,7 @@ BOARD_ITEM* CLIPBOARD_IO::Parse()
try
{
item = PCB_PLUGIN::Parse( result );
item = PCB_IO_KICAD_SEXPR::Parse( result );
}
catch (...)
{
@ -411,7 +411,7 @@ BOARD* CLIPBOARD_IO::LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
};
STRING_LINE_READER reader( result, wxT( "clipboard" ) );
PCB_PARSER parser( &reader, aAppendToMe, queryUser );
PCB_IO_KICAD_SEXPR_PARSER parser( &reader, aAppendToMe, queryUser );
init( aProperties );

10
pcbnew/kicad_clipboard.h
View File

@ -32,20 +32,20 @@
#include <board_item.h>
#include <footprint.h>
#include <pcb_io/kicad/pcb_plugin.h>
#include <pcb_io/kicad/pcb_parser.h>
#include <pcb_io/kicad_sexpr/pcb_io_kicad_sexpr.h>
#include <pcb_io/kicad_sexpr/pcb_io_kicad_sexpr_parser.h>
#include <memory.h>
#include <tools/pcb_selection.h>
class CLIPBOARD_IO : public PCB_PLUGIN
class CLIPBOARD_IO : public PCB_IO_KICAD_SEXPR
{
public:
CLIPBOARD_IO();
~CLIPBOARD_IO();
/*
* Saves the entire board to the clipboard formatted using the PCB_PLUGIN formatting
* Saves the entire board to the clipboard formatted using the PCB_IO_KICAD_SEXPR formatting
*/
void SaveBoard( const wxString& aFileName, BOARD* aBoard,
const STRING_UTF8_MAP* aProperties = nullptr,
@ -53,7 +53,7 @@ public:
/*
* Write all the settings of the BOARD* set by setBoard() and then adds all the
* BOARD_ITEMs found in selection formatted by PCB_PLUGIN to clipboard as sexpr text
* BOARD_ITEMs found in selection formatted by PCB_IO_KICAD_SEXPR to clipboard as sexpr text
*/
void SaveSelection( const PCB_SELECTION& selected, bool isFootprintEditor );

8
pcbnew/pcb_io/altium/CMakeLists.txt
View File

@ -2,13 +2,13 @@
# Sources for the pcbnew PLUGIN called ALTIUM_DESIGNER_PLUGIN, ALTIUM_CIRCUIT_STUDIO_PLUGIN and ALTIUM_CIRCUIT_MAKER_PLUGIN
set( ALTIUM2PCBNEW_SRCS
altium_circuit_maker_plugin.cpp
altium_circuit_studio_plugin.cpp
altium_designer_plugin.cpp
altium_parser_pcb.cpp
altium_pcb.cpp
altium_rule_transformer.cpp
solidworks_pcb_plugin.cpp
pcb_io_altium_circuit_maker.cpp
pcb_io_altium_circuit_studio.cpp
pcb_io_altium_designer.cpp
pcb_io_solidworks.cpp
)
add_library( altium2pcbnew STATIC ${ALTIUM2PCBNEW_SRCS} )

21
pcbnew/pcb_io/altium/altium_circuit_maker_plugin.cpp → pcbnew/pcb_io/altium/pcb_io_altium_circuit_maker.cpp
View File

@ -23,14 +23,13 @@
*/
/**
* @file altium_circuit_maker_plugin.cpp
* @brief Pcbnew PLUGIN for Altium *.PcbDoc format.
* @brief Pcbnew PLUGIN for Altium *.PcbDoc format.
*/
#include <wx/string.h>
#include <altium_circuit_maker_plugin.h>
#include <altium_designer_plugin.h>
#include <pcb_io_altium_circuit_maker.h>
#include <pcb_io_altium_designer.h>
#include <altium_pcb.h>
#include <io/altium/altium_parser.h>
#include <pcb_io/pcb_io.h>
@ -40,40 +39,40 @@
#include <compoundfilereader.h>
#include <utf.h>
ALTIUM_CIRCUIT_MAKER_PLUGIN::ALTIUM_CIRCUIT_MAKER_PLUGIN()
PCB_IO_ALTIUM_CIRCUIT_MAKER::PCB_IO_ALTIUM_CIRCUIT_MAKER()
{
m_board = nullptr;
m_props = nullptr;
}
ALTIUM_CIRCUIT_MAKER_PLUGIN::~ALTIUM_CIRCUIT_MAKER_PLUGIN()
PCB_IO_ALTIUM_CIRCUIT_MAKER::~PCB_IO_ALTIUM_CIRCUIT_MAKER()
{
}
const wxString ALTIUM_CIRCUIT_MAKER_PLUGIN::PluginName() const
const wxString PCB_IO_ALTIUM_CIRCUIT_MAKER::PluginName() const
{
return wxT( "Altium Circuit Maker" );
}
PLUGIN_FILE_DESC ALTIUM_CIRCUIT_MAKER_PLUGIN::GetBoardFileDesc() const
PLUGIN_FILE_DESC PCB_IO_ALTIUM_CIRCUIT_MAKER::GetBoardFileDesc() const
{
return PLUGIN_FILE_DESC( _HKI( "Altium Circuit Maker PCB files" ), { "CMPcbDoc" } );
}
bool ALTIUM_CIRCUIT_MAKER_PLUGIN::CanReadBoard( const wxString& aFileName ) const
bool PCB_IO_ALTIUM_CIRCUIT_MAKER::CanReadBoard( const wxString& aFileName ) const
{
if( !PCB_IO::CanReadBoard( aFileName ) )
return false;
return ALTIUM_DESIGNER_PLUGIN::checkFileHeader( aFileName );
return PCB_IO_ALTIUM_DESIGNER::checkFileHeader( aFileName );
}
BOARD* ALTIUM_CIRCUIT_MAKER_PLUGIN::LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
BOARD* PCB_IO_ALTIUM_CIRCUIT_MAKER::LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
const STRING_UTF8_MAP* aProperties,
PROJECT* aProject,
PROGRESS_REPORTER* aProgressReporter )

12
pcbnew/pcb_io/altium/altium_circuit_maker_plugin.h → pcbnew/pcb_io/altium/pcb_io_altium_circuit_maker.h
View File

@ -22,14 +22,14 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef ALTIUM_CIRCUIT_MAKER_PLUGIN_H_
#define ALTIUM_CIRCUIT_MAKER_PLUGIN_H_
#ifndef PCB_IO_ALTIUM_CIRCUIT_MAKER_H_
#define PCB_IO_ALTIUM_CIRCUIT_MAKER_H_
#include <pcb_io/pcb_io.h>
#include <pcb_io/pcb_io_mgr.h>
class ALTIUM_CIRCUIT_MAKER_PLUGIN : public PCB_IO
class PCB_IO_ALTIUM_CIRCUIT_MAKER : public PCB_IO
{
public:
const wxString PluginName() const override;
@ -48,12 +48,12 @@ public:
return 0;
}
ALTIUM_CIRCUIT_MAKER_PLUGIN();
~ALTIUM_CIRCUIT_MAKER_PLUGIN();
PCB_IO_ALTIUM_CIRCUIT_MAKER();
~PCB_IO_ALTIUM_CIRCUIT_MAKER();
private:
const STRING_UTF8_MAP* m_props;
BOARD* m_board;
};
#endif // ALTIUM_CIRCUIT_MAKER_PLUGIN_H_
#endif // PCB_IO_ALTIUM_CIRCUIT_MAKER_H_

21
pcbnew/pcb_io/altium/altium_circuit_studio_plugin.cpp → pcbnew/pcb_io/altium/pcb_io_altium_circuit_studio.cpp
View File

@ -23,14 +23,13 @@
*/
/**
* @file altium_circuit_studio_plugin.cpp
* @brief Pcbnew PLUGIN for Altium *.PcbDoc format.
* @brief Pcbnew PLUGIN for Altium *.PcbDoc format.
*/
#include <wx/string.h>
#include <altium_circuit_studio_plugin.h>
#include <altium_designer_plugin.h>
#include <pcb_io_altium_circuit_studio.h>
#include <pcb_io_altium_designer.h>
#include <altium_pcb.h>
#include <io/altium/altium_parser.h>
#include <pcb_io/pcb_io.h>
@ -40,40 +39,40 @@
#include <compoundfilereader.h>
#include <utf.h>
ALTIUM_CIRCUIT_STUDIO_PLUGIN::ALTIUM_CIRCUIT_STUDIO_PLUGIN()
PCB_IO_ALTIUM_CIRCUIT_STUDIO::PCB_IO_ALTIUM_CIRCUIT_STUDIO()
{
m_board = nullptr;
m_props = nullptr;
}
ALTIUM_CIRCUIT_STUDIO_PLUGIN::~ALTIUM_CIRCUIT_STUDIO_PLUGIN()
PCB_IO_ALTIUM_CIRCUIT_STUDIO::~PCB_IO_ALTIUM_CIRCUIT_STUDIO()
{
}
const wxString ALTIUM_CIRCUIT_STUDIO_PLUGIN::PluginName() const
const wxString PCB_IO_ALTIUM_CIRCUIT_STUDIO::PluginName() const
{
return wxT( "Altium Circuit Studio" );
}
PLUGIN_FILE_DESC ALTIUM_CIRCUIT_STUDIO_PLUGIN::GetBoardFileDesc() const
PLUGIN_FILE_DESC PCB_IO_ALTIUM_CIRCUIT_STUDIO::GetBoardFileDesc() const
{
return PLUGIN_FILE_DESC( _HKI( "Altium Circuit Studio PCB files" ), { "CSPcbDoc" } );
}
bool ALTIUM_CIRCUIT_STUDIO_PLUGIN::CanReadBoard( const wxString& aFileName ) const
bool PCB_IO_ALTIUM_CIRCUIT_STUDIO::CanReadBoard( const wxString& aFileName ) const
{
if( !PCB_IO::CanReadBoard( aFileName ) )
return false;
return ALTIUM_DESIGNER_PLUGIN::checkFileHeader( aFileName );
return PCB_IO_ALTIUM_DESIGNER::checkFileHeader( aFileName );
}
BOARD* ALTIUM_CIRCUIT_STUDIO_PLUGIN::LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
BOARD* PCB_IO_ALTIUM_CIRCUIT_STUDIO::LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
const STRING_UTF8_MAP* aProperties,
PROJECT* aProject,
PROGRESS_REPORTER* aProgressReporter )

12
pcbnew/pcb_io/altium/altium_circuit_studio_plugin.h → pcbnew/pcb_io/altium/pcb_io_altium_circuit_studio.h
View File

@ -22,13 +22,13 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef ALTIUM_CIRCUIT_STUDIO_PLUGIN_H_
#define ALTIUM_CIRCUIT_STUDIO_PLUGIN_H_
#ifndef PCB_IO_ALTIUM_CIRCUIT_STUDIO_H_
#define PCB_IO_ALTIUM_CIRCUIT_STUDIO_H_
#include <pcb_io/pcb_io.h>
#include <pcb_io/pcb_io_mgr.h>
class ALTIUM_CIRCUIT_STUDIO_PLUGIN : public PCB_IO
class PCB_IO_ALTIUM_CIRCUIT_STUDIO : public PCB_IO
{
public:
const wxString PluginName() const override;
@ -47,12 +47,12 @@ public:
return 0;
}
ALTIUM_CIRCUIT_STUDIO_PLUGIN();
~ALTIUM_CIRCUIT_STUDIO_PLUGIN();
PCB_IO_ALTIUM_CIRCUIT_STUDIO();
~PCB_IO_ALTIUM_CIRCUIT_STUDIO();
private:
const STRING_UTF8_MAP* m_props;
BOARD* m_board;
};
#endif // ALTIUM_CIRCUIT_STUDIO_PLUGIN_H_
#endif // PCB_IO_ALTIUM_CIRCUIT_STUDIO_H_

23
pcbnew/pcb_io/altium/altium_designer_plugin.cpp → pcbnew/pcb_io/altium/pcb_io_altium_designer.cpp
View File

@ -23,13 +23,12 @@
*/
/**
* @file altium_designer_plugin.cpp
* @brief Pcbnew PLUGIN for Altium *.PcbDoc format.
*/
#include <wx/string.h>
#include <altium_designer_plugin.h>
#include <pcb_io_altium_designer.h>
#include <altium_pcb.h>
#include <io/io_utils.h>
#include <io/altium/altium_parser.h>
@ -40,26 +39,26 @@
#include <compoundfilereader.h>
#include <utf.h>
ALTIUM_DESIGNER_PLUGIN::ALTIUM_DESIGNER_PLUGIN()
PCB_IO_ALTIUM_DESIGNER::PCB_IO_ALTIUM_DESIGNER()
{
m_board = nullptr;
m_props = nullptr;
}
ALTIUM_DESIGNER_PLUGIN::~ALTIUM_DESIGNER_PLUGIN()
PCB_IO_ALTIUM_DESIGNER::~PCB_IO_ALTIUM_DESIGNER()
{
}
bool ALTIUM_DESIGNER_PLUGIN::checkFileHeader( const wxString& aFileName )
bool PCB_IO_ALTIUM_DESIGNER::checkFileHeader( const wxString& aFileName )
{
// Compound File Binary Format header
return IO_UTILS::fileStartsWithBinaryHeader( aFileName, IO_UTILS::COMPOUND_FILE_HEADER );
}
bool ALTIUM_DESIGNER_PLUGIN::CanReadBoard( const wxString& aFileName ) const
bool PCB_IO_ALTIUM_DESIGNER::CanReadBoard( const wxString& aFileName ) const
{
if( !PCB_IO::CanReadBoard( aFileName ) )
return false;
@ -68,7 +67,7 @@ bool ALTIUM_DESIGNER_PLUGIN::CanReadBoard( const wxString& aFileName ) const
}
bool ALTIUM_DESIGNER_PLUGIN::CanReadFootprintLib( const wxString& aFileName ) const
bool PCB_IO_ALTIUM_DESIGNER::CanReadFootprintLib( const wxString& aFileName ) const
{
if( !PCB_IO::CanReadFootprintLib( aFileName ) )
return false;
@ -77,7 +76,7 @@ bool ALTIUM_DESIGNER_PLUGIN::CanReadFootprintLib( const wxString& aFileName ) co
}
BOARD* ALTIUM_DESIGNER_PLUGIN::LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
BOARD* PCB_IO_ALTIUM_DESIGNER::LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
const STRING_UTF8_MAP* aProperties, PROJECT* aProject,
PROGRESS_REPORTER* aProgressReporter )
{
@ -132,7 +131,7 @@ BOARD* ALTIUM_DESIGNER_PLUGIN::LoadBoard( const wxString& aFileName, BOARD* aApp
}
long long ALTIUM_DESIGNER_PLUGIN::GetLibraryTimestamp( const wxString& aLibraryPath ) const
long long PCB_IO_ALTIUM_DESIGNER::GetLibraryTimestamp( const wxString& aLibraryPath ) const
{
// File hasn't been loaded yet.
if( aLibraryPath.IsEmpty() )
@ -153,7 +152,7 @@ long long ALTIUM_DESIGNER_PLUGIN::GetLibraryTimestamp( const wxString& aLibraryP
}
void ALTIUM_DESIGNER_PLUGIN::loadAltiumLibrary( const wxString& aLibraryPath )
void PCB_IO_ALTIUM_DESIGNER::loadAltiumLibrary( const wxString& aLibraryPath )
{
try
{
@ -186,7 +185,7 @@ void ALTIUM_DESIGNER_PLUGIN::loadAltiumLibrary( const wxString& aLibraryPath )
}
void ALTIUM_DESIGNER_PLUGIN::FootprintEnumerate( wxArrayString& aFootprintNames,
void PCB_IO_ALTIUM_DESIGNER::FootprintEnumerate( wxArrayString& aFootprintNames,
const wxString& aLibraryPath, bool aBestEfforts,
const STRING_UTF8_MAP* aProperties )
{
@ -261,7 +260,7 @@ void ALTIUM_DESIGNER_PLUGIN::FootprintEnumerate( wxArrayString& aFootprintNames
}
FOOTPRINT* ALTIUM_DESIGNER_PLUGIN::FootprintLoad( const wxString& aLibraryPath,
FOOTPRINT* PCB_IO_ALTIUM_DESIGNER::FootprintLoad( const wxString& aLibraryPath,
const wxString& aFootprintName, bool aKeepUUID,
const STRING_UTF8_MAP* aProperties )
{

12
pcbnew/pcb_io/altium/altium_designer_plugin.h → pcbnew/pcb_io/altium/pcb_io_altium_designer.h
View File

@ -22,8 +22,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef ALTIUM_DESIGNER_PLUGIN_H_
#define ALTIUM_DESIGNER_PLUGIN_H_
#ifndef PCB_IO_ALTIUM_DESIGNER_H_
#define PCB_IO_ALTIUM_DESIGNER_H_
#include <pcb_io/pcb_io.h>
#include <pcb_io/pcb_io_mgr.h>
@ -33,7 +33,7 @@
class ALTIUM_COMPOUND_FILE;
class ALTIUM_DESIGNER_PLUGIN : public PCB_IO
class PCB_IO_ALTIUM_DESIGNER : public PCB_IO
{
public:
// -----<PUBLIC PCB_IO API>--------------------------------------------------
@ -75,8 +75,8 @@ public:
// -----</PUBLIC PCB_IO API>-------------------------------------------------
ALTIUM_DESIGNER_PLUGIN();
~ALTIUM_DESIGNER_PLUGIN();
PCB_IO_ALTIUM_DESIGNER();
~PCB_IO_ALTIUM_DESIGNER();
static bool checkFileHeader( const wxString& aFileName );
@ -89,4 +89,4 @@ private:
void loadAltiumLibrary( const wxString& aLibraryPath );
};
#endif // ALTIUM_DESIGNER_PLUGIN_H_
#endif // PCB_IO_ALTIUM_DESIGNER_H_

18
pcbnew/pcb_io/altium/solidworks_pcb_plugin.cpp → pcbnew/pcb_io/altium/pcb_io_solidworks.cpp
View File

@ -19,8 +19,8 @@
#include <wx/string.h>
#include <solidworks_pcb_plugin.h>
#include <altium_designer_plugin.h>
#include <pcb_io_solidworks.h>
#include <pcb_io_altium_designer.h>
#include <altium_pcb.h>
#include <io/altium/altium_parser.h>
#include <pcb_io/pcb_io.h>
@ -30,40 +30,40 @@
#include <compoundfilereader.h>
#include <utf.h>
SOLIDWORKS_PCB_PLUGIN::SOLIDWORKS_PCB_PLUGIN()
PCB_IO_SOLIDWORKS::PCB_IO_SOLIDWORKS()
{
m_board = nullptr;
m_props = nullptr;
}
SOLIDWORKS_PCB_PLUGIN::~SOLIDWORKS_PCB_PLUGIN()
PCB_IO_SOLIDWORKS::~PCB_IO_SOLIDWORKS()
{
}
const wxString SOLIDWORKS_PCB_PLUGIN::PluginName() const
const wxString PCB_IO_SOLIDWORKS::PluginName() const
{
return wxT( "Solidworks PCB" );
}
PLUGIN_FILE_DESC SOLIDWORKS_PCB_PLUGIN::GetBoardFileDesc() const
PLUGIN_FILE_DESC PCB_IO_SOLIDWORKS::GetBoardFileDesc() const
{
return PLUGIN_FILE_DESC( _HKI( "Solidworks PCB files" ), { "SWPcbDoc" } );
}
bool SOLIDWORKS_PCB_PLUGIN::CanReadBoard( const wxString& aFileName ) const
bool PCB_IO_SOLIDWORKS::CanReadBoard( const wxString& aFileName ) const
{
if( !PCB_IO::CanReadBoard( aFileName ) )
return false;
return ALTIUM_DESIGNER_PLUGIN::checkFileHeader( aFileName );
return PCB_IO_ALTIUM_DESIGNER::checkFileHeader( aFileName );
}
BOARD* SOLIDWORKS_PCB_PLUGIN::LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
BOARD* PCB_IO_SOLIDWORKS::LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
const STRING_UTF8_MAP* aProperties, PROJECT* aProject,
PROGRESS_REPORTER* aProgressReporter )
{

12
pcbnew/pcb_io/altium/solidworks_pcb_plugin.h → pcbnew/pcb_io/altium/pcb_io_solidworks.h
View File

@ -17,13 +17,13 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef KICAD_SOLIDWORKS_PCB_PLUGIN_H
#define KICAD_SOLIDWORKS_PCB_PLUGIN_H
#ifndef PCB_IO_SOLIDWORKS_H_
#define PCB_IO_SOLIDWORKS_H_
#include <pcb_io/pcb_io.h>
#include <pcb_io/pcb_io_mgr.h>
class SOLIDWORKS_PCB_PLUGIN : public PCB_IO
class PCB_IO_SOLIDWORKS : public PCB_IO
{
public:
const wxString PluginName() const override;
@ -41,8 +41,8 @@ public:
return 0;
}
SOLIDWORKS_PCB_PLUGIN();
~SOLIDWORKS_PCB_PLUGIN();
PCB_IO_SOLIDWORKS();
~PCB_IO_SOLIDWORKS();
private:
const STRING_UTF8_MAP* m_props;
@ -51,4 +51,4 @@ private:
#endif //KICAD_SOLIDWORKS_PCB_PLUGIN_H
#endif //PCB_IO_SOLIDWORKS_H_

2
pcbnew/pcb_io/cadstar/CMakeLists.txt
View File

@ -2,9 +2,9 @@
include_directories( . )
set( CADSTAR2PCBNEW_SRCS
cadstar_pcb_archive_plugin.cpp
cadstar_pcb_archive_parser.cpp
cadstar_pcb_archive_loader.cpp
pcb_io_cadstar_archive.cpp
)
add_library( cadstar2pcbnew STATIC ${CADSTAR2PCBNEW_SRCS} )

2
pcbnew/pcb_io/cadstar/cadstar_pcb_archive_loader.h
View File

@ -27,7 +27,7 @@
#define CADSTAR_PCB_ARCHIVE_LOADER_H_
#include <cadstar_pcb_archive_parser.h>
#include <cadstar_pcb_archive_plugin.h>
#include <pcb_io_cadstar_archive.h>
#include <board.h>
#include <footprint.h>

37
pcbnew/pcb_io/cadstar/cadstar_pcb_archive_plugin.cpp → pcbnew/pcb_io/cadstar/pcb_io_cadstar_archive.cpp
View File

@ -19,13 +19,12 @@
*/
/**
* @file cadstar_pcb_archive_plugin.cpp
* @brief Pcbnew PLUGIN for CADSTAR PCB Archive (*.cpa) format: an ASCII format
* based on S-expressions.
*/
#include <cadstar_pcb_archive_loader.h>
#include <cadstar_pcb_archive_plugin.h>
#include <pcb_io_cadstar_archive.h>
#include <board.h>
#include <footprint.h>
#include <string_utf8_map.h>
@ -33,7 +32,7 @@
#include <pcb_io/pcb_io.h>
std::map<wxString, PCB_LAYER_ID> CADSTAR_PCB_ARCHIVE_PLUGIN::DefaultLayerMappingCallback(
std::map<wxString, PCB_LAYER_ID> PCB_IO_CADSTAR_ARCHIVE::DefaultLayerMappingCallback(
const std::vector<INPUT_LAYER_DESC>& aInputLayerDescriptionVector )
{
std::map<wxString, PCB_LAYER_ID> retval;
@ -48,7 +47,7 @@ std::map<wxString, PCB_LAYER_ID> CADSTAR_PCB_ARCHIVE_PLUGIN::DefaultLayerMapping
}
void CADSTAR_PCB_ARCHIVE_PLUGIN::RegisterLayerMappingCallback(
void PCB_IO_CADSTAR_ARCHIVE::RegisterLayerMappingCallback(
LAYER_MAPPING_HANDLER aLayerMappingHandler )
{
LAYER_REMAPPABLE_PLUGIN::RegisterLayerMappingCallback( aLayerMappingHandler );
@ -56,23 +55,23 @@ void CADSTAR_PCB_ARCHIVE_PLUGIN::RegisterLayerMappingCallback(
}
CADSTAR_PCB_ARCHIVE_PLUGIN::CADSTAR_PCB_ARCHIVE_PLUGIN()
PCB_IO_CADSTAR_ARCHIVE::PCB_IO_CADSTAR_ARCHIVE()
{
m_board = nullptr;
m_props = nullptr;
m_show_layer_mapping_warnings = true;
LAYER_REMAPPABLE_PLUGIN::RegisterLayerMappingCallback(
CADSTAR_PCB_ARCHIVE_PLUGIN::DefaultLayerMappingCallback );
PCB_IO_CADSTAR_ARCHIVE::DefaultLayerMappingCallback );
}
CADSTAR_PCB_ARCHIVE_PLUGIN::~CADSTAR_PCB_ARCHIVE_PLUGIN()
PCB_IO_CADSTAR_ARCHIVE::~PCB_IO_CADSTAR_ARCHIVE()
{
clearLoadedFootprints();
}
void CADSTAR_PCB_ARCHIVE_PLUGIN::clearLoadedFootprints()
void PCB_IO_CADSTAR_ARCHIVE::clearLoadedFootprints()
{
for( FOOTPRINT* fp : m_loaded_footprints )
{
@ -83,7 +82,7 @@ void CADSTAR_PCB_ARCHIVE_PLUGIN::clearLoadedFootprints()
}
std::vector<FOOTPRINT*> CADSTAR_PCB_ARCHIVE_PLUGIN::GetImportedCachedLibraryFootprints()
std::vector<FOOTPRINT*> PCB_IO_CADSTAR_ARCHIVE::GetImportedCachedLibraryFootprints()
{
std::vector<FOOTPRINT*> retval;
@ -96,7 +95,7 @@ std::vector<FOOTPRINT*> CADSTAR_PCB_ARCHIVE_PLUGIN::GetImportedCachedLibraryFoot
}
BOARD* CADSTAR_PCB_ARCHIVE_PLUGIN::LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
BOARD* PCB_IO_CADSTAR_ARCHIVE::LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
const STRING_UTF8_MAP* aProperties, PROJECT* aProject,
PROGRESS_REPORTER* aProgressReporter )
{
@ -139,13 +138,13 @@ BOARD* CADSTAR_PCB_ARCHIVE_PLUGIN::LoadBoard( const wxString& aFileName, BOARD*
}
bool CADSTAR_PCB_ARCHIVE_PLUGIN::checkBoardHeader( const wxString& aFileName ) const
bool PCB_IO_CADSTAR_ARCHIVE::checkBoardHeader( const wxString& aFileName ) const
{
return IO_UTILS::fileStartsWithPrefix( aFileName, wxT( "(CADSTARPCB" ), true );
}
bool CADSTAR_PCB_ARCHIVE_PLUGIN::CanReadBoard( const wxString& aFileName ) const
bool PCB_IO_CADSTAR_ARCHIVE::CanReadBoard( const wxString& aFileName ) const
{
if( !PCB_IO::CanReadBoard( aFileName ) )
return false;
@ -154,7 +153,7 @@ bool CADSTAR_PCB_ARCHIVE_PLUGIN::CanReadBoard( const wxString& aFileName ) const
}
bool CADSTAR_PCB_ARCHIVE_PLUGIN::CanReadFootprintLib( const wxString& aFileName ) const
bool PCB_IO_CADSTAR_ARCHIVE::CanReadFootprintLib( const wxString& aFileName ) const
{
if( !PCB_IO::CanReadFootprintLib( aFileName ) )
return false;
@ -163,7 +162,7 @@ bool CADSTAR_PCB_ARCHIVE_PLUGIN::CanReadFootprintLib( const wxString& aFileName
}
bool CADSTAR_PCB_ARCHIVE_PLUGIN::CanReadFootprint( const wxString& aFileName ) const
bool PCB_IO_CADSTAR_ARCHIVE::CanReadFootprint( const wxString& aFileName ) const
{
if( !PCB_IO::CanReadFootprint( aFileName ) )
return false;
@ -172,7 +171,7 @@ bool CADSTAR_PCB_ARCHIVE_PLUGIN::CanReadFootprint( const wxString& aFileName ) c
}
void CADSTAR_PCB_ARCHIVE_PLUGIN::FootprintEnumerate( wxArrayString& aFootprintNames,
void PCB_IO_CADSTAR_ARCHIVE::FootprintEnumerate( wxArrayString& aFootprintNames,
const wxString& aLibraryPath,
bool aBestEfforts,
const STRING_UTF8_MAP* aProperties )
@ -187,7 +186,7 @@ void CADSTAR_PCB_ARCHIVE_PLUGIN::FootprintEnumerate( wxArrayString& aFoo
}
bool CADSTAR_PCB_ARCHIVE_PLUGIN::FootprintExists( const wxString& aLibraryPath,
bool PCB_IO_CADSTAR_ARCHIVE::FootprintExists( const wxString& aLibraryPath,
const wxString& aFootprintName,
const STRING_UTF8_MAP* aProperties )
{
@ -203,7 +202,7 @@ bool CADSTAR_PCB_ARCHIVE_PLUGIN::FootprintExists( const wxString& aLibrar
}
FOOTPRINT* CADSTAR_PCB_ARCHIVE_PLUGIN::FootprintLoad( const wxString& aLibraryPath,
FOOTPRINT* PCB_IO_CADSTAR_ARCHIVE::FootprintLoad( const wxString& aLibraryPath,
const wxString& aFootprintName,
bool aKeepUUID,
const STRING_UTF8_MAP* aProperties )
@ -223,7 +222,7 @@ FOOTPRINT* CADSTAR_PCB_ARCHIVE_PLUGIN::FootprintLoad( const wxString& aLi
}
long long CADSTAR_PCB_ARCHIVE_PLUGIN::GetLibraryTimestamp( const wxString& aLibraryPath ) const
long long PCB_IO_CADSTAR_ARCHIVE::GetLibraryTimestamp( const wxString& aLibraryPath ) const
{
wxFileName fn( aLibraryPath );
@ -234,7 +233,7 @@ long long CADSTAR_PCB_ARCHIVE_PLUGIN::GetLibraryTimestamp( const wxString& aLibr
}
void CADSTAR_PCB_ARCHIVE_PLUGIN::ensureLoadedLibrary( const wxString& aLibraryPath )
void PCB_IO_CADSTAR_ARCHIVE::ensureLoadedLibrary( const wxString& aLibraryPath )
{
if( m_cache.count( aLibraryPath ) )
{

12
pcbnew/pcb_io/cadstar/cadstar_pcb_archive_plugin.h → pcbnew/pcb_io/cadstar/pcb_io_cadstar_archive.h
View File

@ -18,12 +18,6 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* @file cadstar_pcb_archive_plugin.h
* @brief Pcbnew #PLUGIN for CADSTAR PCB Archive (*.cpa) format: an ASCII format
* based on S-expressions.
*/
#ifndef CADSTAR_ARCHIVE_PLUGIN_H_
#define CADSTAR_ARCHIVE_PLUGIN_H_
@ -35,7 +29,7 @@
#include <memory>
class CADSTAR_PCB_ARCHIVE_PLUGIN : public PCB_IO, public LAYER_REMAPPABLE_PLUGIN
class PCB_IO_CADSTAR_ARCHIVE : public PCB_IO, public LAYER_REMAPPABLE_PLUGIN
{
public:
const wxString PluginName() const override { return wxT( "CADSTAR PCB Archive" ); }
@ -95,8 +89,8 @@ public:
*/
bool IsFootprintLibWritable( const wxString& aLibraryPath ) override { return false; }
CADSTAR_PCB_ARCHIVE_PLUGIN();
~CADSTAR_PCB_ARCHIVE_PLUGIN();
PCB_IO_CADSTAR_ARCHIVE();
~PCB_IO_CADSTAR_ARCHIVE();
private:
void clearLoadedFootprints();

102
pcbnew/pcb_io/eagle/eagle_plugin.cpp → pcbnew/pcb_io/eagle/pcb_io_eagle.cpp
View File

@ -79,7 +79,7 @@ Load() TODO's
#include <pcb_dimension.h>
#include <pcb_io/pcb_io.h>
#include <pcb_io/eagle/eagle_plugin.h>
#include <pcb_io/eagle/pcb_io_eagle.h>
using namespace std;
@ -117,7 +117,7 @@ static wxString makeKey( const wxString& aFirst, const wxString& aSecond )
}
void EAGLE_PLUGIN::setKeepoutSettingsToZone( ZONE* aZone, int aLayer ) const
void PCB_IO_EAGLE::setKeepoutSettingsToZone( ZONE* aZone, int aLayer ) const
{
if( aLayer == EAGLE_LAYER::TRESTRICT || aLayer == EAGLE_LAYER::BRESTRICT )
{
@ -220,7 +220,7 @@ void ERULES::parse( wxXmlNode* aRules, std::function<void()> aCheckpoint )
}
EAGLE_PLUGIN::EAGLE_PLUGIN() :
PCB_IO_EAGLE::PCB_IO_EAGLE() :
m_rules( new ERULES() ),
m_xpath( new XPATH() ),
m_progressReporter( nullptr ),
@ -233,12 +233,12 @@ EAGLE_PLUGIN::EAGLE_PLUGIN() :
init( nullptr );
clear_cu_map();
RegisterLayerMappingCallback( std::bind( &EAGLE_PLUGIN::DefaultLayerMappingCallback,
RegisterLayerMappingCallback( std::bind( &PCB_IO_EAGLE::DefaultLayerMappingCallback,
this, _1 ) );
}
EAGLE_PLUGIN::~EAGLE_PLUGIN()
PCB_IO_EAGLE::~PCB_IO_EAGLE()
{
deleteTemplates();
delete m_rules;
@ -246,7 +246,7 @@ EAGLE_PLUGIN::~EAGLE_PLUGIN()
}
bool EAGLE_PLUGIN::CanReadBoard( const wxString& aFileName ) const
bool PCB_IO_EAGLE::CanReadBoard( const wxString& aFileName ) const
{
if( !PCB_IO::CanReadBoard( aFileName ) )
return false;
@ -255,7 +255,7 @@ bool EAGLE_PLUGIN::CanReadBoard( const wxString& aFileName ) const
}
bool EAGLE_PLUGIN::CanReadFootprintLib( const wxString& aFileName ) const
bool PCB_IO_EAGLE::CanReadFootprintLib( const wxString& aFileName ) const
{
if( !PCB_IO::CanReadFootprintLib( aFileName ) )
return false;
@ -264,13 +264,13 @@ bool EAGLE_PLUGIN::CanReadFootprintLib( const wxString& aFileName ) const
}
bool EAGLE_PLUGIN::CanReadFootprint( const wxString& aFileName ) const
bool PCB_IO_EAGLE::CanReadFootprint( const wxString& aFileName ) const
{
return CanReadFootprintLib( aFileName );
}
bool EAGLE_PLUGIN::checkHeader(const wxString& aFileName) const
bool PCB_IO_EAGLE::checkHeader(const wxString& aFileName) const
{
wxFileInputStream input( aFileName );
@ -292,7 +292,7 @@ bool EAGLE_PLUGIN::checkHeader(const wxString& aFileName) const
}
void EAGLE_PLUGIN::checkpoint()
void PCB_IO_EAGLE::checkpoint()
{
const unsigned PROGRESS_DELTA = 50;
@ -312,7 +312,7 @@ void EAGLE_PLUGIN::checkpoint()
}
VECTOR2I inline EAGLE_PLUGIN::kicad_fontsize( const ECOORD& d, int aTextThickness ) const
VECTOR2I inline PCB_IO_EAGLE::kicad_fontsize( const ECOORD& d, int aTextThickness ) const
{
// Eagle includes stroke thickness in the text size, KiCAD does not
int kz = d.ToPcbUnits();
@ -320,7 +320,7 @@ VECTOR2I inline EAGLE_PLUGIN::kicad_fontsize( const ECOORD& d, int aTextThicknes
}
BOARD* EAGLE_PLUGIN::LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
BOARD* PCB_IO_EAGLE::LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
const STRING_UTF8_MAP* aProperties, PROJECT* aProject,
PROGRESS_REPORTER* aProgressReporter )
{
@ -443,7 +443,7 @@ BOARD* EAGLE_PLUGIN::LoadBoard( const wxString& aFileName, BOARD* aAppendToMe,
}
std::vector<FOOTPRINT*> EAGLE_PLUGIN::GetImportedCachedLibraryFootprints()
std::vector<FOOTPRINT*> PCB_IO_EAGLE::GetImportedCachedLibraryFootprints()
{
std::vector<FOOTPRINT*> retval;
@ -454,7 +454,7 @@ std::vector<FOOTPRINT*> EAGLE_PLUGIN::GetImportedCachedLibraryFootprints()
}
void EAGLE_PLUGIN::init( const STRING_UTF8_MAP* aProperties )
void PCB_IO_EAGLE::init( const STRING_UTF8_MAP* aProperties )
{
m_hole_count = 0;
m_min_trace = 0;
@ -473,7 +473,7 @@ void EAGLE_PLUGIN::init( const STRING_UTF8_MAP* aProperties )
}
void EAGLE_PLUGIN::clear_cu_map()
void PCB_IO_EAGLE::clear_cu_map()
{
// All cu layers are invalid until we see them in the <layers> section while
// loading either a board or library. See loadLayerDefs().
@ -482,7 +482,7 @@ void EAGLE_PLUGIN::clear_cu_map()
}
void EAGLE_PLUGIN::loadAllSections( wxXmlNode* aDoc )
void PCB_IO_EAGLE::loadAllSections( wxXmlNode* aDoc )
{
wxXmlNode* drawing = MapChildren( aDoc )["drawing"];
NODE_MAP drawingChildren = MapChildren( drawing );
@ -568,7 +568,7 @@ void EAGLE_PLUGIN::loadAllSections( wxXmlNode* aDoc )
}
void EAGLE_PLUGIN::loadDesignRules( wxXmlNode* aDesignRules )
void PCB_IO_EAGLE::loadDesignRules( wxXmlNode* aDesignRules )
{
if( aDesignRules )
{
@ -579,7 +579,7 @@ void EAGLE_PLUGIN::loadDesignRules( wxXmlNode* aDesignRules )
}
void EAGLE_PLUGIN::loadLayerDefs( wxXmlNode* aLayers )
void PCB_IO_EAGLE::loadLayerDefs( wxXmlNode* aLayers )
{
if( !aLayers )
return;
@ -650,7 +650,7 @@ void EAGLE_PLUGIN::loadLayerDefs( wxXmlNode* aLayers )
#define DIMENSION_PRECISION DIM_PRECISION::X_XX // 0.01 mm
void EAGLE_PLUGIN::loadPlain( wxXmlNode* aGraphics )
void PCB_IO_EAGLE::loadPlain( wxXmlNode* aGraphics )
{
if( !aGraphics )
return;
@ -1089,7 +1089,7 @@ void EAGLE_PLUGIN::loadPlain( wxXmlNode* aGraphics )
}
void EAGLE_PLUGIN::loadLibrary( wxXmlNode* aLib, const wxString* aLibName )
void PCB_IO_EAGLE::loadLibrary( wxXmlNode* aLib, const wxString* aLibName )
{
if( !aLib )
return;
@ -1147,7 +1147,7 @@ void EAGLE_PLUGIN::loadLibrary( wxXmlNode* aLib, const wxString* aLibName )
}
void EAGLE_PLUGIN::loadLibraries( wxXmlNode* aLibs )
void PCB_IO_EAGLE::loadLibraries( wxXmlNode* aLibs )
{
if( !aLibs )
return;
@ -1170,7 +1170,7 @@ void EAGLE_PLUGIN::loadLibraries( wxXmlNode* aLibs )
}
void EAGLE_PLUGIN::loadElements( wxXmlNode* aElements )
void PCB_IO_EAGLE::loadElements( wxXmlNode* aElements )
{
if( !aElements )
return;
@ -1432,7 +1432,7 @@ void EAGLE_PLUGIN::loadElements( wxXmlNode* aElements )
}
ZONE* EAGLE_PLUGIN::loadPolygon( wxXmlNode* aPolyNode )
ZONE* PCB_IO_EAGLE::loadPolygon( wxXmlNode* aPolyNode )
{
EPOLYGON p( aPolyNode );
PCB_LAYER_ID layer = kicad_layer( p.layer );
@ -1589,7 +1589,7 @@ ZONE* EAGLE_PLUGIN::loadPolygon( wxXmlNode* aPolyNode )
}
void EAGLE_PLUGIN::orientFootprintAndText( FOOTPRINT* aFootprint, const EELEMENT& e,
void PCB_IO_EAGLE::orientFootprintAndText( FOOTPRINT* aFootprint, const EELEMENT& e,
const EATTR* aNameAttr, const EATTR* aValueAttr )
{
if( e.rot )
@ -1610,7 +1610,7 @@ void EAGLE_PLUGIN::orientFootprintAndText( FOOTPRINT* aFootprint, const EELEMENT
}
void EAGLE_PLUGIN::orientFPText( FOOTPRINT* aFootprint, const EELEMENT& e, PCB_TEXT* aFPText,
void PCB_IO_EAGLE::orientFPText( FOOTPRINT* aFootprint, const EELEMENT& e, PCB_TEXT* aFPText,
const EATTR* aAttr )
{
// Smashed part ?
@ -1758,7 +1758,7 @@ void EAGLE_PLUGIN::orientFPText( FOOTPRINT* aFootprint, const EELEMENT& e, PCB_T
}
FOOTPRINT* EAGLE_PLUGIN::makeFootprint( wxXmlNode* aPackage, const wxString& aPkgName )
FOOTPRINT* PCB_IO_EAGLE::makeFootprint( wxXmlNode* aPackage, const wxString& aPkgName )
{
std::unique_ptr<FOOTPRINT> m = std::make_unique<FOOTPRINT>( m_board );
@ -1807,7 +1807,7 @@ FOOTPRINT* EAGLE_PLUGIN::makeFootprint( wxXmlNode* aPackage, const wxString& aPk
}
void EAGLE_PLUGIN::packageWire( FOOTPRINT* aFootprint, wxXmlNode* aTree ) const
void PCB_IO_EAGLE::packageWire( FOOTPRINT* aFootprint, wxXmlNode* aTree ) const
{
EWIRE w( aTree );
PCB_LAYER_ID layer = kicad_layer( w.layer );
@ -1880,7 +1880,7 @@ void EAGLE_PLUGIN::packageWire( FOOTPRINT* aFootprint, wxXmlNode* aTree ) const
}
void EAGLE_PLUGIN::packagePad( FOOTPRINT* aFootprint, wxXmlNode* aTree )
void PCB_IO_EAGLE::packagePad( FOOTPRINT* aFootprint, wxXmlNode* aTree )
{
// this is thru hole technology here, no SMDs
EPAD e( aTree );
@ -1987,7 +1987,7 @@ void EAGLE_PLUGIN::packagePad( FOOTPRINT* aFootprint, wxXmlNode* aTree )
}
void EAGLE_PLUGIN::packageText( FOOTPRINT* aFootprint, wxXmlNode* aTree ) const
void PCB_IO_EAGLE::packageText( FOOTPRINT* aFootprint, wxXmlNode* aTree ) const
{
ETEXT t( aTree );
PCB_LAYER_ID layer = kicad_layer( t.layer );
@ -2110,7 +2110,7 @@ void EAGLE_PLUGIN::packageText( FOOTPRINT* aFootprint, wxXmlNode* aTree ) const
}
void EAGLE_PLUGIN::packageRectangle( FOOTPRINT* aFootprint, wxXmlNode* aTree ) const
void PCB_IO_EAGLE::packageRectangle( FOOTPRINT* aFootprint, wxXmlNode* aTree ) const
{
ERECT r( aTree );
@ -2179,7 +2179,7 @@ void EAGLE_PLUGIN::packageRectangle( FOOTPRINT* aFootprint, wxXmlNode* aTree ) c
}
void EAGLE_PLUGIN::packagePolygon( FOOTPRINT* aFootprint, wxXmlNode* aTree ) const
void PCB_IO_EAGLE::packagePolygon( FOOTPRINT* aFootprint, wxXmlNode* aTree ) const
{
EPOLYGON p( aTree );
@ -2284,7 +2284,7 @@ void EAGLE_PLUGIN::packagePolygon( FOOTPRINT* aFootprint, wxXmlNode* aTree ) con
}
void EAGLE_PLUGIN::packageCircle( FOOTPRINT* aFootprint, wxXmlNode* aTree ) const
void PCB_IO_EAGLE::packageCircle( FOOTPRINT* aFootprint, wxXmlNode* aTree ) const
{
ECIRCLE e( aTree );
@ -2374,7 +2374,7 @@ void EAGLE_PLUGIN::packageCircle( FOOTPRINT* aFootprint, wxXmlNode* aTree ) cons
}
void EAGLE_PLUGIN::packageHole( FOOTPRINT* aFootprint, wxXmlNode* aTree, bool aCenter ) const
void PCB_IO_EAGLE::packageHole( FOOTPRINT* aFootprint, wxXmlNode* aTree, bool aCenter ) const
{
EHOLE e( aTree );
@ -2416,7 +2416,7 @@ void EAGLE_PLUGIN::packageHole( FOOTPRINT* aFootprint, wxXmlNode* aTree, bool aC
}
void EAGLE_PLUGIN::packageSMD( FOOTPRINT* aFootprint, wxXmlNode* aTree ) const
void PCB_IO_EAGLE::packageSMD( FOOTPRINT* aFootprint, wxXmlNode* aTree ) const
{
ESMD e( aTree );
PCB_LAYER_ID layer = kicad_layer( e.layer );
@ -2494,7 +2494,7 @@ void EAGLE_PLUGIN::packageSMD( FOOTPRINT* aFootprint, wxXmlNode* aTree ) const
}
void EAGLE_PLUGIN::transferPad( const EPAD_COMMON& aEaglePad, PAD* aPad ) const
void PCB_IO_EAGLE::transferPad( const EPAD_COMMON& aEaglePad, PAD* aPad ) const
{
aPad->SetNumber( aEaglePad.name );
@ -2519,7 +2519,7 @@ void EAGLE_PLUGIN::transferPad( const EPAD_COMMON& aEaglePad, PAD* aPad ) const
}
void EAGLE_PLUGIN::deleteTemplates()
void PCB_IO_EAGLE::deleteTemplates()
{
for( const auto& [ name, footprint ] : m_templates )
{
@ -2531,7 +2531,7 @@ void EAGLE_PLUGIN::deleteTemplates()
}
void EAGLE_PLUGIN::loadClasses( wxXmlNode* aClasses )
void PCB_IO_EAGLE::loadClasses( wxXmlNode* aClasses )
{
BOARD_DESIGN_SETTINGS& bds = m_board->GetDesignSettings();
@ -2595,7 +2595,7 @@ void EAGLE_PLUGIN::loadClasses( wxXmlNode* aClasses )
}
void EAGLE_PLUGIN::loadSignals( wxXmlNode* aSignals )
void PCB_IO_EAGLE::loadSignals( wxXmlNode* aSignals )
{
ZONES zones; // per net
int netCode = 1;
@ -2855,7 +2855,7 @@ void EAGLE_PLUGIN::loadSignals( wxXmlNode* aSignals )
}
std::map<wxString, PCB_LAYER_ID> EAGLE_PLUGIN::DefaultLayerMappingCallback(
std::map<wxString, PCB_LAYER_ID> PCB_IO_EAGLE::DefaultLayerMappingCallback(
const std::vector<INPUT_LAYER_DESC>& aInputLayerDescriptionVector )
{
std::map<wxString, PCB_LAYER_ID> layer_map;
@ -2870,7 +2870,7 @@ std::map<wxString, PCB_LAYER_ID> EAGLE_PLUGIN::DefaultLayerMappingCallback(
}
void EAGLE_PLUGIN::mapEagleLayersToKicad( bool aIsLibraryCache )
void PCB_IO_EAGLE::mapEagleLayersToKicad( bool aIsLibraryCache )
{
std::vector<INPUT_LAYER_DESC> inputDescs;
@ -2900,14 +2900,14 @@ void EAGLE_PLUGIN::mapEagleLayersToKicad( bool aIsLibraryCache )
}
PCB_LAYER_ID EAGLE_PLUGIN::kicad_layer( int aEagleLayer ) const
PCB_LAYER_ID PCB_IO_EAGLE::kicad_layer( int aEagleLayer ) const
{
auto result = m_layer_map.find( eagle_layer_name( aEagleLayer ) );
return result == m_layer_map.end() ? UNDEFINED_LAYER : result->second;
}
std::tuple<PCB_LAYER_ID, LSET, bool> EAGLE_PLUGIN::defaultKicadLayer( int aEagleLayer,
std::tuple<PCB_LAYER_ID, LSET, bool> PCB_IO_EAGLE::defaultKicadLayer( int aEagleLayer,
bool aIsLibraryCache ) const
{
// eagle copper layer:
@ -3041,7 +3041,7 @@ std::tuple<PCB_LAYER_ID, LSET, bool> EAGLE_PLUGIN::defaultKicadLayer( int aEagle
}
const wxString& EAGLE_PLUGIN::eagle_layer_name( int aLayer ) const
const wxString& PCB_IO_EAGLE::eagle_layer_name( int aLayer ) const
{
static const wxString unknown( "unknown" );
auto it = m_eagleLayers.find( aLayer );
@ -3049,7 +3049,7 @@ const wxString& EAGLE_PLUGIN::eagle_layer_name( int aLayer ) const
}
int EAGLE_PLUGIN::eagle_layer_id( const wxString& aLayerName ) const
int PCB_IO_EAGLE::eagle_layer_id( const wxString& aLayerName ) const
{
static const int unknown = -1;
auto it = m_eagleLayersIds.find( aLayerName );
@ -3057,7 +3057,7 @@ int EAGLE_PLUGIN::eagle_layer_id( const wxString& aLayerName ) const
}
void EAGLE_PLUGIN::centerBoard()
void PCB_IO_EAGLE::centerBoard()
{
if( m_props )
{
@ -3081,7 +3081,7 @@ void EAGLE_PLUGIN::centerBoard()
}
wxDateTime EAGLE_PLUGIN::getModificationTime( const wxString& aPath )
wxDateTime PCB_IO_EAGLE::getModificationTime( const wxString& aPath )
{
// File hasn't been loaded yet.
if( aPath.IsEmpty() )
@ -3096,7 +3096,7 @@ wxDateTime EAGLE_PLUGIN::getModificationTime( const wxString& aPath )
}
void EAGLE_PLUGIN::cacheLib( const wxString& aLibPath )
void PCB_IO_EAGLE::cacheLib( const wxString& aLibPath )
{
try
{
@ -3180,7 +3180,7 @@ void EAGLE_PLUGIN::cacheLib( const wxString& aLibPath )
}
void EAGLE_PLUGIN::FootprintEnumerate( wxArrayString& aFootprintNames, const wxString& aLibraryPath,
void PCB_IO_EAGLE::FootprintEnumerate( wxArrayString& aFootprintNames, const wxString& aLibraryPath,
bool aBestEfforts, const STRING_UTF8_MAP* aProperties )
{
wxString errorMsg;
@ -3207,7 +3207,7 @@ void EAGLE_PLUGIN::FootprintEnumerate( wxArrayString& aFootprintNames, const wxS
}
FOOTPRINT* EAGLE_PLUGIN::FootprintLoad( const wxString& aLibraryPath,
FOOTPRINT* PCB_IO_EAGLE::FootprintLoad( const wxString& aLibraryPath,
const wxString& aFootprintName, bool aKeepUUID,
const STRING_UTF8_MAP* aProperties )
{
@ -3225,12 +3225,12 @@ FOOTPRINT* EAGLE_PLUGIN::FootprintLoad( const wxString& aLibraryPath,
}
void EAGLE_PLUGIN::FootprintLibOptions( STRING_UTF8_MAP* aListToAppendTo ) const
void PCB_IO_EAGLE::FootprintLibOptions( STRING_UTF8_MAP* aListToAppendTo ) const
{
PCB_IO::FootprintLibOptions( aListToAppendTo );
}
int EAGLE_PLUGIN::getMinimumCopperLayerCount() const
int PCB_IO_EAGLE::getMinimumCopperLayerCount() const
{
int minLayerCount = 2;

Some files were not shown because too many files have changed in this diff Show More