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

Corrects text of orthogonal dimensions 

The 'outisde' position is now 'outside' in all orientations

Fixes https://gitlab.com/kicad/code/kicad/-/issues/5821
This commit is contained in:
Jeff Glass 2020-10-13 10:47:57 -05:00 committed by Seth Hillbrand
parent a9b9b693fc
commit 597a74af9a
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pcbnew/dimension.cpp
View File

@ -750,6 +750,9 @@ void ORTHOGONAL_DIMENSION::updateGeometry()
addShape( SHAPE_SEGMENT( extStart, extStart + extension.Resize( extensionHeight ) ) );
//##
//UpdateHeight(m_crossBarStart, m_crossBarEnd);
// Update text after calculating crossbar position but before adding crossbar lines
updateText();
@ -814,11 +817,20 @@ void ORTHOGONAL_DIMENSION::updateText()
{
int textOffsetDistance = m_text.GetEffectiveTextPenWidth() + m_text.GetTextHeight();
VECTOR2D height( m_crossBarStart - GetStart() );
VECTOR2D crossBar( m_crossBarEnd - m_crossBarStart );
if( height.Cross( crossBar ) > 0 )
m_height = height.EuclideanNorm();
else
m_height = -height.EuclideanNorm();
double rotation = sign( m_height ) * DEG2RAD( -90 );
VECTOR2I textOffset = crossbarCenter.Rotate( rotation ).Resize( textOffsetDistance );
textOffset += crossbarCenter;
m_text.SetTextPos( m_crossBarStart + wxPoint( textOffset ) );
m_text.SetTextAngle(rotation);
}
else if( m_textPosition == DIM_TEXT_POSITION::INLINE )
{