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

Be more careful about non-visible elements in fields autoplacer. 

Fixes https://gitlab.com/kicad/code/kicad/issues/10774
This commit is contained in:
Jeff Young 2022-02-28 00:17:55 +00:00
parent 8d28fe962f
commit f241617478
2 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
eeschema/autoplace_fields.cpp
View File

@ -135,14 +135,14 @@ public:
*/ */
void DoAutoplace( bool aManual ) void DoAutoplace( bool aManual )
{ {
bool force_wire_spacing = false; bool forceWireSpacing = false;
SIDE_AND_NPINS sideandpins = chooseSideForFields( aManual ); SIDE_AND_NPINS sideandpins = chooseSideForFields( aManual );
SIDE field_side = sideandpins.side; SIDE field_side = sideandpins.side;
VECTOR2I fbox_pos = fieldBoxPlacement( sideandpins ); VECTOR2I fbox_pos = fieldBoxPlacement( sideandpins );
EDA_RECT field_box( fbox_pos, m_fbox_size ); EDA_RECT field_box( fbox_pos, m_fbox_size );
if( aManual ) if( aManual )
force_wire_spacing = fitFieldsBetweenWires( &field_box, field_side ); forceWireSpacing = fitFieldsBetweenWires( &field_box, field_side );
// Move the fields // Move the fields
int last_y_coord = field_box.GetTop(); int last_y_coord = field_box.GetTop();
@ -150,6 +150,9 @@ public:
for( unsigned field_idx = 0; field_idx < m_fields.size(); ++field_idx ) for( unsigned field_idx = 0; field_idx < m_fields.size(); ++field_idx )
{ {
SCH_FIELD* field = m_fields[field_idx]; SCH_FIELD* field = m_fields[field_idx];
if( !field->IsVisible() )
continue;
if( m_allow_rejustify ) if( m_allow_rejustify )
{ {
@ -166,9 +169,8 @@ public:
} }
} }
VECTOR2I pos( VECTOR2I pos( fieldHPlacement( field, field_box ),
fieldHorizPlacement( field, field_box ), fieldVPlacement( field, field_box, &last_y_coord, !forceWireSpacing ) );
fieldVertPlacement( field, field_box, &last_y_coord, !force_wire_spacing ) );
if( m_align_to_grid ) if( m_align_to_grid )
{ {
@ -193,7 +195,15 @@ protected:
int max_field_width = 0; int max_field_width = 0;
int total_height = 0; int total_height = 0;
std::vector<SCH_FIELD*> visibleFields;
for( SCH_FIELD* field : m_fields ) for( SCH_FIELD* field : m_fields )
{
if( field->IsVisible() )
visibleFields.push_back( field );
}
for( SCH_FIELD* field : visibleFields )
{ {
if( m_symbol->GetTransform().y1 ) if( m_symbol->GetTransform().y1 )
field->SetTextAngle( ANGLE_VERTICAL ); field->SetTextAngle( ANGLE_VERTICAL );
@ -207,7 +217,7 @@ protected:
max_field_width = std::max( max_field_width, field_width ); max_field_width = std::max( max_field_width, field_width );
// Remove interline spacing from field_height for last line. // Remove interline spacing from field_height for last line.
if( field == m_fields[ m_fields.size() - 1 ] ) if( field == visibleFields.back() )
field_height *= 0.62; field_height *= 0.62;
if( !aDynamic ) if( !aDynamic )
@ -314,6 +324,7 @@ protected:
if( item_box.Intersects( aRect ) ) if( item_box.Intersects( aRect ) )
filtered.push_back( item ); filtered.push_back( item );
} }
return filtered; return filtered;
} }
@ -529,8 +540,8 @@ protected:
VECTOR2I fieldBoxPlacement( SIDE_AND_NPINS aFieldSideAndPins ) VECTOR2I fieldBoxPlacement( SIDE_AND_NPINS aFieldSideAndPins )
{ {
VECTOR2I fbox_center = m_symbol_bbox.Centre(); VECTOR2I fbox_center = m_symbol_bbox.Centre();
int offs_x = ( m_symbol_bbox.GetWidth() + m_fbox_size.GetWidth() ) / 2; int offs_x = ( m_symbol_bbox.GetWidth() + m_fbox_size.GetWidth() ) / 2;
int offs_y = ( m_symbol_bbox.GetHeight() + m_fbox_size.GetHeight() ) / 2; int offs_y = ( m_symbol_bbox.GetHeight() + m_fbox_size.GetHeight() ) / 2;
if( aFieldSideAndPins.side.x != 0 ) if( aFieldSideAndPins.side.x != 0 )
offs_x += HPADDING; offs_x += HPADDING;
@ -634,7 +645,7 @@ protected:
* *
* @return Correct field horizontal position * @return Correct field horizontal position
*/ */
int fieldHorizPlacement( SCH_FIELD *aField, const EDA_RECT &aFieldBox ) int fieldHPlacement( SCH_FIELD *aField, const EDA_RECT &aFieldBox )
{ {
int field_hjust; int field_hjust;
int field_xcoord; int field_xcoord;
@ -669,13 +680,13 @@ protected:
* *
* @param aField - the field to place. * @param aField - the field to place.
* @param aFieldBox - box in which fields will be placed. * @param aFieldBox - box in which fields will be placed.
* @param aPosAccum - pointer to a position accumulator * @param aAccumulatedPosition - pointer to a position accumulator
* @param aDynamic - use dynamic spacing * @param aDynamic - use dynamic spacing
* *
* @return Correct field vertical position * @return Correct field vertical position
*/ */
int fieldVertPlacement( SCH_FIELD *aField, const EDA_RECT &aFieldBox, int *aPosAccum, int fieldVPlacement( SCH_FIELD *aField, const EDA_RECT &aFieldBox, int *aAccumulatedPosition,
bool aDynamic ) bool aDynamic )
{ {
int field_height; int field_height;
int padding; int padding;
@ -696,9 +707,9 @@ protected:
padding = FIELD_PADDING; padding = FIELD_PADDING;
} }
int placement = *aPosAccum + padding / 2 + field_height / 2; int placement = *aAccumulatedPosition + padding / 2 + field_height / 2;
*aPosAccum += padding + field_height; *aAccumulatedPosition += padding + field_height;
return placement; return placement;
} }

4
eeschema/lib_symbol.cpp
View File

@ -899,10 +899,10 @@ const EDA_RECT LIB_SYMBOL::GetBodyBoundingBox( int aUnit, int aConvert, bool aIn
{ {
const LIB_PIN& pin = static_cast<const LIB_PIN&>( item ); const LIB_PIN& pin = static_cast<const LIB_PIN&>( item );
// Note: the roots of the pins are always inlcuded for symbols that don't have a // Note: the roots of the pins are always included for symbols that don't have a
// well-defined body. // well-defined body.
if( aIncludePins ) if( aIncludePins && pin.IsVisible() )
bbox.Merge( pin.GetBoundingBox( false, true ) ); bbox.Merge( pin.GetBoundingBox( false, true ) );
else else
bbox.Merge( pin.GetPinRoot() ); bbox.Merge( pin.GetPinRoot() );