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

Restore legacy spin-style processing for text items. 

Post-V5 we only use it on labels, but earlier versions also
used it for text.

Also process spinStyle for CADSTAR imports.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/16488
This commit is contained in:
Jeff Young 2023-12-31 17:02:33 +00:00
parent 911a54ac82
commit 2a0486845d
2 changed files with 70 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
eeschema/sch_io/cadstar/cadstar_sch_archive_loader.cpp
View File

@ -3141,8 +3141,33 @@ void CADSTAR_SCH_ARCHIVE_LOADER::applyTextSettings( EDA_TEXT* aKiCadT
}
aKiCadTextItem->SetTextPos( pos );
switch( spin )
{
case SPIN_STYLE::RIGHT: // Horiz Normal Orientation
aKiCadTextItem->SetTextAngle( ANGLE_HORIZONTAL );
aKiCadTextItem->SetHorizJustify( GR_TEXT_H_ALIGN_LEFT );
break;
case SPIN_STYLE::UP: // Vert Orientation UP
aKiCadTextItem->SetTextAngle( ANGLE_VERTICAL );
aKiCadTextItem->SetHorizJustify( GR_TEXT_H_ALIGN_LEFT );
break;
case SPIN_STYLE::LEFT: // Horiz Orientation - Right justified
aKiCadTextItem->SetTextAngle( ANGLE_HORIZONTAL );
aKiCadTextItem->SetHorizJustify( GR_TEXT_H_ALIGN_RIGHT );
break;
case SPIN_STYLE::BOTTOM: // Vert Orientation BOTTOM
aKiCadTextItem->SetTextAngle( ANGLE_VERTICAL );
aKiCadTextItem->SetHorizJustify( GR_TEXT_H_ALIGN_RIGHT );
break;
}
aKiCadTextItem->SetVertJustify( GR_TEXT_V_ALIGN_BOTTOM );
break;
}
KI_FALLTHROUGH;
// We don't want to change position of net labels as that would break connectivity
case SCH_LABEL_T:

60
eeschema/sch_io/kicad_legacy/sch_io_kicad_legacy.cpp
View File

@ -996,6 +996,23 @@ SCH_TEXT* SCH_IO_KICAD_LEGACY::loadText( LINE_READER& aReader )
}
int spinStyle = parseInt( aReader, line, &line );
// Sadly we store the orientation of hierarchical and global labels using a different
// int encoding than that for local labels:
// Global Local
// Left justified 0 2
// Up 1 3
// Right justified 2 0
// Down 3 1
// So we must flip it as the enum is setup with the "global" numbering
if( textType != SCH_GLOBAL_LABEL_T && textType != SCH_HIER_LABEL_T )
{
if( spinStyle == 0 )
spinStyle = 2;
else if( spinStyle == 2 )
spinStyle = 0;
}
int size = schIUScale.MilsToIU( parseInt( aReader, line, &line ) );
text->SetTextSize( VECTOR2I( size, size ) );
@ -1004,22 +1021,6 @@ SCH_TEXT* SCH_IO_KICAD_LEGACY::loadText( LINE_READER& aReader )
{
SCH_LABEL_BASE* label = static_cast<SCH_LABEL_BASE*>( text.get() );
// Sadly we store the orientation of hierarchical and global labels using a different
// int encoding than that for local labels:
// Global Local
// Left justified 0 2
// Up 1 3
// Right justified 2 0
// Down 3 1
// So we must flip it as the enum is setup with the "global" numbering
if( textType == SCH_LABEL_T )
{
if( spinStyle == 0 )
spinStyle = 2;
else if( spinStyle == 2 )
spinStyle = 0;
}
label->SetSpinStyle( static_cast<SPIN_STYLE::SPIN>( spinStyle ) );
// Parse the global and hierarchical label type.
@ -1037,6 +1038,33 @@ SCH_TEXT* SCH_IO_KICAD_LEGACY::loadText( LINE_READER& aReader )
SCH_PARSE_ERROR( "invalid label type", aReader, line );
}
}
else if( textType == SCH_TEXT_T )
{
switch( spinStyle )
{
case SPIN_STYLE::RIGHT: // Horiz Normal Orientation
text->SetTextAngle( ANGLE_HORIZONTAL );
text->SetHorizJustify( GR_TEXT_H_ALIGN_LEFT );
break;
case SPIN_STYLE::UP: // Vert Orientation UP
text->SetTextAngle( ANGLE_VERTICAL );
text->SetHorizJustify( GR_TEXT_H_ALIGN_LEFT );
break;
case SPIN_STYLE::LEFT: // Horiz Orientation - Right justified
text->SetTextAngle( ANGLE_HORIZONTAL );
text->SetHorizJustify( GR_TEXT_H_ALIGN_RIGHT );
break;
case SPIN_STYLE::BOTTOM: // Vert Orientation BOTTOM
text->SetTextAngle( ANGLE_VERTICAL );
text->SetHorizJustify( GR_TEXT_H_ALIGN_RIGHT );
break;
}
text->SetVertJustify( GR_TEXT_V_ALIGN_BOTTOM );
}
int penWidth = 0;