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

altium: Introduce new ALTIUM_COMPOUND_FILE object to handle file opening and searching for streams at a central place

This commit is contained in:
Thomas Pointhuber 2022-01-06 16:27:09 +01:00
parent 2cc9517cfd
commit 0129e49b79
6 changed files with 279 additions and 278 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
common/plugins/altium/altium_parser.cpp
View File

@ -32,6 +32,50 @@
#include <wx/log.h> #include <wx/log.h>
#include <wx/translation.h> #include <wx/translation.h>
ALTIUM_COMPOUND_FILE::ALTIUM_COMPOUND_FILE( const wxString& aFilePath )
{
// Open file
FILE* fp = wxFopen( aFilePath, "rb" );
if( fp == nullptr )
{
THROW_IO_ERROR( wxString::Format( _( "Cannot open file '%s'." ), aFilePath ) );
}
fseek( fp, 0, SEEK_END );
long len = ftell( fp );
if( len < 0 )
{
fclose( fp );
THROW_IO_ERROR( _( "Error reading file: cannot determine length." ) );
}
// Read into buffer (TODO: add support for memory-mapped files to avoid this copy!)
m_buffer.resize( len );
fseek( fp, 0, SEEK_SET );
size_t bytesRead = fread( m_buffer.data(), sizeof( unsigned char ), len, fp );
fclose( fp );
if( static_cast<size_t>( len ) != bytesRead )
{
THROW_IO_ERROR( _( "Error reading file." ) );
}
try
{
m_reader = std::make_unique<CFB::CompoundFileReader>( m_buffer.data(), m_buffer.size() );
}
catch( CFB::CFBException& exception )
{
THROW_IO_ERROR( exception.what() );
}
}
static const CFB::COMPOUND_FILE_ENTRY* static const CFB::COMPOUND_FILE_ENTRY*
FindStreamSingleLevel( const CFB::CompoundFileReader& aReader, FindStreamSingleLevel( const CFB::CompoundFileReader& aReader,
const CFB::COMPOUND_FILE_ENTRY* aEntry, const std::string aName, const CFB::COMPOUND_FILE_ENTRY* aEntry, const std::string aName,
@ -56,32 +100,39 @@ FindStreamSingleLevel( const CFB::CompoundFileReader& aReader,
return ret; return ret;
} }
const CFB::COMPOUND_FILE_ENTRY* FindStream( const CFB::CompoundFileReader& aReader,
const std::string aStreamName ) const CFB::COMPOUND_FILE_ENTRY*
ALTIUM_COMPOUND_FILE::FindStream( const std::string& aStreamPath ) const
{ {
const CFB::COMPOUND_FILE_ENTRY* currentDirEntry = aReader.GetRootEntry(); if( !m_reader )
{
return nullptr;
}
const CFB::COMPOUND_FILE_ENTRY* currentDirEntry = m_reader->GetRootEntry();
size_t startCh = 0; size_t startCh = 0;
size_t delimiter = aStreamName.find( '\\', startCh ); size_t delimiter = aStreamPath.find( '\\', startCh );
while( delimiter != std::string::npos ) while( delimiter != std::string::npos )
{ {
std::string directoryName = aStreamName.substr( startCh, delimiter ); std::string directoryName = aStreamPath.substr( startCh, delimiter );
currentDirEntry = FindStreamSingleLevel( aReader, currentDirEntry, directoryName, false ); currentDirEntry =
FindStreamSingleLevel( *m_reader.get(), currentDirEntry, directoryName, false );
if( currentDirEntry == nullptr ) if( currentDirEntry == nullptr )
{ {
return nullptr; return nullptr;
} }
startCh = delimiter + 1; startCh = delimiter + 1;
delimiter = aStreamName.find( '\\', startCh ); delimiter = aStreamPath.find( '\\', startCh );
} }
std::string fileName = aStreamName.substr( startCh, delimiter ); std::string fileName = aStreamPath.substr( startCh, delimiter );
return FindStreamSingleLevel( aReader, currentDirEntry, fileName, true ); return FindStreamSingleLevel( *m_reader.get(), currentDirEntry, fileName, true );
} }
ALTIUM_PARSER::ALTIUM_PARSER( const CFB::CompoundFileReader& aReader, ALTIUM_PARSER::ALTIUM_PARSER( const ALTIUM_COMPOUND_FILE& aFile,
const CFB::COMPOUND_FILE_ENTRY* aEntry ) const CFB::COMPOUND_FILE_ENTRY* aEntry )
{ {
m_subrecord_end = nullptr; m_subrecord_end = nullptr;
@ -91,7 +142,7 @@ ALTIUM_PARSER::ALTIUM_PARSER( const CFB::CompoundFileReader& aReader,
m_pos = m_content.get(); m_pos = m_content.get();
// read file into buffer // read file into buffer
aReader.ReadFile( aEntry, 0, m_content.get(), m_size ); aFile.GetCompoundFileReader().ReadFile( aEntry, 0, m_content.get(), m_size );
} }

27
common/plugins/altium/altium_parser.h
View File

@ -39,15 +39,34 @@ class CompoundFileReader;
struct COMPOUND_FILE_ENTRY; struct COMPOUND_FILE_ENTRY;
} // namespace CFB } // namespace CFB
// Helper method to find file inside compound file
const CFB::COMPOUND_FILE_ENTRY* FindStream( const CFB::CompoundFileReader& aReader, class ALTIUM_COMPOUND_FILE
const std::string aStreamName ); {
public:
/**
* Open a CFB file. Constructor might throw an IO_ERROR.
*
* @param aFilePath path to file to open
*/
ALTIUM_COMPOUND_FILE( const wxString& aFilePath );
ALTIUM_COMPOUND_FILE( const ALTIUM_COMPOUND_FILE& temp_obj ) = delete;
ALTIUM_COMPOUND_FILE& operator=( const ALTIUM_COMPOUND_FILE& temp_obj ) = delete;
~ALTIUM_COMPOUND_FILE() = default;
const CFB::CompoundFileReader& GetCompoundFileReader() const { return *m_reader; }
const CFB::COMPOUND_FILE_ENTRY* FindStream( const std::string& aStreamPath ) const;
private:
std::unique_ptr<CFB::CompoundFileReader> m_reader;
std::vector<char> m_buffer;
};
class ALTIUM_PARSER class ALTIUM_PARSER
{ {
public: public:
ALTIUM_PARSER( const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ); ALTIUM_PARSER( const ALTIUM_COMPOUND_FILE& aFile, const CFB::COMPOUND_FILE_ENTRY* aEntry );
ALTIUM_PARSER( std::unique_ptr<char[]>& aContent, size_t aSize ); ALTIUM_PARSER( std::unique_ptr<char[]>& aContent, size_t aSize );
~ALTIUM_PARSER() = default; ~ALTIUM_PARSER() = default;

45
eeschema/sch_plugins/altium/sch_altium_plugin.cpp
View File

@ -290,39 +290,12 @@ SCH_SHEET* SCH_ALTIUM_PLUGIN::Load( const wxString& aFileName, SCHEMATIC* aSchem
void SCH_ALTIUM_PLUGIN::ParseAltiumSch( const wxString& aFileName ) void SCH_ALTIUM_PLUGIN::ParseAltiumSch( const wxString& aFileName )
{ {
// Open file ALTIUM_COMPOUND_FILE altiumSchFile( aFileName );
FILE* fp = wxFopen( aFileName, "rb" );
if( fp == nullptr )
{
m_reporter->Report( wxString::Format( _( "Cannot open file '%s'." ), aFileName ),
RPT_SEVERITY_ERROR );
return;
}
fseek( fp, 0, SEEK_END );
long len = ftell( fp );
if( len < 0 )
{
fclose( fp );
THROW_IO_ERROR( "Read error, cannot determine length of file." );
}
std::unique_ptr<unsigned char[]> buffer( new unsigned char[len] );
fseek( fp, 0, SEEK_SET );
size_t bytesRead = fread( buffer.get(), sizeof( unsigned char ), len, fp );
fclose( fp );
if( static_cast<size_t>( len ) != bytesRead )
THROW_IO_ERROR( "Read error." );
try try
{ {
CFB::CompoundFileReader reader( buffer.get(), bytesRead ); ParseStorage( altiumSchFile ); // we need this before parsing the FileHeader
ParseStorage( reader ); // we need this before parsing the FileHeader ParseFileHeader( altiumSchFile );
ParseFileHeader( reader );
} }
catch( CFB::CFBException& exception ) catch( CFB::CFBException& exception )
{ {
@ -331,14 +304,14 @@ void SCH_ALTIUM_PLUGIN::ParseAltiumSch( const wxString& aFileName )
} }
void SCH_ALTIUM_PLUGIN::ParseStorage( const CFB::CompoundFileReader& aReader ) void SCH_ALTIUM_PLUGIN::ParseStorage( const ALTIUM_COMPOUND_FILE& aAltiumSchFile )
{ {
const CFB::COMPOUND_FILE_ENTRY* file = FindStream( aReader, "Storage" ); const CFB::COMPOUND_FILE_ENTRY* file = aAltiumSchFile.FindStream( "Storage" );
if( file == nullptr ) if( file == nullptr )
return; return;
ALTIUM_PARSER reader( aReader, file ); ALTIUM_PARSER reader( aAltiumSchFile, file );
std::map<wxString, wxString> properties = reader.ReadProperties(); std::map<wxString, wxString> properties = reader.ReadProperties();
wxString header = ALTIUM_PARSER::ReadString( properties, "HEADER", "" ); wxString header = ALTIUM_PARSER::ReadString( properties, "HEADER", "" );
@ -367,14 +340,14 @@ void SCH_ALTIUM_PLUGIN::ParseStorage( const CFB::CompoundFileReader& aReader )
} }
void SCH_ALTIUM_PLUGIN::ParseFileHeader( const CFB::CompoundFileReader& aReader ) void SCH_ALTIUM_PLUGIN::ParseFileHeader( const ALTIUM_COMPOUND_FILE& aAltiumSchFile )
{ {
const CFB::COMPOUND_FILE_ENTRY* file = FindStream( aReader, "FileHeader" ); const CFB::COMPOUND_FILE_ENTRY* file = aAltiumSchFile.FindStream( "FileHeader" );
if( file == nullptr ) if( file == nullptr )
THROW_IO_ERROR( "FileHeader not found" ); THROW_IO_ERROR( "FileHeader not found" );
ALTIUM_PARSER reader( aReader, file ); ALTIUM_PARSER reader( aAltiumSchFile, file );
if( reader.GetRemainingBytes() <= 0 ) if( reader.GetRemainingBytes() <= 0 )
{ {

9
eeschema/sch_plugins/altium/sch_altium_plugin.h
View File

@ -37,10 +37,7 @@ class SCH_SYMBOL;
class SCH_SHEET; class SCH_SHEET;
class TITLE_BLOCK; class TITLE_BLOCK;
namespace CFB class ALTIUM_COMPOUND_FILE;
{
class CompoundFileReader;
}
/** /**
* SCH_ALTIUM_PLUGIN * SCH_ALTIUM_PLUGIN
@ -105,8 +102,8 @@ public:
wxFileName getLibFileName(); wxFileName getLibFileName();
void ParseAltiumSch( const wxString& aFileName ); void ParseAltiumSch( const wxString& aFileName );
void ParseStorage( const CFB::CompoundFileReader& aReader ); void ParseStorage( const ALTIUM_COMPOUND_FILE& aAltiumSchFile );
void ParseFileHeader( const CFB::CompoundFileReader& aReader ); void ParseFileHeader( const ALTIUM_COMPOUND_FILE& aAltiumSchFile );
private: private:
bool IsComponentPartVisible( int aOwnerindex, int aOwnerpartdisplaymode ) const; bool IsComponentPartVisible( int aOwnerindex, int aOwnerpartdisplaymode ) const;

316
pcbnew/plugins/altium/altium_pcb.cpp
View File

@ -57,54 +57,16 @@
constexpr double BOLD_FACTOR = 1.75; // CSS font-weight-normal is 400; bold is 700 constexpr double BOLD_FACTOR = 1.75; // CSS font-weight-normal is 400; bold is 700
static std::vector<char> ReadFileIntoVector( const wxString& aFileName )
{
// Open file
FILE* fp = wxFopen( aFileName, "rb" );
if( fp == nullptr )
{
THROW_IO_ERROR( wxString::Format( _( "Cannot open file '%s'." ), aFileName ) );
}
fseek( fp, 0, SEEK_END );
long len = ftell( fp );
if( len < 0 )
{
fclose( fp );
THROW_IO_ERROR( _( "Error reading file: cannot determine length." ) );
}
std::vector<char> buffer( len );
fseek( fp, 0, SEEK_SET );
size_t bytesRead = fread( buffer.data(), sizeof( unsigned char ), len, fp );
fclose( fp );
if( static_cast<size_t>( len ) != bytesRead )
{
THROW_IO_ERROR( _( "Error reading file." ) );
}
return buffer;
}
void ParseAltiumPcb( BOARD* aBoard, const wxString& aFileName, PROGRESS_REPORTER* aProgressReporter, void ParseAltiumPcb( BOARD* aBoard, const wxString& aFileName, PROGRESS_REPORTER* aProgressReporter,
const std::map<ALTIUM_PCB_DIR, std::string>& aFileMapping ) const std::map<ALTIUM_PCB_DIR, std::string>& aFileMapping )
{ {
std::vector<char> buffer = ReadFileIntoVector( aFileName ); ALTIUM_COMPOUND_FILE altiumPcbFile( aFileName );
try try
{ {
CFB::CompoundFileReader reader( buffer.data(), buffer.size() );
// Parse File // Parse File
ALTIUM_PCB pcb( aBoard, aProgressReporter ); ALTIUM_PCB pcb( aBoard, aProgressReporter );
pcb.Parse( reader, aFileMapping ); pcb.Parse( altiumPcbFile, aFileMapping );
} }
catch( CFB::CFBException& exception ) catch( CFB::CFBException& exception )
{ {
@ -115,20 +77,18 @@ void ParseAltiumPcb( BOARD* aBoard, const wxString& aFileName, PROGRESS_REPORTER
void ParseAltiumPcbLibFootprintNames( wxArrayString& aFootprintNames, const wxString& aLibraryPath ) void ParseAltiumPcbLibFootprintNames( wxArrayString& aFootprintNames, const wxString& aLibraryPath )
{ {
std::vector<char> buffer = ReadFileIntoVector( aLibraryPath ); ALTIUM_COMPOUND_FILE altiumLibFile( aLibraryPath );
try try
{ {
CFB::CompoundFileReader reader( buffer.data(), buffer.size() );
std::string streamName = "Library\\Data"; std::string streamName = "Library\\Data";
const CFB::COMPOUND_FILE_ENTRY* libraryData = FindStream( reader, streamName ); const CFB::COMPOUND_FILE_ENTRY* libraryData = altiumLibFile.FindStream( streamName );
if( libraryData == nullptr ) if( libraryData == nullptr )
{ {
THROW_IO_ERROR( wxString::Format( _( "File not found: '%s'." ), streamName ) ); THROW_IO_ERROR( wxString::Format( _( "File not found: '%s'." ), streamName ) );
} }
ALTIUM_PARSER parser( reader, libraryData ); ALTIUM_PARSER parser( altiumLibFile, libraryData );
std::map<wxString, wxString> properties = parser.ReadProperties(); std::map<wxString, wxString> properties = parser.ReadProperties();
@ -402,112 +362,112 @@ void ALTIUM_PCB::checkpoint()
} }
} }
void ALTIUM_PCB::Parse( const CFB::CompoundFileReader& aReader, void ALTIUM_PCB::Parse( const ALTIUM_COMPOUND_FILE& altiumPcbFile,
const std::map<ALTIUM_PCB_DIR, std::string>& aFileMapping ) const std::map<ALTIUM_PCB_DIR, std::string>& aFileMapping )
{ {
// this vector simply declares in which order which functions to call. // this vector simply declares in which order which functions to call.
const std::vector<std::tuple<bool, ALTIUM_PCB_DIR, PARSE_FUNCTION_POINTER_fp>> parserOrder = { const std::vector<std::tuple<bool, ALTIUM_PCB_DIR, PARSE_FUNCTION_POINTER_fp>> parserOrder = {
{ true, ALTIUM_PCB_DIR::FILE_HEADER, { true, ALTIUM_PCB_DIR::FILE_HEADER,
[this]( auto aReader, auto fileHeader ) [this]( const ALTIUM_COMPOUND_FILE& aFile, auto fileHeader )
{ {
this->ParseFileHeader( aReader, fileHeader ); this->ParseFileHeader( aFile, fileHeader );
} }, } },
{ true, ALTIUM_PCB_DIR::BOARD6, { true, ALTIUM_PCB_DIR::BOARD6,
[this]( auto aReader, auto fileHeader ) [this]( const ALTIUM_COMPOUND_FILE& aFile, auto fileHeader )
{ {
this->ParseBoard6Data( aReader, fileHeader ); this->ParseBoard6Data( aFile, fileHeader );
} }, } },
{ true, ALTIUM_PCB_DIR::COMPONENTS6, { true, ALTIUM_PCB_DIR::COMPONENTS6,
[this]( auto aReader, auto fileHeader ) [this]( const ALTIUM_COMPOUND_FILE& aFile, auto fileHeader )
{ {
this->ParseComponents6Data( aReader, fileHeader ); this->ParseComponents6Data( aFile, fileHeader );
} }, } },
{ true, ALTIUM_PCB_DIR::MODELS, { true, ALTIUM_PCB_DIR::MODELS,
[this, aFileMapping]( auto aReader, auto fileHeader ) [this, aFileMapping]( const ALTIUM_COMPOUND_FILE& aFile, auto fileHeader )
{ {
wxString dir( aFileMapping.at( ALTIUM_PCB_DIR::MODELS ) ); wxString dir( aFileMapping.at( ALTIUM_PCB_DIR::MODELS ) );
this->ParseModelsData( aReader, fileHeader, dir ); this->ParseModelsData( aFile, fileHeader, dir );
} }, } },
{ true, ALTIUM_PCB_DIR::COMPONENTBODIES6, { true, ALTIUM_PCB_DIR::COMPONENTBODIES6,
[this]( auto aReader, auto fileHeader ) [this]( const ALTIUM_COMPOUND_FILE& aFile, auto fileHeader )
{ {
this->ParseComponentsBodies6Data( aReader, fileHeader ); this->ParseComponentsBodies6Data( aFile, fileHeader );
} }, } },
{ true, ALTIUM_PCB_DIR::NETS6, { true, ALTIUM_PCB_DIR::NETS6,
[this]( auto aReader, auto fileHeader ) [this]( const ALTIUM_COMPOUND_FILE& aFile, auto fileHeader )
{ {
this->ParseNets6Data( aReader, fileHeader ); this->ParseNets6Data( aFile, fileHeader );
} }, } },
{ true, ALTIUM_PCB_DIR::CLASSES6, { true, ALTIUM_PCB_DIR::CLASSES6,
[this]( auto aReader, auto fileHeader ) [this]( const ALTIUM_COMPOUND_FILE& aFile, auto fileHeader )
{ {
this->ParseClasses6Data( aReader, fileHeader ); this->ParseClasses6Data( aFile, fileHeader );
} }, } },
{ true, ALTIUM_PCB_DIR::RULES6, { true, ALTIUM_PCB_DIR::RULES6,
[this]( auto aReader, auto fileHeader ) [this]( const ALTIUM_COMPOUND_FILE& aFile, auto fileHeader )
{ {
this->ParseRules6Data( aReader, fileHeader ); this->ParseRules6Data( aFile, fileHeader );
} }, } },
{ true, ALTIUM_PCB_DIR::DIMENSIONS6, { true, ALTIUM_PCB_DIR::DIMENSIONS6,
[this]( auto aReader, auto fileHeader ) [this]( const ALTIUM_COMPOUND_FILE& aFile, auto fileHeader )
{ {
this->ParseDimensions6Data( aReader, fileHeader ); this->ParseDimensions6Data( aFile, fileHeader );
} }, } },
{ true, ALTIUM_PCB_DIR::POLYGONS6, { true, ALTIUM_PCB_DIR::POLYGONS6,
[this]( auto aReader, auto fileHeader ) [this]( const ALTIUM_COMPOUND_FILE& aFile, auto fileHeader )
{ {
this->ParsePolygons6Data( aReader, fileHeader ); this->ParsePolygons6Data( aFile, fileHeader );
} }, } },
{ true, ALTIUM_PCB_DIR::ARCS6, { true, ALTIUM_PCB_DIR::ARCS6,
[this]( auto aReader, auto fileHeader ) [this]( const ALTIUM_COMPOUND_FILE& aFile, auto fileHeader )
{ {
this->ParseArcs6Data( aReader, fileHeader ); this->ParseArcs6Data( aFile, fileHeader );
} }, } },
{ true, ALTIUM_PCB_DIR::PADS6, { true, ALTIUM_PCB_DIR::PADS6,
[this]( auto aReader, auto fileHeader ) [this]( const ALTIUM_COMPOUND_FILE& aFile, auto fileHeader )
{ {
this->ParsePads6Data( aReader, fileHeader ); this->ParsePads6Data( aFile, fileHeader );
} }, } },
{ true, ALTIUM_PCB_DIR::VIAS6, { true, ALTIUM_PCB_DIR::VIAS6,
[this]( auto aReader, auto fileHeader ) [this]( const ALTIUM_COMPOUND_FILE& aFile, auto fileHeader )
{ {
this->ParseVias6Data( aReader, fileHeader ); this->ParseVias6Data( aFile, fileHeader );
} }, } },
{ true, ALTIUM_PCB_DIR::TRACKS6, { true, ALTIUM_PCB_DIR::TRACKS6,
[this]( auto aReader, auto fileHeader ) [this]( const ALTIUM_COMPOUND_FILE& aFile, auto fileHeader )
{ {
this->ParseTracks6Data( aReader, fileHeader ); this->ParseTracks6Data( aFile, fileHeader );
} }, } },
{ false, ALTIUM_PCB_DIR::WIDESTRINGS6, { false, ALTIUM_PCB_DIR::WIDESTRINGS6,
[this]( auto aReader, auto fileHeader ) [this]( const ALTIUM_COMPOUND_FILE& aFile, auto fileHeader )
{ {
this->ParseWideStrings6Data( aReader, fileHeader ); this->ParseWideStrings6Data( aFile, fileHeader );
} }, } },
{ true, ALTIUM_PCB_DIR::TEXTS6, { true, ALTIUM_PCB_DIR::TEXTS6,
[this]( auto aReader, auto fileHeader ) [this]( const ALTIUM_COMPOUND_FILE& aFile, auto fileHeader )
{ {
this->ParseTexts6Data( aReader, fileHeader ); this->ParseTexts6Data( aFile, fileHeader );
} }, } },
{ true, ALTIUM_PCB_DIR::FILLS6, { true, ALTIUM_PCB_DIR::FILLS6,
[this]( auto aReader, auto fileHeader ) [this]( const ALTIUM_COMPOUND_FILE& aFile, auto fileHeader )
{ {
this->ParseFills6Data( aReader, fileHeader ); this->ParseFills6Data( aFile, fileHeader );
} }, } },
{ false, ALTIUM_PCB_DIR::BOARDREGIONS, { false, ALTIUM_PCB_DIR::BOARDREGIONS,
[this]( auto aReader, auto fileHeader ) [this]( const ALTIUM_COMPOUND_FILE& aFile, auto fileHeader )
{ {
this->ParseBoardRegionsData( aReader, fileHeader ); this->ParseBoardRegionsData( aFile, fileHeader );
} }, } },
{ true, ALTIUM_PCB_DIR::SHAPEBASEDREGIONS6, { true, ALTIUM_PCB_DIR::SHAPEBASEDREGIONS6,
[this]( auto aReader, auto fileHeader ) [this]( const ALTIUM_COMPOUND_FILE& aFile, auto fileHeader )
{ {
this->ParseShapeBasedRegions6Data( aReader, fileHeader ); this->ParseShapeBasedRegions6Data( aFile, fileHeader );
} }, } },
{ true, ALTIUM_PCB_DIR::REGIONS6, { true, ALTIUM_PCB_DIR::REGIONS6,
[this]( auto aReader, auto fileHeader ) [this]( const ALTIUM_COMPOUND_FILE& aFile, auto fileHeader )
{ {
this->ParseRegions6Data( aReader, fileHeader ); this->ParseRegions6Data( aFile, fileHeader );
} } } }
}; };
if( m_progressReporter != nullptr ) if( m_progressReporter != nullptr )
@ -533,13 +493,13 @@ void ALTIUM_PCB::Parse( const CFB::CompoundFileReader& aReader,
std::string mappedFile = mappedDirectory->second + "Header"; std::string mappedFile = mappedDirectory->second + "Header";
const CFB::COMPOUND_FILE_ENTRY* file = FindStream( aReader, mappedFile ); const CFB::COMPOUND_FILE_ENTRY* file = altiumPcbFile.FindStream( mappedFile );
if( file == nullptr ) if( file == nullptr )
{ {
continue; continue;
} }
ALTIUM_PARSER reader( aReader, file ); ALTIUM_PARSER reader( altiumPcbFile, file );
uint32_t numOfRecords = reader.Read<uint32_t>(); uint32_t numOfRecords = reader.Read<uint32_t>();
if( reader.HasParsingError() ) if( reader.HasParsingError() )
@ -581,10 +541,10 @@ void ALTIUM_PCB::Parse( const CFB::CompoundFileReader& aReader,
if( directory != ALTIUM_PCB_DIR::FILE_HEADER ) if( directory != ALTIUM_PCB_DIR::FILE_HEADER )
mappedFile += "Data"; mappedFile += "Data";
const CFB::COMPOUND_FILE_ENTRY* file = FindStream( aReader, mappedFile ); const CFB::COMPOUND_FILE_ENTRY* file = altiumPcbFile.FindStream( mappedFile );
if( file != nullptr ) if( file != nullptr )
fp( aReader, file ); fp( altiumPcbFile, file );
else if( isRequired ) else if( isRequired )
wxLogError( _( "File not found: '%s'." ), mappedFile ); wxLogError( _( "File not found: '%s'." ), mappedFile );
} }
@ -736,10 +696,10 @@ const ARULE6* ALTIUM_PCB::GetRuleDefault( ALTIUM_RULE_KIND aKind ) const
return nullptr; return nullptr;
} }
void ALTIUM_PCB::ParseFileHeader( const CFB::CompoundFileReader& aReader, void ALTIUM_PCB::ParseFileHeader( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::COMPOUND_FILE_ENTRY* aEntry ) const CFB::COMPOUND_FILE_ENTRY* aEntry )
{ {
ALTIUM_PARSER reader( aReader, aEntry ); ALTIUM_PARSER reader( aAltiumPcbFile, aEntry );
reader.ReadAndSetSubrecordLength(); reader.ReadAndSetSubrecordLength();
wxString header = reader.ReadWxString(); wxString header = reader.ReadWxString();
@ -755,13 +715,13 @@ void ALTIUM_PCB::ParseFileHeader( const CFB::CompoundFileReader& aReader,
//} //}
} }
void ALTIUM_PCB::ParseBoard6Data( const CFB::CompoundFileReader& aReader, void ALTIUM_PCB::ParseBoard6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::COMPOUND_FILE_ENTRY* aEntry ) const CFB::COMPOUND_FILE_ENTRY* aEntry )
{ {
if( m_progressReporter ) if( m_progressReporter )
m_progressReporter->Report( "Loading board data..." ); m_progressReporter->Report( "Loading board data..." );
ALTIUM_PARSER reader( aReader, aEntry ); ALTIUM_PARSER reader( aAltiumPcbFile, aEntry );
checkpoint(); checkpoint();
ABOARD6 elem( reader ); ABOARD6 elem( reader );
@ -938,13 +898,13 @@ void ALTIUM_PCB::HelperCreateBoardOutline( const std::vector<ALTIUM_VERTICE>& aV
} }
} }
void ALTIUM_PCB::ParseClasses6Data( const CFB::CompoundFileReader& aReader, void ALTIUM_PCB::ParseClasses6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::COMPOUND_FILE_ENTRY* aEntry ) const CFB::COMPOUND_FILE_ENTRY* aEntry )
{ {
if( m_progressReporter ) if( m_progressReporter )
m_progressReporter->Report( "Loading netclasses..." ); m_progressReporter->Report( "Loading netclasses..." );
ALTIUM_PARSER reader( aReader, aEntry ); ALTIUM_PARSER reader( aAltiumPcbFile, aEntry );
while( reader.GetRemainingBytes() >= 4 /* TODO: use Header section of file */ ) while( reader.GetRemainingBytes() >= 4 /* TODO: use Header section of file */ )
{ {
@ -975,13 +935,13 @@ void ALTIUM_PCB::ParseClasses6Data( const CFB::CompoundFileReader& aReader,
m_board->m_LegacyNetclassesLoaded = true; m_board->m_LegacyNetclassesLoaded = true;
} }
void ALTIUM_PCB::ParseComponents6Data( const CFB::CompoundFileReader& aReader, void ALTIUM_PCB::ParseComponents6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::COMPOUND_FILE_ENTRY* aEntry ) const CFB::COMPOUND_FILE_ENTRY* aEntry )
{ {
if( m_progressReporter ) if( m_progressReporter )
m_progressReporter->Report( "Loading components..." ); m_progressReporter->Report( "Loading components..." );
ALTIUM_PARSER reader( aReader, aEntry ); ALTIUM_PARSER reader( aAltiumPcbFile, aEntry );
uint16_t componentId = 0; uint16_t componentId = 0;
while( reader.GetRemainingBytes() >= 4 /* TODO: use Header section of file */ ) while( reader.GetRemainingBytes() >= 4 /* TODO: use Header section of file */ )
@ -1033,13 +993,13 @@ double normalizeAngleDegrees( double Angle, double aMin, double aMax )
} }
void ALTIUM_PCB::ParseComponentsBodies6Data( const CFB::CompoundFileReader& aReader, void ALTIUM_PCB::ParseComponentsBodies6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::COMPOUND_FILE_ENTRY* aEntry ) const CFB::COMPOUND_FILE_ENTRY* aEntry )
{ {
if( m_progressReporter ) if( m_progressReporter )
m_progressReporter->Report( "Loading component 3D models..." ); m_progressReporter->Report( "Loading component 3D models..." );
ALTIUM_PARSER reader( aReader, aEntry ); ALTIUM_PARSER reader( aAltiumPcbFile, aEntry );
while( reader.GetRemainingBytes() >= 4 /* TODO: use Header section of file */ ) while( reader.GetRemainingBytes() >= 4 /* TODO: use Header section of file */ )
{ {
@ -1402,13 +1362,13 @@ void ALTIUM_PCB::HelperParseDimensions6Center( const ADIMENSION6& aElem )
} }
void ALTIUM_PCB::ParseDimensions6Data( const CFB::CompoundFileReader& aReader, void ALTIUM_PCB::ParseDimensions6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::COMPOUND_FILE_ENTRY* aEntry ) const CFB::COMPOUND_FILE_ENTRY* aEntry )
{ {
if( m_progressReporter ) if( m_progressReporter )
m_progressReporter->Report( "Loading dimension drawings..." ); m_progressReporter->Report( "Loading dimension drawings..." );
ALTIUM_PARSER reader( aReader, aEntry ); ALTIUM_PARSER reader( aAltiumPcbFile, aEntry );
while( reader.GetRemainingBytes() >= 4 /* TODO: use Header section of file */ ) while( reader.GetRemainingBytes() >= 4 /* TODO: use Header section of file */ )
{ {
@ -1444,13 +1404,13 @@ void ALTIUM_PCB::ParseDimensions6Data( const CFB::CompoundFileReader& aReader,
} }
void ALTIUM_PCB::ParseModelsData( const CFB::CompoundFileReader& aReader, void ALTIUM_PCB::ParseModelsData( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::COMPOUND_FILE_ENTRY* aEntry, const wxString& aRootDir ) const CFB::COMPOUND_FILE_ENTRY* aEntry, const wxString& aRootDir )
{ {
if( m_progressReporter ) if( m_progressReporter )
m_progressReporter->Report( "Loading 3D models..." ); m_progressReporter->Report( "Loading 3D models..." );
ALTIUM_PARSER reader( aReader, aEntry ); ALTIUM_PARSER reader( aAltiumPcbFile, aEntry );
if( reader.GetRemainingBytes() == 0 ) if( reader.GetRemainingBytes() == 0 )
return; return;
@ -1498,7 +1458,8 @@ void ALTIUM_PCB::ParseModelsData( const CFB::CompoundFileReader& aReader,
idx++; idx++;
const CFB::COMPOUND_FILE_ENTRY* stepEntry = FindStream( aReader, stepPath.ToStdString() ); const CFB::COMPOUND_FILE_ENTRY* stepEntry =
aAltiumPcbFile.FindStream( stepPath.ToStdString() );
if( stepEntry == nullptr ) if( stepEntry == nullptr )
{ {
@ -1506,11 +1467,12 @@ void ALTIUM_PCB::ParseModelsData( const CFB::CompoundFileReader& aReader,
continue; continue;
} }
size_t stepSize = static_cast<size_t>( stepEntry->size ); size_t stepSize = static_cast<size_t>( stepEntry->size );
std::unique_ptr<char[]> stepContent( new char[stepSize] ); std::vector<char> stepContent( stepSize );
// read file into buffer // read file into buffer
aReader.ReadFile( stepEntry, 0, stepContent.get(), stepSize ); aAltiumPcbFile.GetCompoundFileReader().ReadFile( stepEntry, 0, stepContent.data(),
stepSize );
if( !storagePath.IsDirWritable() ) if( !storagePath.IsDirWritable() )
{ {
@ -1519,7 +1481,7 @@ void ALTIUM_PCB::ParseModelsData( const CFB::CompoundFileReader& aReader,
continue; continue;
} }
wxMemoryInputStream stepStream( stepContent.get(), stepSize ); wxMemoryInputStream stepStream( stepContent.data(), stepSize );
wxZlibInputStream zlibInputStream( stepStream ); wxZlibInputStream zlibInputStream( stepStream );
wxFFileOutputStream outputStream( storagePath.GetFullPath() ); wxFFileOutputStream outputStream( storagePath.GetFullPath() );
@ -1534,13 +1496,13 @@ void ALTIUM_PCB::ParseModelsData( const CFB::CompoundFileReader& aReader,
} }
void ALTIUM_PCB::ParseNets6Data( const CFB::CompoundFileReader& aReader, void ALTIUM_PCB::ParseNets6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::COMPOUND_FILE_ENTRY* aEntry ) const CFB::COMPOUND_FILE_ENTRY* aEntry )
{ {
if( m_progressReporter ) if( m_progressReporter )
m_progressReporter->Report( _( "Loading nets..." ) ); m_progressReporter->Report( _( "Loading nets..." ) );
ALTIUM_PARSER reader( aReader, aEntry ); ALTIUM_PARSER reader( aAltiumPcbFile, aEntry );
wxASSERT( m_num_nets == 0 ); wxASSERT( m_num_nets == 0 );
while( reader.GetRemainingBytes() >= 4 /* TODO: use Header section of file */ ) while( reader.GetRemainingBytes() >= 4 /* TODO: use Header section of file */ )
@ -1555,13 +1517,13 @@ void ALTIUM_PCB::ParseNets6Data( const CFB::CompoundFileReader& aReader,
THROW_IO_ERROR( "Nets6 stream is not fully parsed" ); THROW_IO_ERROR( "Nets6 stream is not fully parsed" );
} }
void ALTIUM_PCB::ParsePolygons6Data( const CFB::CompoundFileReader& aReader, void ALTIUM_PCB::ParsePolygons6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::COMPOUND_FILE_ENTRY* aEntry ) const CFB::COMPOUND_FILE_ENTRY* aEntry )
{ {
if( m_progressReporter ) if( m_progressReporter )
m_progressReporter->Report( _( "Loading polygons..." ) ); m_progressReporter->Report( _( "Loading polygons..." ) );
ALTIUM_PARSER reader( aReader, aEntry ); ALTIUM_PARSER reader( aAltiumPcbFile, aEntry );
while( reader.GetRemainingBytes() >= 4 /* TODO: use Header section of file */ ) while( reader.GetRemainingBytes() >= 4 /* TODO: use Header section of file */ )
{ {
@ -1690,13 +1652,13 @@ void ALTIUM_PCB::ParsePolygons6Data( const CFB::CompoundFileReader& aReader,
} }
} }
void ALTIUM_PCB::ParseRules6Data( const CFB::CompoundFileReader& aReader, void ALTIUM_PCB::ParseRules6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::COMPOUND_FILE_ENTRY* aEntry ) const CFB::COMPOUND_FILE_ENTRY* aEntry )
{ {
if( m_progressReporter ) if( m_progressReporter )
m_progressReporter->Report( _( "Loading rules..." ) ); m_progressReporter->Report( _( "Loading rules..." ) );
ALTIUM_PARSER reader( aReader, aEntry ); ALTIUM_PARSER reader( aAltiumPcbFile, aEntry );
while( reader.GetRemainingBytes() >= 4 /* TODO: use Header section of file */ ) while( reader.GetRemainingBytes() >= 4 /* TODO: use Header section of file */ )
{ {
@ -1722,13 +1684,13 @@ void ALTIUM_PCB::ParseRules6Data( const CFB::CompoundFileReader& aReader,
} }
} }
void ALTIUM_PCB::ParseBoardRegionsData( const CFB::CompoundFileReader& aReader, void ALTIUM_PCB::ParseBoardRegionsData( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::COMPOUND_FILE_ENTRY* aEntry ) const CFB::COMPOUND_FILE_ENTRY* aEntry )
{ {
if( m_progressReporter ) if( m_progressReporter )
m_progressReporter->Report( _( "Loading board regions..." ) ); m_progressReporter->Report( _( "Loading board regions..." ) );
ALTIUM_PARSER reader( aReader, aEntry ); ALTIUM_PARSER reader( aAltiumPcbFile, aEntry );
while( reader.GetRemainingBytes() >= 4 /* TODO: use Header section of file */ ) while( reader.GetRemainingBytes() >= 4 /* TODO: use Header section of file */ )
{ {
@ -1744,13 +1706,13 @@ void ALTIUM_PCB::ParseBoardRegionsData( const CFB::CompoundFileReader& aReader,
} }
} }
void ALTIUM_PCB::ParseShapeBasedRegions6Data( const CFB::CompoundFileReader& aReader, void ALTIUM_PCB::ParseShapeBasedRegions6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::COMPOUND_FILE_ENTRY* aEntry ) const CFB::COMPOUND_FILE_ENTRY* aEntry )
{ {
if( m_progressReporter ) if( m_progressReporter )
m_progressReporter->Report( _( "Loading zones..." ) ); m_progressReporter->Report( _( "Loading zones..." ) );
ALTIUM_PARSER reader( aReader, aEntry ); ALTIUM_PARSER reader( aAltiumPcbFile, aEntry );
while( reader.GetRemainingBytes() >= 4 /* TODO: use Header section of file */ ) while( reader.GetRemainingBytes() >= 4 /* TODO: use Header section of file */ )
{ {
@ -1867,13 +1829,13 @@ void ALTIUM_PCB::ParseShapeBasedRegions6Data( const CFB::CompoundFileReader& aRe
} }
} }
void ALTIUM_PCB::ParseRegions6Data( const CFB::CompoundFileReader& aReader, void ALTIUM_PCB::ParseRegions6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::COMPOUND_FILE_ENTRY* aEntry ) const CFB::COMPOUND_FILE_ENTRY* aEntry )
{ {
if( m_progressReporter ) if( m_progressReporter )
m_progressReporter->Report( _( "Loading zone fills..." ) ); m_progressReporter->Report( _( "Loading zone fills..." ) );
ALTIUM_PARSER reader( aReader, aEntry ); ALTIUM_PARSER reader( aAltiumPcbFile, aEntry );
for( ZONE* zone : m_polygons ) for( ZONE* zone : m_polygons )
{ {
@ -1956,7 +1918,7 @@ void ALTIUM_PCB::ParseRegions6Data( const CFB::CompoundFileReader& aReader,
} }
void ALTIUM_PCB::ParseArcs6Data( const CFB::CompoundFileReader& aReader, void ALTIUM_PCB::ParseArcs6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::COMPOUND_FILE_ENTRY* aEntry ) const CFB::COMPOUND_FILE_ENTRY* aEntry )
{ {
if( m_progressReporter ) if( m_progressReporter )
@ -1990,7 +1952,7 @@ void ALTIUM_PCB::ParseArcs6Data( const CFB::CompoundFileReader& aReader,
shape.SetArcAngleAndEnd( includedAngle.Normalize(), true ); shape.SetArcAngleAndEnd( includedAngle.Normalize(), true );
}; };
ALTIUM_PARSER reader( aReader, aEntry ); ALTIUM_PARSER reader( aAltiumPcbFile, aEntry );
while( reader.GetRemainingBytes() >= 4 /* TODO: use Header section of file */ ) while( reader.GetRemainingBytes() >= 4 /* TODO: use Header section of file */ )
{ {
@ -2106,13 +2068,13 @@ void ALTIUM_PCB::ParseArcs6Data( const CFB::CompoundFileReader& aReader,
} }
void ALTIUM_PCB::ParsePads6Data( const CFB::CompoundFileReader& aReader, void ALTIUM_PCB::ParsePads6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::COMPOUND_FILE_ENTRY* aEntry ) const CFB::COMPOUND_FILE_ENTRY* aEntry )
{ {
if( m_progressReporter ) if( m_progressReporter )
m_progressReporter->Report( _( "Loading pads..." ) ); m_progressReporter->Report( _( "Loading pads..." ) );
ALTIUM_PARSER reader( aReader, aEntry ); ALTIUM_PARSER reader( aAltiumPcbFile, aEntry );
while( reader.GetRemainingBytes() >= 4 /* TODO: use Header section of file */ ) while( reader.GetRemainingBytes() >= 4 /* TODO: use Header section of file */ )
{ {
@ -2518,13 +2480,13 @@ void ALTIUM_PCB::HelperParsePad6NonCopper( const APAD6& aElem )
} }
} }
void ALTIUM_PCB::ParseVias6Data( const CFB::CompoundFileReader& aReader, void ALTIUM_PCB::ParseVias6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::COMPOUND_FILE_ENTRY* aEntry ) const CFB::COMPOUND_FILE_ENTRY* aEntry )
{ {
if( m_progressReporter ) if( m_progressReporter )
m_progressReporter->Report( _( "Loading vias..." ) ); m_progressReporter->Report( _( "Loading vias..." ) );
ALTIUM_PARSER reader( aReader, aEntry ); ALTIUM_PARSER reader( aAltiumPcbFile, aEntry );
while( reader.GetRemainingBytes() >= 4 /* TODO: use Header section of file */ ) while( reader.GetRemainingBytes() >= 4 /* TODO: use Header section of file */ )
{ {
@ -2580,13 +2542,13 @@ void ALTIUM_PCB::ParseVias6Data( const CFB::CompoundFileReader& aReader,
} }
} }
void ALTIUM_PCB::ParseTracks6Data( const CFB::CompoundFileReader& aReader, void ALTIUM_PCB::ParseTracks6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::COMPOUND_FILE_ENTRY* aEntry ) const CFB::COMPOUND_FILE_ENTRY* aEntry )
{ {
if( m_progressReporter ) if( m_progressReporter )
m_progressReporter->Report( _( "Loading tracks..." ) ); m_progressReporter->Report( _( "Loading tracks..." ) );
ALTIUM_PARSER reader( aReader, aEntry ); ALTIUM_PARSER reader( aAltiumPcbFile, aEntry );
while( reader.GetRemainingBytes() >= 4 /* TODO: use Header section of file */ ) while( reader.GetRemainingBytes() >= 4 /* TODO: use Header section of file */ )
{ {
@ -2686,13 +2648,13 @@ void ALTIUM_PCB::ParseTracks6Data( const CFB::CompoundFileReader& aReader,
} }
} }
void ALTIUM_PCB::ParseWideStrings6Data( const CFB::CompoundFileReader& aReader, void ALTIUM_PCB::ParseWideStrings6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::COMPOUND_FILE_ENTRY* aEntry ) const CFB::COMPOUND_FILE_ENTRY* aEntry )
{ {
if( m_progressReporter ) if( m_progressReporter )
m_progressReporter->Report( _( "Loading unicode strings..." ) ); m_progressReporter->Report( _( "Loading unicode strings..." ) );
ALTIUM_PARSER reader( aReader, aEntry ); ALTIUM_PARSER reader( aAltiumPcbFile, aEntry );
m_unicodeStrings = reader.ReadWideStringTable(); m_unicodeStrings = reader.ReadWideStringTable();
@ -2700,13 +2662,13 @@ void ALTIUM_PCB::ParseWideStrings6Data( const CFB::CompoundFileReader& aReader,
THROW_IO_ERROR( "WideStrings6 stream is not fully parsed" ); THROW_IO_ERROR( "WideStrings6 stream is not fully parsed" );
} }
void ALTIUM_PCB::ParseTexts6Data( const CFB::CompoundFileReader& aReader, void ALTIUM_PCB::ParseTexts6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::COMPOUND_FILE_ENTRY* aEntry ) const CFB::COMPOUND_FILE_ENTRY* aEntry )
{ {
if( m_progressReporter ) if( m_progressReporter )
m_progressReporter->Report( _( "Loading text..." ) ); m_progressReporter->Report( _( "Loading text..." ) );
ALTIUM_PARSER reader( aReader, aEntry ); ALTIUM_PARSER reader( aAltiumPcbFile, aEntry );
while( reader.GetRemainingBytes() >= 4 /* TODO: use Header section of file */ ) while( reader.GetRemainingBytes() >= 4 /* TODO: use Header section of file */ )
{ {
@ -2885,13 +2847,13 @@ void ALTIUM_PCB::ParseTexts6Data( const CFB::CompoundFileReader& aReader,
} }
} }
void ALTIUM_PCB::ParseFills6Data( const CFB::CompoundFileReader& aReader, void ALTIUM_PCB::ParseFills6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::COMPOUND_FILE_ENTRY* aEntry ) const CFB::COMPOUND_FILE_ENTRY* aEntry )
{ {
if( m_progressReporter ) if( m_progressReporter )
m_progressReporter->Report( _( "Loading rectangles..." ) ); m_progressReporter->Report( _( "Loading rectangles..." ) );
ALTIUM_PARSER reader( aReader, aEntry ); ALTIUM_PARSER reader( aAltiumPcbFile, aEntry );
while( reader.GetRemainingBytes() >= 4 /* TODO: use Header section of file */ ) while( reader.GetRemainingBytes() >= 4 /* TODO: use Header section of file */ )
{ {

87
pcbnew/plugins/altium/altium_pcb.h
View File

@ -111,24 +111,23 @@ void ParseAltiumPcbLibFootprintNames( wxArrayString& aFootprintNames,
namespace CFB namespace CFB
{ {
class CompoundFileReader;
struct COMPOUND_FILE_ENTRY; struct COMPOUND_FILE_ENTRY;
} // namespace CFB } // namespace CFB
class ALTIUM_COMPOUND_FILE;
// type declaration required for a helper method // type declaration required for a helper method
class ALTIUM_PCB; class ALTIUM_PCB;
typedef std::function<void( const CFB::CompoundFileReader&, const CFB::COMPOUND_FILE_ENTRY* )> typedef std::function<void( const ALTIUM_COMPOUND_FILE&, const CFB::COMPOUND_FILE_ENTRY* )>
PARSE_FUNCTION_POINTER_fp; PARSE_FUNCTION_POINTER_fp;
class ALTIUM_PCB class ALTIUM_PCB
{ {
public: public:
explicit ALTIUM_PCB( BOARD* aBoard, PROGRESS_REPORTER* aProgressReporter ); explicit ALTIUM_PCB( BOARD* aBoard, PROGRESS_REPORTER* aProgressReporter );
~ALTIUM_PCB(); ~ALTIUM_PCB();
void Parse( const CFB::CompoundFileReader& aReader, void Parse( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const std::map<ALTIUM_PCB_DIR, std::string>& aFileMapping ); const std::map<ALTIUM_PCB_DIR, std::string>& aFileMapping );
private: private:
@ -139,50 +138,50 @@ private:
const ARULE6* GetRule( ALTIUM_RULE_KIND aKind, const wxString& aName ) const; const ARULE6* GetRule( ALTIUM_RULE_KIND aKind, const wxString& aName ) const;
const ARULE6* GetRuleDefault( ALTIUM_RULE_KIND aKind ) const; const ARULE6* GetRuleDefault( ALTIUM_RULE_KIND aKind ) const;
void ParseFileHeader( void ParseFileHeader( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ); const CFB::COMPOUND_FILE_ENTRY* aEntry );
// Text Format // Text Format
void ParseBoard6Data( void ParseBoard6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ); const CFB::COMPOUND_FILE_ENTRY* aEntry );
void ParseClasses6Data( void ParseClasses6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ); const CFB::COMPOUND_FILE_ENTRY* aEntry );
void ParseComponents6Data( void ParseComponents6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ); const CFB::COMPOUND_FILE_ENTRY* aEntry );
void ParseDimensions6Data( void ParseDimensions6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ); const CFB::COMPOUND_FILE_ENTRY* aEntry );
void ParseModelsData( const CFB::CompoundFileReader& aReader, void ParseModelsData( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::COMPOUND_FILE_ENTRY* aEntry, const wxString& aRootDir ); const CFB::COMPOUND_FILE_ENTRY* aEntry, const wxString& aRootDir );
void ParseNets6Data( void ParseNets6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ); const CFB::COMPOUND_FILE_ENTRY* aEntry );
void ParsePolygons6Data( void ParsePolygons6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ); const CFB::COMPOUND_FILE_ENTRY* aEntry );
void ParseRules6Data( void ParseRules6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ); const CFB::COMPOUND_FILE_ENTRY* aEntry );
// Binary Format // Binary Format
void ParseArcs6Data( void ParseArcs6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ); const CFB::COMPOUND_FILE_ENTRY* aEntry );
void ParseComponentsBodies6Data( void ParseComponentsBodies6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ); const CFB::COMPOUND_FILE_ENTRY* aEntry );
void ParsePads6Data( void ParsePads6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ); const CFB::COMPOUND_FILE_ENTRY* aEntry );
void ParseVias6Data( void ParseVias6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ); const CFB::COMPOUND_FILE_ENTRY* aEntry );
void ParseTracks6Data( void ParseTracks6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ); const CFB::COMPOUND_FILE_ENTRY* aEntry );
void ParseTexts6Data( void ParseTexts6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ); const CFB::COMPOUND_FILE_ENTRY* aEntry );
void ParseFills6Data( void ParseFills6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ); const CFB::COMPOUND_FILE_ENTRY* aEntry );
void ParseBoardRegionsData( void ParseBoardRegionsData( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ); const CFB::COMPOUND_FILE_ENTRY* aEntry );
void ParseShapeBasedRegions6Data( void ParseShapeBasedRegions6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ); const CFB::COMPOUND_FILE_ENTRY* aEntry );
void ParseRegions6Data( void ParseRegions6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ); const CFB::COMPOUND_FILE_ENTRY* aEntry );
void ParseWideStrings6Data( void ParseWideStrings6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
const CFB::CompoundFileReader& aReader, const CFB::COMPOUND_FILE_ENTRY* aEntry ); const CFB::COMPOUND_FILE_ENTRY* aEntry );
// Helper Functions // Helper Functions
void HelperParseDimensions6Linear( const ADIMENSION6& aElem ); void HelperParseDimensions6Linear( const ADIMENSION6& aElem );