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

Fix Altium schematic importer bug(s). 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/11412
This commit is contained in:
Wayne Stambaugh 2022-10-31 10:03:35 -04:00
parent ab350cbfaa
commit 349de90bb0
6 changed files with 428 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
eeschema/files-io.cpp
View File

@ -1188,7 +1188,8 @@ bool SCH_EDIT_FRAME::importFile( const wxString& aFileName, int aFileType )
case SCH_IO_MGR::SCH_CADSTAR_ARCHIVE:
case SCH_IO_MGR::SCH_EAGLE:
// We insist on caller sending us an absolute path, if it does not, we say it's a bug.
wxASSERT_MSG( filename.IsAbsolute(), wxT( "Import schematic: path is not absolute!" ) );
wxCHECK_MSG( filename.IsAbsolute(), false,
wxT( "Import schematic: path is not absolute!" ) );
if( !LockFile( aFileName ) )
{
@ -1236,7 +1237,7 @@ bool SCH_EDIT_FRAME::importFile( const wxString& aFileName, int aFileType )
SetScreen( GetCurrentSheet().LastScreen() );
Schematic().Root().SetFileName( newfilename.GetFullPath() );
Schematic().Root().SetFileName( newfilename.GetFullName() );
GetScreen()->SetFileName( newfilename.GetFullPath() );
GetScreen()->SetContentModified();

29
eeschema/sch_plugins/altium/altium_parser_sch.cpp
View File

@ -87,7 +87,7 @@ template <typename T>
T ReadEnum( const std::map<wxString, wxString>& aProps, const wxString& aKey, int aLower,
int aUpper, T aDefault )
{
int value = ALTIUM_PARSER::ReadInt( aProps, aKey, static_cast<int>( aDefault ));
int value = ALTIUM_PARSER::ReadInt( aProps, aKey, static_cast<int>( aDefault ) );
if( value < aLower || value > aUpper )
return aDefault;
@ -199,18 +199,22 @@ ASCH_PIN::ASCH_PIN( const std::map<wxString, wxString>& aProps )
kicadX += p;
kicadXfrac += pfrac;
break;
case ASCH_RECORD_ORIENTATION::UPWARDS:
kicadY += p;
kicadYfrac += pfrac;
break;
case ASCH_RECORD_ORIENTATION::LEFTWARDS:
kicadX -= p;
kicadXfrac -= pfrac;
break;
case ASCH_RECORD_ORIENTATION::DOWNWARDS:
kicadY -= p;
kicadYfrac -= pfrac;
break;
default:
wxLogWarning( "Pin has unexpected orientation" );
break;
@ -250,7 +254,7 @@ ASCH_TEXT_FRAME::ASCH_TEXT_FRAME( const std::map<wxString, wxString>& aProps )
|| ReadRecord( aProps ) == ALTIUM_SCH_RECORD::TEXT_FRAME );
BottomLeft = VECTOR2I( ReadKiCadUnitFrac( aProps, "LOCATION.X" ),
-ReadKiCadUnitFrac( aProps, "LOCATION.Y" ) );
-ReadKiCadUnitFrac( aProps, "LOCATION.Y" ) );
TopRight = VECTOR2I( ReadKiCadUnitFrac( aProps, "CORNER.X" ),
-ReadKiCadUnitFrac( aProps, "CORNER.Y" ) );
@ -271,7 +275,8 @@ ASCH_TEXT_FRAME::ASCH_TEXT_FRAME( const std::map<wxString, wxString>& aProps )
IsSolid = ALTIUM_PARSER::ReadBool( aProps, "WORDWRAP", true );
Alignment = ReadEnum<ASCH_TEXT_FRAME_ALIGNMENT>( aProps, "ALIGNMENT", 1, 3, ASCH_TEXT_FRAME_ALIGNMENT::LEFT );
Alignment = ReadEnum<ASCH_TEXT_FRAME_ALIGNMENT>( aProps, "ALIGNMENT", 1, 3,
ASCH_TEXT_FRAME_ALIGNMENT::LEFT );
}
@ -326,7 +331,9 @@ ASCH_POLYLINE::ASCH_POLYLINE( const std::map<wxString, wxString>& aProps )
Color = ALTIUM_PARSER::ReadInt( aProps, "COLOR", 0 );
int linestyleVar = ALTIUM_PARSER::ReadInt( aProps, "LINESTYLEEXT", 0 );
linestyleVar = ALTIUM_PARSER::ReadInt( aProps, "LINESTYLE", linestyleVar ); // overwrite if present
// overwrite if present.
linestyleVar = ALTIUM_PARSER::ReadInt( aProps, "LINESTYLE", linestyleVar );
LineStyle = linestyleVar >= 0 && linestyleVar <= 3 ?
static_cast<ASCH_POLYLINE_LINESTYLE>( linestyleVar ) :
ASCH_POLYLINE_LINESTYLE::SOLID;
@ -479,12 +486,14 @@ ASCH_HARNESS_CONNECTOR::ASCH_HARNESS_CONNECTOR( const std::map<wxString, wxStrin
}
// Based on "ASCH_SHEET_ENTRY" import
ASCH_HARNESS_ENTRY::ASCH_HARNESS_ENTRY( const std::map<wxString, wxString>& aProps )
{
wxASSERT( ReadRecord( aProps ) == ALTIUM_SCH_RECORD::HARNESS_ENTRY );
// ownerindex = ReadOwnerIndex( aProps ); // use SCH_ALTIUM_PLUGIN::m_harnessEntryParent instead, because this property sometimes does not exist in altium file!
// use SCH_ALTIUM_PLUGIN::m_harnessEntryParent instead, because this property sometimes
// does not exist in altium file!
// ownerindex = ReadOwnerIndex( aProps );
OwnerPartID = ReadOwnerPartId( aProps );
IndexInSheet = ALTIUM_PARSER::ReadInt( aProps, "INDEXINSHEET", 0 );
@ -537,7 +546,7 @@ ASCH_RECTANGLE::ASCH_RECTANGLE( const std::map<wxString, wxString>& aProps )
BottomLeft = VECTOR2I( ReadKiCadUnitFrac( aProps, "LOCATION.X" ),
-ReadKiCadUnitFrac( aProps, "LOCATION.Y" ) );
TopRight = VECTOR2I( ReadKiCadUnitFrac( aProps, "CORNER.X" ),
-ReadKiCadUnitFrac( aProps, "CORNER.Y" ) );
-ReadKiCadUnitFrac( aProps, "CORNER.Y" ) );
LineWidth = ReadKiCadUnitFrac( aProps, "LINEWIDTH" );
IsSolid = ALTIUM_PARSER::ReadBool( aProps, "ISSOLID", false );
@ -602,6 +611,7 @@ ASCH_POWER_PORT::ASCH_POWER_PORT( const std::map<wxString, wxString>& aProps )
ASCH_POWER_PORT_STYLE::CIRCLE );
}
ASCH_PORT::ASCH_PORT( const std::map<wxString, wxString>& aProps )
{
wxASSERT( ReadRecord( aProps ) == ALTIUM_SCH_RECORD::PORT );
@ -625,7 +635,8 @@ ASCH_PORT::ASCH_PORT( const std::map<wxString, wxString>& aProps )
FontID = ALTIUM_PARSER::ReadInt( aProps, "TEXTFONTID", 0 );
TextColor = ALTIUM_PARSER::ReadInt( aProps, "TEXTCOLOR", 0 );
Alignment = ReadEnum<ASCH_TEXT_FRAME_ALIGNMENT>( aProps, "ALIGNMENT", 1, 3, ASCH_TEXT_FRAME_ALIGNMENT::LEFT );
Alignment = ReadEnum<ASCH_TEXT_FRAME_ALIGNMENT>( aProps, "ALIGNMENT", 1, 3,
ASCH_TEXT_FRAME_ALIGNMENT::LEFT );
}
@ -741,6 +752,7 @@ ASCH_SHEET_FONT::ASCH_SHEET_FONT( const std::map<wxString, wxString>& aProps, in
AreaColor = ALTIUM_PARSER::ReadInt( aProps, "AREACOLOR" + sid, 0 );
}
VECTOR2I ASchSheetGetSize( ASCH_SHEET_SIZE aSheetSize )
{
// From: https://github.com/vadmium/python-altium/blob/master/format.md#sheet
@ -862,6 +874,7 @@ ASCH_IMPLEMENTATION_LIST::ASCH_IMPLEMENTATION_LIST( const std::map<wxString, wxS
ownerindex = ReadOwnerIndex( aProps );
}
ASCH_BUS_ENTRY::ASCH_BUS_ENTRY( const std::map<wxString, wxString>& aProps )
{
wxASSERT( ReadRecord( aProps ) == ALTIUM_SCH_RECORD::BUS_ENTRY );

11
eeschema/sch_plugins/altium/altium_parser_sch.h
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2020 Thomas Pointhuber <thomas.pointhuber@gmx.at>
* Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 2021-2022 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@ -291,6 +291,7 @@ struct ASCH_TEXT_FRAME
{
VECTOR2I Location;
wxSize Size;
// have both coordinates, for convenience
VECTOR2I BottomLeft;
VECTOR2I TopRight;
@ -479,7 +480,9 @@ struct ASCH_HARNESS_CONNECTOR
struct ASCH_HARNESS_ENTRY
{
// int ownerindex; // Completely random, mostly this entry exists, but not always, should not be used!
// Completely random, mostly this entry exists, but not always, should not be used!
// int ownerindex;
int OwnerPartID; // always -1, can be safely ignored I think
int AreaColor;
@ -510,9 +513,9 @@ struct ASCH_HARNESS_TYPE
bool IsHidden;
bool OwnerIndexAdditionalList; // what is that?
VECTOR2I Location;
wxString Text;
explicit ASCH_HARNESS_TYPE( const std::map<wxString, wxString>& aProps );

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

File diff suppressed because it is too large Load Diff

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

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2020 Thomas Pointhuber <thomas.pointhuber@gmx.at>
* Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 2021-2022 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@ -107,6 +107,9 @@ public:
void ParseFileHeader( const ALTIUM_COMPOUND_FILE& aAltiumSchFile );
private:
SCH_SCREEN* getCurrentScreen();
SCH_SHEET* getCurrentSheet();
bool IsComponentPartVisible( int aOwnerindex, int aOwnerpartdisplaymode ) const;
const ASCH_STORAGE_FILE* GetFileFromStorage( const wxString& aFilename ) const;
void AddTextBox( const ASCH_TEXT_FRAME* aElem );
@ -152,7 +155,7 @@ private:
REPORTER* m_reporter; // current reporter for warnings/errors
SCH_SHEET* m_rootSheet; // The root sheet of the schematic being loaded..
SCH_SHEET* m_currentSheet; // The current sheet of the schematic being loaded..
SCH_SHEET_PATH m_sheetPath;
SCHEMATIC* m_schematic; // Passed to Load(), the schematic object being loaded
wxString m_libName; // Library name to save symbols
@ -175,9 +178,12 @@ private:
std::map<int, ASCH_SYMBOL> m_altiumComponents;
std::map<int, int> m_altiumImplementationList;
std::vector<ASCH_PORT> m_altiumPortsCurrentSheet; // we require all connections first
std::vector<ASCH_PORT> m_altiumHarnessPortsCurrentSheet; // parse harness ports after "FileHeader" was parsed, in 2nd run
int m_harnessOwnerIndexOffset; // Add offset to all harness ownerIndex'es after parsing FileHeader
// parse harness ports after "FileHeader" was parsed, in 2nd run.
std::vector<ASCH_PORT> m_altiumHarnessPortsCurrentSheet;
// Add offset to all harness ownerIndex'es after parsing FileHeader.
int m_harnessOwnerIndexOffset;
int m_harnessEntryParent; // used to identify harness connector for harness entry element
};

2
eeschema/sch_screen.h
View File

@ -61,6 +61,7 @@ class SCH_LINE;
class SCH_LABEL_BASE;
class PLOTTER;
class REPORTER;
class SCH_ALTIUM_PLUGIN;
class SCH_EDIT_FRAME;
class SCH_SHEET_LIST;
class SCH_SEXPR_PARSER;
@ -527,6 +528,7 @@ private:
friend SCH_EDIT_FRAME; // Only to populate m_symbolInstances.
friend SCH_SEXPR_PARSER; // Only to load instance information from schematic file.
friend SCH_SEXPR_PLUGIN; // Only to save the loaded instance information to schematic file.
friend SCH_ALTIUM_PLUGIN;
void clearLibSymbols();