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

Altium import: set units for LIB_TEXTBOX. 

Still doesn't work on symbols in schematic for some reason.
This commit is contained in:
Alex Shvartzkop 2023-09-09 20:27:51 +03:00
parent cd9fcc1b87
commit c96b7bb472
1 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1302,7 +1302,7 @@ void SCH_ALTIUM_PLUGIN::ParseTextFrame( const std::map<wxString, wxString>& aPro
{ {
ASCH_TEXT_FRAME elem( aProperties ); ASCH_TEXT_FRAME elem( aProperties );
if( aSymbol.empty() ) if( aSymbol.empty() && elem.ownerpartid == ALTIUM_COMPONENT_NONE )
AddTextBox( &elem ); AddTextBox( &elem );
else else
AddLibTextBox( &elem, aSymbol, aFontSizes ); AddLibTextBox( &elem, aSymbol, aFontSizes );
@ -1383,17 +1383,45 @@ void SCH_ALTIUM_PLUGIN::AddTextBox(const ASCH_TEXT_FRAME *aElem )
void SCH_ALTIUM_PLUGIN::AddLibTextBox(const ASCH_TEXT_FRAME *aElem, std::vector<LIB_SYMBOL*>& aSymbol, std::vector<int>& aFontSizes ) void SCH_ALTIUM_PLUGIN::AddLibTextBox(const ASCH_TEXT_FRAME *aElem, std::vector<LIB_SYMBOL*>& aSymbol, std::vector<int>& aFontSizes )
{ {
if( aElem->ownerpartdisplaymode >= static_cast<int>( aSymbol.size() ) ) LIB_SYMBOL* symbol = static_cast<int>( aSymbol.size() ) <= aElem->ownerpartdisplaymode
return; ? nullptr
: aSymbol[aElem->ownerpartdisplaymode];
SCH_SYMBOL* schsym = nullptr;
if( !symbol )
{
const auto& libSymbolIt = m_libSymbols.find( aElem->ownerindex );
if( libSymbolIt == m_libSymbols.end() )
{
// TODO: e.g. can depend on Template (RECORD=39
m_reporter->Report(
wxString::Format( wxT( "Label's owner (%d) not found." ), aElem->ownerindex ),
RPT_SEVERITY_DEBUG );
return;
}
symbol = libSymbolIt->second;
schsym = m_symbols.at( libSymbolIt->first );
}
LIB_SYMBOL* symbol = aSymbol[aElem->ownerpartdisplaymode];
LIB_TEXTBOX* textBox = new LIB_TEXTBOX( symbol ); LIB_TEXTBOX* textBox = new LIB_TEXTBOX( symbol );
VECTOR2I sheetTopRight = GetLibEditPosition( aElem->TopRight ); textBox->SetUnit( std::max( 0, aElem->ownerpartid ) );
VECTOR2I sheetBottomLeft = GetLibEditPosition( aElem->BottomLeft );
textBox->SetStart( sheetTopRight ); symbol->AddDrawItem( textBox, false );
textBox->SetEnd( sheetBottomLeft );
/// Handle text frames that are in a library symbol, not on schematic
if( !schsym )
{
textBox->SetStart( GetLibEditPosition( aElem->TopRight ) );
textBox->SetEnd( GetLibEditPosition( aElem->BottomLeft ) );
}
else
{
textBox->SetStart( GetRelativePosition( aElem->TopRight + m_sheetOffset, schsym ) );
textBox->SetEnd( GetRelativePosition( aElem->BottomLeft + m_sheetOffset, schsym ) );
}
textBox->SetText( aElem->Text ); textBox->SetText( aElem->Text );
@ -1429,9 +1457,6 @@ void SCH_ALTIUM_PLUGIN::AddLibTextBox(const ASCH_TEXT_FRAME *aElem, std::vector<
int size = aFontSizes[aElem->FontID - 1]; int size = aFontSizes[aElem->FontID - 1];
textBox->SetTextSize( { size, size } ); textBox->SetTextSize( { size, size } );
} }
symbol->AddDrawItem( textBox, false );
} }