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

Altium schematic: support component's DISPLAYMODE being a string.

This commit is contained in:
Alex Shvartzkop 2024-02-05 22:10:26 +03:00
parent e6929b2184
commit d8c72e845c
3 changed files with 25 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
eeschema/sch_io/altium/altium_parser_sch.cpp
View File

@ -134,10 +134,18 @@ ASCH_SYMBOL::ASCH_SYMBOL( const std::map<wxString, wxString>& aProps )
location = VECTOR2I( ReadKiCadUnitFrac( aProps, "LOCATION.X" ),
-ReadKiCadUnitFrac( aProps, "LOCATION.Y" ) );
partcount = ALTIUM_PARSER::ReadInt( aProps, "PARTCOUNT", 0 );
partcount = ALTIUM_PARSER::ReadInt( aProps, "PARTCOUNT", 0 );
displaymodecount = ALTIUM_PARSER::ReadInt( aProps, "DISPLAYMODECOUNT", 0 );
m_indexInSheet = ALTIUM_PARSER::ReadInt( aProps, "INDEXINSHEET", -1 );
displaymode = ALTIUM_PARSER::ReadInt( aProps, "DISPLAYMODE", 0 );
m_indexInSheet = ALTIUM_PARSER::ReadInt( aProps, "INDEXINSHEET", -1 );
// DISPLAYMODE may be a string. Leave displaymode at 0 in this case.
displaymode = 0;
wxString displayModeStr = ALTIUM_PARSER::ReadString( aProps, "DISPLAYMODE", "" );
long v = 0;
if( displayModeStr.ToCLong( &v ) )
displaymode = int( v );
}

50
eeschema/sch_io/altium/sch_io_altium.cpp
View File

