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

Bug fixes for LIB_PIN boundbox generation. 

(cherry picked from commit 9ce5978c3d)
This commit is contained in:
Jeff Young 2023-02-07 15:06:20 +00:00
parent a292bf7c83
commit 94c450ad16
1 changed files with 40 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
eeschema/lib_pin.cpp
View File

@ -1205,7 +1205,7 @@ const BOX2I LIB_PIN::GetBoundingBox( bool aIncludeInvisiblePins, bool aIncludeNa
BOX2I bbox; BOX2I bbox;
VECTOR2I begin; VECTOR2I begin;
VECTOR2I end; VECTOR2I end;
int nameTextOffset = 0; int pinNameOffset = 0;
int nameTextLength = 0; int nameTextLength = 0;
int nameTextHeight = 0; int nameTextHeight = 0;
int numberTextLength = 0; int numberTextLength = 0;
@ -1228,7 +1228,7 @@ const BOX2I LIB_PIN::GetBoundingBox( bool aIncludeInvisiblePins, bool aIncludeNa
if( GetParent() ) if( GetParent() )
{ {
if( GetParent()->ShowPinNames() ) if( GetParent()->ShowPinNames() )
nameTextOffset = GetParent()->GetPinNameOffset(); pinNameOffset = GetParent()->GetPinNameOffset();
else else
includeName = false; includeName = false;
@ -1236,30 +1236,42 @@ const BOX2I LIB_PIN::GetBoundingBox( bool aIncludeInvisiblePins, bool aIncludeNa
includeNumber = false; includeNumber = false;
} }
// Get maximum height including ascenders and descenders
wxString test = wxT( "Xg" );
if( includeNumber ) if( includeNumber )
{ {
VECTOR2D fontSize( m_numTextSize, m_numTextSize ); VECTOR2D fontSize( m_numTextSize, m_numTextSize );
VECTOR2I numSize = font->StringBoundaryLimits( number, fontSize, penWidth, false, false ); numberTextLength = font->StringBoundaryLimits( number, fontSize, penWidth, false, false ).x;
numberTextHeight = font->StringBoundaryLimits( test, fontSize, penWidth, false, false ).y;
numberTextLength = numSize.x;
numberTextHeight = numSize.y;
} }
if( includeName ) if( includeName )
{ {
VECTOR2D fontSize( m_nameTextSize, m_nameTextSize ); VECTOR2D fontSize( m_nameTextSize, m_nameTextSize );
VECTOR2I nameSize = font->StringBoundaryLimits( name, fontSize, penWidth, false, false );
nameTextLength = nameSize.x + nameTextOffset; nameTextLength = font->StringBoundaryLimits( name, fontSize, penWidth, false, false ).x
nameTextHeight = nameSize.y + schIUScale.MilsToIU( PIN_TEXT_MARGIN ); + pinNameOffset;
nameTextHeight = font->StringBoundaryLimits( test, fontSize, penWidth, false, false ).y
+ schIUScale.MilsToIU( PIN_TEXT_MARGIN );
}
// KIFONT has to be rather tight on boundary limits for knockout text in PCBNew, but in truth
// the stroke font returns a vertically under-sized bounding box (even though it *does* in fact
// attempt to account for the font size being stroke centre-point to stroke centre-point).
if( font->IsStroke() )
{
numberTextHeight += 2 * penWidth;
nameTextHeight += 2 * penWidth;
} }
if( includeType ) if( includeType )
{ {
double fontSize = std::max( m_nameTextSize * 3 / 4, schIUScale.mmToIU( 0.7 ) ); double fontSize = std::max( m_nameTextSize * 3 / 4, schIUScale.mmToIU( 0.7 ) );
double stroke = fontSize / 8.0;
VECTOR2I typeTextSize = font->StringBoundaryLimits( GetElectricalTypeName(), VECTOR2I typeTextSize = font->StringBoundaryLimits( GetElectricalTypeName(),
VECTOR2D( fontSize, fontSize ), VECTOR2D( fontSize, fontSize ),
fontSize / 8.0, false, false ); KiROUND( stroke ), false, false );
typeTextLength = typeTextSize.x + schIUScale.MilsToIU( PIN_TEXT_MARGIN ) + TARGET_PIN_RADIUS; typeTextLength = typeTextSize.x + schIUScale.MilsToIU( PIN_TEXT_MARGIN ) + TARGET_PIN_RADIUS;
minsizeV = std::max( minsizeV, typeTextSize.y / 2 ); minsizeV = std::max( minsizeV, typeTextSize.y / 2 );
@ -1269,24 +1281,30 @@ const BOX2I LIB_PIN::GetBoundingBox( bool aIncludeInvisiblePins, bool aIncludeNa
if( m_shape == GRAPHIC_PINSHAPE::INVERTED || m_shape == GRAPHIC_PINSHAPE::INVERTED_CLOCK ) if( m_shape == GRAPHIC_PINSHAPE::INVERTED || m_shape == GRAPHIC_PINSHAPE::INVERTED_CLOCK )
minsizeV = std::max( TARGET_PIN_RADIUS, externalPinDecoSize( nullptr, *this ) ); minsizeV = std::max( TARGET_PIN_RADIUS, externalPinDecoSize( nullptr, *this ) );
// calculate top left corner position // Attempt to mimic SCH_PAINTER's algorithm without actually knowing the schematic text
// for the default pin orientation (PIN_RIGHT) // offset ratio.
begin.y = std::max( minsizeV, numberTextHeight + schIUScale.MilsToIU( PIN_TEXT_MARGIN ) ); int PIN_TEXT_OFFSET = schIUScale.MilsToIU( 24 ) + 2 * penWidth;
begin.x = std::min( -typeTextLength, m_length - ( numberTextLength / 2) );
// calculate bottom right corner position and adjust top left corner position // Calculate topLeft & bottomRight corner positions for the default pin orientation (PIN_RIGHT)
if( nameTextOffset ) // for values > 0, pin name is inside the body if( pinNameOffset || !includeName )
{ {
// pin name is inside the body (or invisible)
// pin number is above the line
begin.y = std::max( minsizeV, numberTextHeight + PIN_TEXT_OFFSET );
begin.x = std::min( -typeTextLength, m_length - ( numberTextLength / 2) );
end.x = m_length + nameTextLength; end.x = m_length + nameTextLength;
end.y = std::min( -minsizeV, -nameTextHeight / 2 ); end.y = std::min( -minsizeV, -nameTextHeight / 2 );
} }
else // if value == 0: else
// pin name is outside the body, and above the pin line
// pin num is below the pin line
{ {
end.x = std::max( m_length, nameTextLength ); // pin name is above pin line
end.y = -begin.y; // pin number is below line
begin.y = std::max( minsizeV, nameTextHeight ); begin.y = std::max( minsizeV, nameTextHeight + PIN_TEXT_OFFSET );
begin.x = std::min( -typeTextLength, m_length - ( numberTextLength / 2) );
end.x = std::max( m_length, nameTextLength );
end.y = std::min( -minsizeV, -numberTextHeight - PIN_TEXT_OFFSET );
} }
// Now, calculate boundary box corners position for the actual pin orientation // Now, calculate boundary box corners position for the actual pin orientation