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

Import Altium harness labels as text. 

One day we'll do better, but at least this way the user knows there's
something they need to migrate manually.

Fixes https://gitlab.com/kicad/code/kicad/issues/8748
This commit is contained in:
Jeff Young 2021-07-07 17:53:30 +01:00
parent a4237c3346
commit a17862d646
3 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -486,6 +486,7 @@ ASCH_PORT::ASCH_PORT( const std::map<wxString, wxString>& aProperties )
-PropertiesReadKiCadUnitFrac( aProperties, "LOCATION.Y" ) );
name = ALTIUM_PARSER::PropertiesReadString( aProperties, "NAME", "" );
harnessType = ALTIUM_PARSER::PropertiesReadString( aProperties, "HARNESSTYPE", "" );
width = PropertiesReadKiCadUnitFrac( aProperties, "WIDTH" );
height = PropertiesReadKiCadUnitFrac( aProperties, "HEIGHT" );

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

@ -520,6 +520,7 @@ struct ASCH_PORT
int ownerpartid;
wxString name;
wxString harnessType;
wxPoint location;
int width;

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

@ -1752,7 +1752,7 @@ void SCH_ALTIUM_PLUGIN::ParsePowerPort( const std::map<wxString, wxString>& aPro
libSymbol->GetReferenceField().SetText( "#PWR" );
libSymbol->GetValueField().SetText( elem.text );
libSymbol->GetValueField().SetVisible( true ); // TODO: why does this not work?
libSymbol->SetDescription( wxString::Format( _( "Power powerSymbolIt creates a global "
libSymbol->SetDescription( wxString::Format( _( "Power symbol creates a global "
"label with name '%s'" ), elem.text ) );
libSymbol->SetKeyWords( "power-flag" );
libSymbol->SetLibId( libId );
@ -1829,9 +1829,9 @@ void SCH_ALTIUM_PLUGIN::ParsePowerPort( const std::map<wxString, wxString>& aPro
void SCH_ALTIUM_PLUGIN::ParsePort( const ASCH_PORT& aElem )
{
// Get both connection points where we could connect to
wxPoint start = aElem.location + m_sheetOffset;
wxPoint end = start;
bool isHarness = !aElem.harnessType.IsEmpty();
wxPoint start = aElem.location + m_sheetOffset;
wxPoint end = start;
switch( aElem.style )
{
@ -1866,19 +1866,34 @@ void SCH_ALTIUM_PLUGIN::ParsePort( const ASCH_PORT& aElem )
|| endIsWireTerminal
|| endIsBusTerminal;
if( !connectionFound )
if( !isHarness && !connectionFound )
{
wxString msg = wxString::Format( _( "There is a port for '%s', but no connections to it." ),
aElem.name );
m_reporter->Report( msg, RPT_SEVERITY_WARNING );
m_reporter->Report( wxString::Format( _( "Port %s has no connections." ), aElem.name ),
RPT_SEVERITY_WARNING );
}
// Select label position. In case both match, we will add a line later.
wxPoint position = ( startIsWireTerminal || startIsBusTerminal ) ? start : end;
wxPoint position = ( startIsWireTerminal || startIsBusTerminal ) ? start : end;
SCH_TEXT* label;
SCH_TEXT* const label = new SCH_GLOBALLABEL( position, aElem.name );
if( isHarness )
{
wxString name = _( "HARNESS: " ) + aElem.name;
if( aElem.harnessType != aElem.name )
name += wxString::Format( wxT( " (%s)" ), aElem.harnessType );
label = new SCH_TEXT( position, name );
}
// TODO: detect correct label type depending on sheet settings, etc.
// label = new SCH_HIERLABEL( elem.location + m_sheetOffset, elem.name );
//{
// label = new SCH_HIERLABEL( elem.location + m_sheetOffset, elem.name );
//}
else
{
label = new SCH_GLOBALLABEL( position, aElem.name );
}
switch( aElem.iotype )
{
@ -1924,7 +1939,7 @@ void SCH_ALTIUM_PLUGIN::ParsePort( const ASCH_PORT& aElem )
m_currentSheet->GetScreen()->Append( label );
// This is a hack, for the case both connection points are valid: add a small wire
if( ( startIsWireTerminal && endIsWireTerminal ) || !connectionFound )
if( ( startIsWireTerminal && endIsWireTerminal ) )
{
SCH_LINE* wire = new SCH_LINE( start, SCH_LAYER_ID::LAYER_WIRE );
wire->SetEndPoint( end );