@ -896,13 +896,13 @@ void SCH_IO_ALTIUM::ParseFileHeader( const ALTIUM_COMPOUND_FILE& aAltiumSchFile
}
bool SCH_IO_ALTIUM::IsComponentPartVisible( int aOwnerindex, int aOwnerpartdisplaymode ) const
bool SCH_IO_ALTIUM::IsComponentPartVisible( const ASCH_OWNER_INTERFACE& aElem ) const
{
const auto& component = m_altiumComponents.find( aOwnerindex );
const auto& templ = m_altiumTemplates.find( aOwnerindex );
const auto& component = m_altiumComponents.find( aElem.ownerindex );
const auto& templ = m_altiumTemplates.find( aElem.ownerindex );
if( component != m_altiumComponents.end() )
return component->second.displaymode == aOwnerpartdisplaymode;
return component->second.displaymode == aElem.ownerpartdisplaymode;
if( templ != m_altiumTemplates.end() )
return true;
@ -1036,7 +1036,7 @@ void SCH_IO_ALTIUM::ParsePin( const std::map<wxString, wxString>& aProperties,
return;
}
if( !IsComponentPartVisible( elem.ownerindex, elem.ownerpartdisplaymode ) )
if( !IsComponentPartVisible( elem ) )
return;
schSymbol = m_symbols.at( libSymbolIt->first );
@ -1636,11 +1636,8 @@ void SCH_IO_ALTIUM::ParseBezier( const std::map<wxString, wxString>& aProperties
schsym = m_symbols.at( libSymbolIt->first );
}
if( aSymbol.empty()
&& !IsComponentPartVisible( elem.ownerindex, elem.ownerpartdisplaymode ) )
{
if( aSymbol.empty() && !IsComponentPartVisible( elem ) )
return;
}
for( size_t i = 0; i + 1 < elem.points.size(); i += 3 )
{
@ -1771,11 +1768,8 @@ void SCH_IO_ALTIUM::ParsePolyline( const std::map<wxString, wxString>& aProperti
schsym = m_symbols.at( libSymbolIt->first );
}
if( aSymbol.empty()
&& !IsComponentPartVisible( elem.ownerindex, elem.ownerpartdisplaymode ) )
{
if( aSymbol.empty() && !IsComponentPartVisible( elem ) )
return;
}
LIB_SHAPE* line = new LIB_SHAPE( symbol, SHAPE_T::POLY );
symbol->AddDrawItem( line, false );
@ -1845,11 +1839,8 @@ void SCH_IO_ALTIUM::ParsePolygon( const std::map<wxString, wxString>& aPropertie
schsym = m_symbols.at( libSymbolIt->first );
}
if( aSymbol.empty()
&& !IsComponentPartVisible( elem.ownerindex, elem.ownerpartdisplaymode ) )
{
if( aSymbol.empty() && !IsComponentPartVisible( elem ) )
return;
}
LIB_SHAPE* line = new LIB_SHAPE( symbol, SHAPE_T::POLY );
@ -1929,11 +1920,8 @@ void SCH_IO_ALTIUM::ParseRoundRectangle( const std::map<wxString, wxString>& aPr
schsym = m_symbols.at( libSymbolIt->first );
}
if( aSymbol.empty()
&& !IsComponentPartVisible( elem.ownerindex, elem.ownerpartdisplaymode ) )
{
if( aSymbol.empty() && !IsComponentPartVisible( elem ) )
return;
}
LIB_SHAPE* rect = nullptr;
@ -2048,11 +2036,8 @@ void SCH_IO_ALTIUM::ParseArc( const std::map<wxString, wxString>& aProperties,
schsym = m_symbols.at( libSymbolIt->first );
}
if( aSymbol.empty()
&& !IsComponentPartVisible( elem.ownerindex, elem.ownerpartdisplaymode ) )
{
if( aSymbol.empty() && !IsComponentPartVisible( elem ) )
return;
}
if( elem.m_StartAngle == 0 && ( elem.m_EndAngle == 0 || elem.m_EndAngle == 360 ) )
{
@ -2155,11 +2140,8 @@ void SCH_IO_ALTIUM::ParseEllipticalArc( const std::map<wxString, wxString>& aPro
schsym = m_symbols.at( libSymbolIt->first );
}
if( aSymbol.empty()
&& !IsComponentPartVisible( elem.ownerindex, elem.ownerpartdisplaymode ) )
{
if( aSymbol.empty() && !IsComponentPartVisible( elem ) )
return;
}
ELLIPSE<int> ellipse( elem.m_Center, elem.m_Radius,
KiROUND( elem.m_SecondaryRadius ), ANGLE_0,
@ -2452,11 +2434,8 @@ void SCH_IO_ALTIUM::ParseLine( const std::map<wxString, wxString>& aProperties,
schsym = m_symbols.at( libSymbolIt->first );
}
if( aSymbol.empty()
&& !IsComponentPartVisible( elem.ownerindex, elem.ownerpartdisplaymode ) )
{
if( aSymbol.empty() && !IsComponentPartVisible( elem ) )
return;
}
LIB_SHAPE* line = new LIB_SHAPE( symbol, SHAPE_T::POLY );
symbol->AddDrawItem( line, false );
@ -2690,11 +2669,8 @@ void SCH_IO_ALTIUM::ParseRectangle( const std::map<wxString, wxString>& aPropert
schsym = m_symbols.at( libSymbolIt->first );
}
if( aSymbol.empty()
&& !IsComponentPartVisible( elem.ownerindex, elem.ownerpartdisplaymode ) )
{
if( aSymbol.empty() && !IsComponentPartVisible( elem ) )
return;
}
LIB_SHAPE* rect = new LIB_SHAPE( symbol, SHAPE_T::RECTANGLE );
symbol->AddDrawItem( rect, false );

2
eeschema/sch_io/altium/sch_io_altium.h
View File

@ -121,7 +121,7 @@ private:
SCH_SHEET* getCurrentSheet();
bool ShouldPutItemOnSheet( int aOwnerindex );
bool IsComponentPartVisible( int aOwnerindex, int aOwnerpartdisplaymode ) const;
bool IsComponentPartVisible( const ASCH_OWNER_INTERFACE& aElem ) const;
const ASCH_STORAGE_FILE* GetFileFromStorage( const wxString& aFilename ) const;
void AddTextBox( const ASCH_TEXT_FRAME* aElem );
void AddLibTextBox( const ASCH_TEXT_FRAME* aElem, std::vector<LIB_SYMBOL*>& aSymbol = nullsym, std::vector<int>& aFontSize = nullint );