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

altium/sch_altium_plugin: do not initialize unit to -1 for common to units items. 

-1 as unit id is illegal and breaks the lib file. So ensure id >= 0
(id = 0 for common to units items)
This commit is contained in:
jean-pierre charras 2022-11-23 14:46:03 +01:00
parent b1ec694905
commit 199743e8b0
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -812,7 +812,7 @@ void SCH_ALTIUM_PLUGIN::ParseComponent( int aIndex,
// TODO: keep it simple for now, and only set position. // TODO: keep it simple for now, and only set position.
//component->SetOrientation( elem.orientation ); //component->SetOrientation( elem.orientation );
symbol->SetLibId( libId ); symbol->SetLibId( libId );
symbol->SetUnit( elem.currentpartid ); symbol->SetUnit( std::max( 0, elem.currentpartid ) );
SCH_SCREEN* screen = getCurrentScreen(); SCH_SCREEN* screen = getCurrentScreen();
wxCHECK( screen, /* void */ ); wxCHECK( screen, /* void */ );
@ -845,7 +845,7 @@ void SCH_ALTIUM_PLUGIN::ParsePin( const std::map<wxString, wxString>& aPropertie
LIB_PIN* pin = new LIB_PIN( libSymbolIt->second ); LIB_PIN* pin = new LIB_PIN( libSymbolIt->second );
libSymbolIt->second->AddDrawItem( pin ); libSymbolIt->second->AddDrawItem( pin );
pin->SetUnit( elem.ownerpartid ); pin->SetUnit( std::max( 0, elem.ownerpartid ) );
pin->SetName( elem.name ); pin->SetName( elem.name );
pin->SetNumber( elem.designator ); pin->SetNumber( elem.designator );
@ -1124,7 +1124,7 @@ void SCH_ALTIUM_PLUGIN::ParseLabel( const std::map<wxString, wxString>& aPropert
LIB_TEXT* textItem = new LIB_TEXT( libSymbolIt->second ); LIB_TEXT* textItem = new LIB_TEXT( libSymbolIt->second );
libSymbolIt->second->AddDrawItem( textItem ); libSymbolIt->second->AddDrawItem( textItem );
textItem->SetUnit( elem.ownerpartid ); textItem->SetUnit( std::max( 0, elem.ownerpartid ) );
textItem->SetPosition( GetRelativePosition( elem.location + m_sheetOffset, symbol ) ); textItem->SetPosition( GetRelativePosition( elem.location + m_sheetOffset, symbol ) );
textItem->SetText( elem.text ); textItem->SetText( elem.text );
@ -1305,7 +1305,7 @@ void SCH_ALTIUM_PLUGIN::ParseBezier( const std::map<wxString, wxString>& aProper
LIB_SHAPE* line = new LIB_SHAPE( libSymbolIt->second, SHAPE_T::POLY ); LIB_SHAPE* line = new LIB_SHAPE( libSymbolIt->second, SHAPE_T::POLY );
libSymbolIt->second->AddDrawItem( line ); libSymbolIt->second->AddDrawItem( line );
line->SetUnit( elem.ownerpartid ); line->SetUnit( std::max( 0, elem.ownerpartid ) );
for( size_t j = i; j < elem.points.size() && j < i + 2; j++ ) for( size_t j = i; j < elem.points.size() && j < i + 2; j++ )
{ {
@ -1324,7 +1324,7 @@ void SCH_ALTIUM_PLUGIN::ParseBezier( const std::map<wxString, wxString>& aProper
LIB_SHAPE* line = new LIB_SHAPE( libSymbolIt->second, SHAPE_T::POLY ); LIB_SHAPE* line = new LIB_SHAPE( libSymbolIt->second, SHAPE_T::POLY );
libSymbolIt->second->AddDrawItem( line ); libSymbolIt->second->AddDrawItem( line );
line->SetUnit( elem.ownerpartid ); line->SetUnit( std::max( 0, elem.ownerpartid ) );
for( size_t j = i; j < elem.points.size() && j < i + 2; j++ ) for( size_t j = i; j < elem.points.size() && j < i + 2; j++ )
{ {
@ -1340,7 +1340,7 @@ void SCH_ALTIUM_PLUGIN::ParseBezier( const std::map<wxString, wxString>& aProper
LIB_SHAPE* bezier = new LIB_SHAPE( libSymbolIt->second, SHAPE_T::BEZIER ); LIB_SHAPE* bezier = new LIB_SHAPE( libSymbolIt->second, SHAPE_T::BEZIER );
libSymbolIt->second->AddDrawItem( bezier ); libSymbolIt->second->AddDrawItem( bezier );
bezier->SetUnit( elem.ownerpartid ); bezier->SetUnit( std::max( 0, elem.ownerpartid ) );
for( size_t j = i; j < elem.points.size() && j < i + 4; j++ ) for( size_t j = i; j < elem.points.size() && j < i + 4; j++ )
{ {
@ -1578,7 +1578,7 @@ void SCH_ALTIUM_PLUGIN::ParseArc( const std::map<wxString, wxString>& aPropertie
LIB_SHAPE* circle = new LIB_SHAPE( libSymbolIt->second, SHAPE_T::CIRCLE ); LIB_SHAPE* circle = new LIB_SHAPE( libSymbolIt->second, SHAPE_T::CIRCLE );
libSymbolIt->second->AddDrawItem( circle ); libSymbolIt->second->AddDrawItem( circle );
circle->SetUnit( elem.ownerpartid ); circle->SetUnit( std::max( 0, elem.ownerpartid ) );
circle->SetPosition( GetRelativePosition( elem.center + m_sheetOffset, symbol ) ); circle->SetPosition( GetRelativePosition( elem.center + m_sheetOffset, symbol ) );
circle->SetEnd( circle->GetPosition() + VECTOR2I( elem.radius, 0 ) ); circle->SetEnd( circle->GetPosition() + VECTOR2I( elem.radius, 0 ) );
@ -1588,7 +1588,7 @@ void SCH_ALTIUM_PLUGIN::ParseArc( const std::map<wxString, wxString>& aPropertie
{ {
LIB_SHAPE* arc = new LIB_SHAPE( libSymbolIt->second, SHAPE_T::ARC ); LIB_SHAPE* arc = new LIB_SHAPE( libSymbolIt->second, SHAPE_T::ARC );
libSymbolIt->second->AddDrawItem( arc ); libSymbolIt->second->AddDrawItem( arc );
arc->SetUnit( elem.ownerpartid ); arc->SetUnit( std::max( 0, elem.ownerpartid ) );
arc->SetCenter( GetRelativePosition( elem.center + m_sheetOffset, symbol ) ); arc->SetCenter( GetRelativePosition( elem.center + m_sheetOffset, symbol ) );
@ -1714,7 +1714,7 @@ void SCH_ALTIUM_PLUGIN::ParseLine( const std::map<wxString, wxString>& aProperti
LIB_SHAPE* line = new LIB_SHAPE( libSymbolIt->second, SHAPE_T::POLY ); LIB_SHAPE* line = new LIB_SHAPE( libSymbolIt->second, SHAPE_T::POLY );
libSymbolIt->second->AddDrawItem( line ); libSymbolIt->second->AddDrawItem( line );
line->SetUnit( elem.ownerpartid ); line->SetUnit( std::max( 0, elem.ownerpartid ) );
line->AddPoint( GetRelativePosition( elem.point1 + m_sheetOffset, symbol ) ); line->AddPoint( GetRelativePosition( elem.point1 + m_sheetOffset, symbol ) );
line->AddPoint( GetRelativePosition( elem.point2 + m_sheetOffset, symbol ) ); line->AddPoint( GetRelativePosition( elem.point2 + m_sheetOffset, symbol ) );
@ -2834,6 +2834,9 @@ void SCH_ALTIUM_PLUGIN::ParseDesignator( const std::map<wxString, wxString>& aPr
SCH_FIELD* field = symbol->GetField( VALUE_FIELD ); SCH_FIELD* field = symbol->GetField( VALUE_FIELD );
#if 0
// I am not sure value and ref should be invisible just because emptyRef is true
// I have examples with this criteria fully incorrect.
if ( emptyRef ) if ( emptyRef )
field->SetVisible( false ); field->SetVisible( false );
@ -2841,6 +2844,7 @@ void SCH_ALTIUM_PLUGIN::ParseDesignator( const std::map<wxString, wxString>& aPr
if ( emptyRef ) if ( emptyRef )
field->SetVisible( false ); field->SetVisible( false );
#endif
field->SetPosition( elem.location + m_sheetOffset ); field->SetPosition( elem.location + m_sheetOffset );
SetTextPositioning( field, elem.justification, elem.orientation ); SetTextPositioning( field, elem.justification, elem.orientation );