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

Use consistent label size and fix issues with rotation. 

Fixes https://gitlab.com/kicad/code/kicad/issues/5950
This commit is contained in:
Jeff Young 2021-09-20 15:39:56 +01:00
parent 40b4e5c024
commit ae8f817938
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp
View File

@ -1173,20 +1173,13 @@ SCH_TEXT* SCH_EAGLE_PLUGIN::loadLabel( wxXmlNode* aLabelNode, const wxString& aN
bool global = m_netCounts[aNetName] > 1;
std::unique_ptr<SCH_TEXT> label;
wxSize textSize;
wxSize textSize = wxSize( KiROUND( elabel.size.ToSchUnits() * 0.7 ),
KiROUND( elabel.size.ToSchUnits() * 0.7 ) );
if( global )
{
label = std::make_unique<SCH_GLOBALLABEL>();
textSize = wxSize( KiROUND( elabel.size.ToSchUnits() * 0.75 ),
KiROUND( elabel.size.ToSchUnits() * 0.75 ) );
}
else
{
label = std::make_unique<SCH_LABEL>();
textSize = wxSize( KiROUND( elabel.size.ToSchUnits() * 0.85 ),
KiROUND( elabel.size.ToSchUnits() * 0.85 ) );
}
label->SetPosition( elabelpos );
label->SetText( escapeName( elabel.netname ) );
@ -1195,13 +1188,11 @@ SCH_TEXT* SCH_EAGLE_PLUGIN::loadLabel( wxXmlNode* aLabelNode, const wxString& aN
if( elabel.rot )
{
label->SetLabelSpinStyle(
(LABEL_SPIN_STYLE::SPIN) ( KiROUND( elabel.rot->degrees / 90 ) % 4 ) );
for( int i = 0; i < KiROUND( elabel.rot->degrees / 90 ) %4; ++i )
label->Rotate90( false );
if( elabel.rot->mirror )
{
label->SetLabelSpinStyle( label->GetLabelSpinStyle().MirrorY() );
}
label->MirrorSpinStyle( false );
}
return label.release();