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

Formatting.

This commit is contained in:
Jeff Young 2021-07-07 18:30:36 +01:00
parent 5e9a8e3488
commit a81c6b21b6
1 changed files with 12 additions and 10 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

@ -1437,8 +1437,8 @@ void SCH_ALTIUM_PLUGIN::ParseSheetSymbol( int aIndex, const std::map<wxString,
SCH_SCREEN* screen = new SCH_SCREEN( m_schematic ); SCH_SCREEN* screen = new SCH_SCREEN( m_schematic );
sheet->SetSize( elem.size ); sheet->SetSize( elem.size );
sheet->SetBorderColor( GetColorFromInt( elem.color ) ); sheet->SetBorderColor( GetColorFromInt( elem.color ) );
if( elem.isSolid ) if( elem.isSolid )
sheet->SetBackgroundColor( GetColorFromInt( elem.areacolor ) ); sheet->SetBackgroundColor( GetColorFromInt( elem.areacolor ) );
@ -1455,9 +1455,9 @@ void SCH_ALTIUM_PLUGIN::ParseSheetEntry( const std::map<wxString, wxString>& aPr
{ {
ASCH_SHEET_ENTRY elem( aProperties ); ASCH_SHEET_ENTRY elem( aProperties );
const auto& sheet = m_sheets.find( elem.ownerindex ); const auto& sheetIt = m_sheets.find( elem.ownerindex );
if( sheet == m_sheets.end() ) if( sheetIt == m_sheets.end() )
{ {
m_reporter->Report( wxString::Format( _( "Sheet entry's owner (%d) not found." ), m_reporter->Report( wxString::Format( _( "Sheet entry's owner (%d) not found." ),
elem.ownerindex ), elem.ownerindex ),
@ -1465,16 +1465,16 @@ void SCH_ALTIUM_PLUGIN::ParseSheetEntry( const std::map<wxString, wxString>& aPr
return; return;
} }
SCH_SHEET_PIN* sheetPin = new SCH_SHEET_PIN( sheet->second ); SCH_SHEET_PIN* sheetPin = new SCH_SHEET_PIN( sheetIt->second );
sheet->second->AddPin( sheetPin ); sheetIt->second->AddPin( sheetPin );
sheetPin->SetText( elem.name ); sheetPin->SetText( elem.name );
sheetPin->SetShape( PINSHEETLABEL_SHAPE::PS_UNSPECIFIED ); sheetPin->SetShape( PINSHEETLABEL_SHAPE::PS_UNSPECIFIED );
//sheetPin->SetLabelSpinStyle( getSpinStyle( term.OrientAngle, false ) ); //sheetPin->SetLabelSpinStyle( getSpinStyle( term.OrientAngle, false ) );
//sheetPin->SetPosition( getKiCadPoint( term.Position ) ); //sheetPin->SetPosition( getKiCadPoint( term.Position ) );
wxPoint pos = sheet->second->GetPosition(); wxPoint pos = sheetIt->second->GetPosition();
wxSize size = sheet->second->GetSize(); wxSize size = sheetIt->second->GetSize();
switch( elem.side ) switch( elem.side )
{ {
@ -2114,6 +2114,7 @@ void SCH_ALTIUM_PLUGIN::ParseSheet( const std::map<wxString, wxString>& aPropert
PAGE_INFO pageInfo; PAGE_INFO pageInfo;
bool isPortrait = m_altiumSheet->sheetOrientation == ASCH_SHEET_WORKSPACEORIENTATION::PORTRAIT; bool isPortrait = m_altiumSheet->sheetOrientation == ASCH_SHEET_WORKSPACEORIENTATION::PORTRAIT;
switch( m_altiumSheet->sheetSize ) switch( m_altiumSheet->sheetSize )
{ {
default: default:
@ -2160,8 +2161,9 @@ void SCH_ALTIUM_PLUGIN::ParseSheetName( const std::map<wxString, wxString>& aPro
{ {
ASCH_SHEET_NAME elem( aProperties ); ASCH_SHEET_NAME elem( aProperties );
const auto& sheet = m_sheets.find( elem.ownerindex ); const auto& sheetIt = m_sheets.find( elem.ownerindex );
if( sheet == m_sheets.end() )
if( sheetIt == m_sheets.end() )
{ {
m_reporter->Report( wxString::Format( _( "Sheetname's owner (%d) not found." ), m_reporter->Report( wxString::Format( _( "Sheetname's owner (%d) not found." ),
elem.ownerindex ), elem.ownerindex ),
@ -2169,7 +2171,7 @@ void SCH_ALTIUM_PLUGIN::ParseSheetName( const std::map<wxString, wxString>& aPro
return; return;
} }
SCH_FIELD& sheetNameField = sheet->second->GetFields()[SHEETNAME]; SCH_FIELD& sheetNameField = sheetIt->second->GetFields()[SHEETNAME];
sheetNameField.SetPosition( elem.location + m_sheetOffset ); sheetNameField.SetPosition( elem.location + m_sheetOffset );
sheetNameField.SetText( elem.text ); sheetNameField.SetText( elem.text );