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

Altium fixes 

- Designators and Parameters are shared by all display modes, so don't
  try to extract one, just place the elements on them all
This commit is contained in:
Seth Hillbrand 2023-09-06 11:36:27 -07:00
parent 468beb5a05
commit 25a60fac54
2 changed files with 108 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3415,38 +3415,10 @@ void SCH_ALTIUM_PLUGIN::ParseFileName( const std::map<wxString, wxString>& aProp
} }
void SCH_ALTIUM_PLUGIN::ParseDesignator( const std::map<wxString, wxString>& aProperties, void SCH_ALTIUM_PLUGIN::ParseDesignator( const std::map<wxString, wxString>& aProperties )
std::vector<LIB_SYMBOL*>& aSymbol,
std::vector<int>& aFontSizes )
{ {
ASCH_DESIGNATOR elem( aProperties ); ASCH_DESIGNATOR elem( aProperties );
if( !aSymbol.empty() )
{
wxCHECK_RET( static_cast<int>( aSymbol.size() ) > elem.ownerpartdisplaymode, wxT( "Invalid ownerpartdisplaymode" ) );
LIB_SYMBOL* symbol = aSymbol[elem.ownerpartdisplaymode];
bool emptyRef = elem.text.IsEmpty();
LIB_FIELD& refField = symbol->GetReferenceField();
if( emptyRef )
refField.SetText( wxT( "X" ) );
else
refField.SetText( elem.text.BeforeLast( '?' ) ); // remove the '?' at the end for KiCad-style
refField.SetPosition( GetLibEditPosition( elem.location ) );
if( elem.fontId > 0 && elem.fontId <= static_cast<int>( aFontSizes.size() ) )
{
int size = aFontSizes[elem.fontId - 1];
refField.SetTextSize( { size, size } );
}
return;
}
const auto& libSymbolIt = m_libSymbols.find( elem.ownerindex ); const auto& libSymbolIt = m_libSymbols.find( elem.ownerindex );
if( libSymbolIt == m_libSymbols.end() ) if( libSymbolIt == m_libSymbols.end() )
@ -3482,6 +3454,34 @@ void SCH_ALTIUM_PLUGIN::ParseDesignator( const std::map<wxString, wxString>& aPr
} }
void SCH_ALTIUM_PLUGIN::ParseLibDesignator( const std::map<wxString, wxString>& aProperties,
std::vector<LIB_SYMBOL*>& aSymbol,
std::vector<int>& aFontSizes )
{
ASCH_DESIGNATOR elem( aProperties );
// Designators are shared by everyone
for( LIB_SYMBOL* symbol : aSymbol )
{
bool emptyRef = elem.text.IsEmpty();
LIB_FIELD& refField = symbol->GetReferenceField();
if( emptyRef )
refField.SetText( wxT( "X" ) );
else
refField.SetText( elem.text.BeforeLast( '?' ) ); // remove the '?' at the end for KiCad-style
refField.SetPosition( GetLibEditPosition( elem.location ) );
if( elem.fontId > 0 && elem.fontId <= static_cast<int>( aFontSizes.size() ) )
{
int size = aFontSizes[elem.fontId - 1];
refField.SetTextSize( { size, size } );
}
}
}
void SCH_ALTIUM_PLUGIN::ParseBusEntry( const std::map<wxString, wxString>& aProperties ) void SCH_ALTIUM_PLUGIN::ParseBusEntry( const std::map<wxString, wxString>& aProperties )
{ {
ASCH_BUS_ENTRY elem( aProperties ); ASCH_BUS_ENTRY elem( aProperties );
@ -3499,9 +3499,7 @@ void SCH_ALTIUM_PLUGIN::ParseBusEntry( const std::map<wxString, wxString>& aProp
} }
void SCH_ALTIUM_PLUGIN::ParseParameter( const std::map<wxString, wxString>& aProperties, void SCH_ALTIUM_PLUGIN::ParseParameter( const std::map<wxString, wxString>& aProperties )
std::vector<LIB_SYMBOL*>& aSymbol,
std::vector<int>& aFontSizes )
{ {
ASCH_PARAMETER elem( aProperties ); ASCH_PARAMETER elem( aProperties );
@ -3511,7 +3509,7 @@ void SCH_ALTIUM_PLUGIN::ParseParameter( const std::map<wxString, wxString>& aPro
{ "VALUE", "ALTIUM_VALUE" }, { "VALUE", "ALTIUM_VALUE" },
}; };
if( aSymbol.empty() && elem.ownerindex <= 0 && elem.ownerpartid == ALTIUM_COMPONENT_NONE ) if( elem.ownerindex <= 0 && elem.ownerpartid == ALTIUM_COMPONENT_NONE )
{ {
// This is some sheet parameter // This is some sheet parameter
if( elem.text == "*" ) if( elem.text == "*" )
@ -3545,13 +3543,6 @@ void SCH_ALTIUM_PLUGIN::ParseParameter( const std::map<wxString, wxString>& aPro
} }
} }
else else
{
wxCHECK_RET( static_cast<int>( aSymbol.size() ) > elem.ownerpartdisplaymode, wxT( "Invalid ownerpartdisplaymode" ) );
LIB_SYMBOL* libSymbol = aSymbol[elem.ownerpartdisplaymode];
SCH_SYMBOL* symbol = nullptr;
if( !symbol )
{ {
const auto& libSymbolIt = m_libSymbols.find( elem.ownerindex ); const auto& libSymbolIt = m_libSymbols.find( elem.ownerindex );
@ -3561,18 +3552,12 @@ void SCH_ALTIUM_PLUGIN::ParseParameter( const std::map<wxString, wxString>& aPro
return; return;
} }
libSymbol = libSymbolIt->second; SCH_SYMBOL* symbol = m_symbols.at( libSymbolIt->first );
symbol = m_symbols.at( libSymbolIt->first ); SCH_FIELD* field = nullptr;
}
EDA_TEXT* field = nullptr;
wxString upperName = elem.name.Upper(); wxString upperName = elem.name.Upper();
if( upperName == "COMMENT" ) if( upperName == "COMMENT" )
{ {
if( !symbol )
field = &libSymbol->GetValueField();
else
field = symbol->GetField( VALUE_FIELD ); field = symbol->GetField( VALUE_FIELD );
} }
else else
@ -3580,9 +3565,6 @@ void SCH_ALTIUM_PLUGIN::ParseParameter( const std::map<wxString, wxString>& aPro
int fieldIdx = 0; int fieldIdx = 0;
wxString fieldName = elem.name.Upper(); wxString fieldName = elem.name.Upper();
if( !symbol )
fieldIdx = libSymbol->GetFieldCount();
else
fieldIdx = symbol->GetFieldCount(); fieldIdx = symbol->GetFieldCount();
if( fieldName.IsEmpty() ) if( fieldName.IsEmpty() )
@ -3593,16 +3575,9 @@ void SCH_ALTIUM_PLUGIN::ParseParameter( const std::map<wxString, wxString>& aPro
{ {
fieldName = wxString::Format( "ALTIUM_UNNAMED_%d", disambiguate++ ); fieldName = wxString::Format( "ALTIUM_UNNAMED_%d", disambiguate++ );
if( symbol )
{
if( !symbol->FindField( fieldName ) ) if( !symbol->FindField( fieldName ) )
break; break;
}
else
{
if( !libSymbol->FindField( fieldName ) )
break;
}
} }
} }
else if( fieldName == "VALUE" ) else if( fieldName == "VALUE" )
@ -3610,31 +3585,73 @@ void SCH_ALTIUM_PLUGIN::ParseParameter( const std::map<wxString, wxString>& aPro
fieldName = "ALTIUM_VALUE"; fieldName = "ALTIUM_VALUE";
} }
if( !symbol ) field = symbol->AddField( SCH_FIELD( VECTOR2I(), fieldIdx, symbol, fieldName ) );
}
wxString kicadText = AltiumSpecialStringsToKiCadVariables( elem.text, variableMap );
field->SetText( kicadText );
field->SetPosition( elem.location + m_sheetOffset );
field->SetVisible( !elem.isHidden );
SetTextPositioning( field, elem.justification, elem.orientation );
}
}
void SCH_ALTIUM_PLUGIN::ParseLibParameter( const std::map<wxString, wxString>& aProperties,
std::vector<LIB_SYMBOL*>& aSymbol,
std::vector<int>& aFontSizes )
{ {
LIB_FIELD* new_field = new LIB_FIELD( fieldIdx, fieldName ); ASCH_PARAMETER elem( aProperties );
libSymbol->AddField( new_field );
field = new_field; // TODO: fill in replacements from variant, sheet and project
// N.B. We do not keep the Altium "VALUE" variable here because
// we don't have a way to assign variables to specific symbols
std::map<wxString, wxString> variableMap = {
{ "COMMENT", "VALUE" },
};
for( LIB_SYMBOL* libSymbol : aSymbol )
{
LIB_FIELD* field = nullptr;
wxString upperName = elem.name.Upper();
if( upperName == "COMMENT" )
{
field = &libSymbol->GetValueField();
} }
else else
{ {
field = symbol->AddField( SCH_FIELD( VECTOR2I(), fieldIdx, symbol, fieldName ) ); int fieldIdx = libSymbol->GetFieldCount();
wxString fieldName = elem.name.Upper();
if( fieldName.IsEmpty() )
{
int disambiguate = 1;
while( 1 )
{
fieldName = wxString::Format( "ALTIUM_UNNAMED_%d", disambiguate++ );
if( !libSymbol->FindField( fieldName ) )
break;
} }
} }
else if( fieldName == "VALUE" )
{
fieldName = "ALTIUM_VALUE";
}
LIB_FIELD* new_field = new LIB_FIELD( fieldIdx, fieldName );
libSymbol->AddField( new_field );
field = new_field;
}
wxString kicadText = AltiumSpecialStringsToKiCadVariables( elem.text, variableMap ); wxString kicadText = AltiumSpecialStringsToKiCadVariables( elem.text, variableMap );
field->SetText( kicadText ); field->SetText( kicadText );
if( !symbol )
{
field->SetTextPos( elem.location );
SetTextPositioning( field, elem.justification, elem.orientation );
}
else
{
static_cast<SCH_FIELD*>( field )->SetPosition( elem.location + m_sheetOffset );
}
field->SetTextPos( GetLibEditPosition( elem.location ) );
SetTextPositioning( field, elem.justification, elem.orientation );
field->SetVisible( !elem.isHidden ); field->SetVisible( !elem.isHidden );
SetTextPositioning( field, elem.justification, elem.orientation ); SetTextPositioning( field, elem.justification, elem.orientation );
@ -3856,9 +3873,9 @@ std::map<wxString,LIB_SYMBOL*> SCH_ALTIUM_PLUGIN::ParseLibFile( const ALTIUM_COM
case ALTIUM_SCH_RECORD::RECTANGLE: ParseRectangle( properties, symbols ); break; case ALTIUM_SCH_RECORD::RECTANGLE: ParseRectangle( properties, symbols ); break;
case ALTIUM_SCH_RECORD::DESIGNATOR: ParseDesignator( properties, symbols, fontSizes ); break; case ALTIUM_SCH_RECORD::DESIGNATOR: ParseLibDesignator( properties, symbols, fontSizes ); break;
case ALTIUM_SCH_RECORD::PARAMETER: ParseParameter( properties, symbols, fontSizes ); break; case ALTIUM_SCH_RECORD::PARAMETER: ParseLibParameter( properties, symbols, fontSizes ); break;
case ALTIUM_SCH_RECORD::TEXT_FRAME: ParseTextFrame( properties, symbols, fontSizes ); break; case ALTIUM_SCH_RECORD::TEXT_FRAME: ParseTextFrame( properties, symbols, fontSizes ); break;

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

@ -131,12 +131,12 @@ private:
bool IsComponentPartVisible( int aOwnerindex, int aOwnerpartdisplaymode ) const; bool IsComponentPartVisible( int aOwnerindex, int aOwnerpartdisplaymode ) const;
const ASCH_STORAGE_FILE* GetFileFromStorage( const wxString& aFilename ) const; const ASCH_STORAGE_FILE* GetFileFromStorage( const wxString& aFilename ) const;
void AddTextBox( const ASCH_TEXT_FRAME* aElem ); void AddTextBox( const ASCH_TEXT_FRAME* aElem );
void AddLibTextBox( const ASCH_TEXT_FRAME* aElem, std::vector<LIB_SYMBOL*>& aSymbol = nullsym, std::vector<int>& aSymbolIndex = nullint ); void AddLibTextBox( const ASCH_TEXT_FRAME* aElem, std::vector<LIB_SYMBOL*>& aSymbol = nullsym, std::vector<int>& aFontSize = nullint );
void ParseComponent( int aIndex, const std::map<wxString, wxString>& aProperties ); void ParseComponent( int aIndex, const std::map<wxString, wxString>& aProperties );
void ParsePin( const std::map<wxString, wxString>& aProperties, std::vector<LIB_SYMBOL*>& aSymbol = nullsym); void ParsePin( const std::map<wxString, wxString>& aProperties, std::vector<LIB_SYMBOL*>& aSymbol = nullsym);
void ParseLabel( const std::map<wxString, wxString>& aProperties, std::vector<LIB_SYMBOL*>& aSymbol = nullsym, std::vector<int>& aSymbolIndex = nullint ); void ParseLabel( const std::map<wxString, wxString>& aProperties, std::vector<LIB_SYMBOL*>& aSymbol = nullsym, std::vector<int>& aFontSize = nullint );
void ParseTextFrame( const std::map<wxString, wxString>& aProperties, std::vector<LIB_SYMBOL*>& aSymbol = nullsym, std::vector<int>& aSymbolIndex = nullint ); void ParseTextFrame( const std::map<wxString, wxString>& aProperties, std::vector<LIB_SYMBOL*>& aSymbol = nullsym, std::vector<int>& aFontSize = nullint );
void ParseNote( const std::map<wxString, wxString>& aProperties ); void ParseNote( const std::map<wxString, wxString>& aProperties );
void ParseBezier( const std::map<wxString, wxString>& aProperties, std::vector<LIB_SYMBOL*>& aSymbol = nullsym); void ParseBezier( const std::map<wxString, wxString>& aProperties, std::vector<LIB_SYMBOL*>& aSymbol = nullsym);
void ParsePolyline( const std::map<wxString, wxString>& aProperties, std::vector<LIB_SYMBOL*>& aSymbol = nullsym); void ParsePolyline( const std::map<wxString, wxString>& aProperties, std::vector<LIB_SYMBOL*>& aSymbol = nullsym);
@ -167,9 +167,11 @@ private:
void ParseSheet( const std::map<wxString, wxString>& aProperties ); void ParseSheet( const std::map<wxString, wxString>& aProperties );
void ParseSheetName( const std::map<wxString, wxString>& aProperties ); void ParseSheetName( const std::map<wxString, wxString>& aProperties );
void ParseFileName( const std::map<wxString, wxString>& aProperties ); void ParseFileName( const std::map<wxString, wxString>& aProperties );
void ParseDesignator( const std::map<wxString, wxString>& aProperties, std::vector<LIB_SYMBOL*>& aSymbol = nullsym, std::vector<int>& aSymbolIndex = nullint ); void ParseDesignator( const std::map<wxString, wxString>& aProperties );
void ParseLibDesignator( const std::map<wxString, wxString>& aProperties, std::vector<LIB_SYMBOL*>& aSymbol = nullsym, std::vector<int>& aFontSize = nullint );
void ParseBusEntry( const std::map<wxString, wxString>& aProperties ); void ParseBusEntry( const std::map<wxString, wxString>& aProperties );
void ParseParameter( const std::map<wxString, wxString>& aProperties, std::vector<LIB_SYMBOL*>& aSymbol = nullsym, std::vector<int>& aSymbolIndex = nullint ); void ParseParameter( const std::map<wxString, wxString>& aProperties );
void ParseLibParameter( const std::map<wxString, wxString>& aProperties, std::vector<LIB_SYMBOL*>& aSymbol = nullsym, std::vector<int>& aFontSize = nullint );
void ParseImplementationList( int aIndex, const std::map<wxString, wxString>& aProperties ); void ParseImplementationList( int aIndex, const std::map<wxString, wxString>& aProperties );
void ParseImplementation( const std::map<wxString, wxString>& aProperties, std::vector<LIB_SYMBOL*>& aSymbol = nullsym ); void ParseImplementation( const std::map<wxString, wxString>& aProperties, std::vector<LIB_SYMBOL*>& aSymbol = nullsym );