realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 02:03:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

PCB_DIM_CENTER: fix incorrect bounding box size for 90deg cross.

Browse Source 
Fixes https://gitlab.com/kicad/code/kicad/-/issues/21643
This commit is contained in:
jean-pierre charras 2025-09-05 09:40:33 +02:00
parent 168975b0a8
commit 3bdf44d4a4
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pcbnew/pcb_dimension.cpp
View File

@ -1733,33 +1733,39 @@ BITMAPS PCB_DIM_CENTER::GetMenuImage() const
const BOX2I PCB_DIM_CENTER::GetBoundingBox() const const BOX2I PCB_DIM_CENTER::GetBoundingBox() const
{ {
int halfWidth = VECTOR2I( m_end - m_start ).x + ( m_lineThickness / 2.0 );
BOX2I bBox; BOX2I bBox;
int xmin, xmax, ymin, ymax;
bBox.SetX( m_start.x - halfWidth ); xmin = m_start.x;
bBox.SetY( m_start.y - halfWidth ); xmax = m_start.x;
bBox.SetWidth( halfWidth * 2 ); ymin = m_start.y;
bBox.SetHeight( halfWidth * 2 ); ymax = m_start.y;
for( const std::shared_ptr<SHAPE>& shape : GetShapes() )
{
BOX2I shapeBox = shape->BBox();
shapeBox.Inflate( m_lineThickness / 2 );
xmin = std::min( xmin, shapeBox.GetOrigin().x );
xmax = std::max( xmax, shapeBox.GetEnd().x );
ymin = std::min( ymin, shapeBox.GetOrigin().y );
ymax = std::max( ymax, shapeBox.GetEnd().y );
}
bBox.SetX( xmin );
bBox.SetY( ymin );
bBox.SetWidth( xmax - xmin + 1 );
bBox.SetHeight( ymax - ymin + 1 );
bBox.Normalize(); bBox.Normalize();
return bBox; return bBox;
} }
// fixme: we cannot use GetBoundingBox() as it returns the bbox of the 'leader' segment (used in hit testing and other non-view logic)
const BOX2I PCB_DIM_CENTER::ViewBBox() const const BOX2I PCB_DIM_CENTER::ViewBBox() const
{ {
const int maxSize = std::max(m_end.x - m_start.x, m_end.y - m_start.y) + m_lineThickness / 2.0; return GetBoundingBox();
BOX2I bBox;
bBox.SetX( m_start.x - maxSize );
bBox.SetY( m_start.y - maxSize );
bBox.SetWidth( maxSize * 2 );
bBox.SetHeight( maxSize * 2 );
return bBox;
} }