Move EDA_ITEM bounding boxes to BOX2I.

common/bitmap_base.cpp

@@ -1,7 +1,3 @@
-/**
- * @file class_bitmap_base.cpp
- */
-
 /*
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
@@ -215,15 +211,14 @@ bool BITMAP_BASE::LoadData( LINE_READER& aLine, wxString& aErrorMsg )
 }
 
 
-const EDA_RECT BITMAP_BASE::GetBoundingBox() const
+const BOX2I BITMAP_BASE::GetBoundingBox() const
 {
-    EDA_RECT rect;
+    BOX2I    bbox;
+    VECTOR2I size = GetSize();
 
-    wxSize   size = GetSize();
+    bbox.Inflate( size.x / 2, size.y / 2 );
 
-    rect.Inflate( size.x / 2, size.y / 2 );
-
-    return rect;
+    return bbox;
 }
 
 
@@ -233,7 +228,7 @@ void BITMAP_BASE::DrawBitmap( wxDC* aDC, const VECTOR2I& aPos )
         return;
 
     VECTOR2I pos = aPos;
-    wxSize  size = GetSize();
+    VECTOR2I size = GetSize();
 
     // This fixes a bug in OSX that should be fixed in the 3.0.3 version or later.
     if( ( size.x == 0 ) || ( size.y == 0 ) )
@@ -292,7 +287,7 @@ void BITMAP_BASE::DrawBitmap( wxDC* aDC, const VECTOR2I& aPos )
     }
 
     aDC->DestroyClippingRegion();
-    aDC->SetClippingRegion( clipAreaPos, size );
+    aDC->SetClippingRegion( clipAreaPos, wxSize( size.x, size.y ) );
 
     if( GetGRForceBlackPenState() )
     {
@@ -316,9 +311,9 @@ void BITMAP_BASE::DrawBitmap( wxDC* aDC, const VECTOR2I& aPos )
 }
 
 
-wxSize BITMAP_BASE::GetSize() const
+VECTOR2I BITMAP_BASE::GetSize() const
 {
-    wxSize size;
+    VECTOR2I size;
 
     if( m_bitmap )
     {

common/drawing_sheet/ds_draw_item.cpp

@@ -169,7 +169,7 @@ void DS_DRAW_ITEM_TEXT::PrintWsItem( const RENDER_SETTINGS* aSettings, const VEC
 }
 
 
-const EDA_RECT DS_DRAW_ITEM_TEXT::GetBoundingBox() const
+const BOX2I DS_DRAW_ITEM_TEXT::GetBoundingBox() const
 {
     return EDA_TEXT::GetTextBox();
 }
@@ -231,17 +231,9 @@ void DS_DRAW_ITEM_POLYPOLYGONS::SetPosition( const VECTOR2I& aPos )
 }
 
 
-const EDA_RECT DS_DRAW_ITEM_POLYPOLYGONS::GetBoundingBox() const
+const BOX2I DS_DRAW_ITEM_POLYPOLYGONS::GetBoundingBox() const
 {
-    EDA_RECT rect;
-    BOX2I box = m_Polygons.BBox();
-
-    rect.SetX( box.GetX() );
-    rect.SetY( box.GetY() );
-    rect.SetWidth( box.GetWidth() );
-    rect.SetHeight( box.GetHeight() );
-
-    return rect;
+    return m_Polygons.BBox();
 }
 
 
@@ -309,9 +301,9 @@ void DS_DRAW_ITEM_RECT::PrintWsItem( const RENDER_SETTINGS* aSettings, const VEC
 }
 
 
-const EDA_RECT DS_DRAW_ITEM_RECT::GetBoundingBox() const
+const BOX2I DS_DRAW_ITEM_RECT::GetBoundingBox() const
 {
-    return EDA_RECT( GetStart(), wxSize( GetEnd().x - GetStart().x, GetEnd().y - GetStart().y ) );
+    return BOX2I( GetStart(), GetEnd() - GetStart() );
 }
 
 
@@ -407,9 +399,9 @@ void DS_DRAW_ITEM_LINE::PrintWsItem( const RENDER_SETTINGS* aSettings, const VEC
 }
 
 
-const EDA_RECT DS_DRAW_ITEM_LINE::GetBoundingBox() const
+const BOX2I DS_DRAW_ITEM_LINE::GetBoundingBox() const
 {
-    return EDA_RECT( GetStart(), wxSize( GetEnd().x - GetStart().x, GetEnd().y - GetStart().y ) );
+    return BOX2I( GetStart(), GetEnd() - GetStart() );
 }
 
 
@@ -440,14 +432,14 @@ void DS_DRAW_ITEM_BITMAP::PrintWsItem( const RENDER_SETTINGS* aSettings, const V
 }
 
 
-const EDA_RECT DS_DRAW_ITEM_BITMAP::GetBoundingBox() const
+const BOX2I DS_DRAW_ITEM_BITMAP::GetBoundingBox() const
 {
-    auto*    bitmap = static_cast<const DS_DATA_ITEM_BITMAP*>( m_peer );
-    wxSize bm_size = bitmap->m_ImageBitmap->GetSize();
+    const DS_DATA_ITEM_BITMAP* bitmap = static_cast<const DS_DATA_ITEM_BITMAP*>( m_peer );
+    VECTOR2I                   bm_size = bitmap->m_ImageBitmap->GetSize();
+    BOX2I                      bbox;
 
-    EDA_RECT bbox;
     bbox.SetSize( bm_size );
-    bbox.SetOrigin( m_pos.x - bm_size.x/2, m_pos.y - bm_size.y/2 );
+    bbox.SetOrigin( m_pos.x - bm_size.x / 2, m_pos.y - bm_size.y / 2 );
 
     return bbox;
 }
@@ -480,13 +472,14 @@ wxString DS_DRAW_ITEM_PAGE::GetSelectMenuText( EDA_UNITS aUnits ) const
 }
 
 
-const EDA_RECT DS_DRAW_ITEM_PAGE::GetBoundingBox() const
+const BOX2I DS_DRAW_ITEM_PAGE::GetBoundingBox() const
 {
-    EDA_RECT dummy;
+    BOX2I dummy;
 
     // We want this graphic item always visible. So gives the max size to the
     // bounding box to avoid any clamping:
-    dummy.SetSize( wxSize( std::numeric_limits<int>::max(), std::numeric_limits<int>::max() ) );
+    dummy.SetMaximum();
+
     return dummy;
 }
 

common/eda_item.cpp

@@ -72,11 +72,11 @@ void EDA_ITEM::SetModified()
 }
 
 
-const EDA_RECT EDA_ITEM::GetBoundingBox() const
+const BOX2I EDA_ITEM::GetBoundingBox() const
 {
     // return a zero-sized box per default. derived classes should override
     // this
-    return EDA_RECT( VECTOR2I( 0, 0 ), VECTOR2I( 0, 0 ) );
+    return BOX2I( VECTOR2I( 0, 0 ), VECTOR2I( 0, 0 ) );
 }
 
 
@@ -255,9 +255,7 @@ EDA_ITEM& EDA_ITEM::operator=( const EDA_ITEM& aItem )
 const BOX2I EDA_ITEM::ViewBBox() const
 {
     // Basic fallback
-    EDA_RECT bbox = GetBoundingBox();
-
-    return BOX2I( bbox.GetOrigin(), bbox.GetSize() );
+    return GetBoundingBox();
 }
 
 

eeschema/autoplace_fields.cpp

@@ -139,7 +139,7 @@ public:
         SIDE_AND_NPINS  sideandpins = chooseSideForFields( aManual );
         SIDE            field_side = sideandpins.side;
         VECTOR2I        fbox_pos = fieldBoxPlacement( sideandpins );
-        EDA_RECT        field_box( fbox_pos, m_fbox_size );
+        BOX2I           field_box( fbox_pos, m_fbox_size );
 
         if( aManual )
             forceWireSpacing = fitFieldsBetweenWires( &field_box, field_side );
@@ -190,7 +190,7 @@ protected:
      * Compute and return the size of the fields' bounding box.
      * @param aDynamic - if true, use dynamic spacing
      */
-    wxSize computeFBoxSize( bool aDynamic )
+    VECTOR2I computeFBoxSize( bool aDynamic )
     {
         int max_field_width = 0;
         int total_height = 0;
@@ -210,9 +210,9 @@ protected:
             else
                 field->SetTextAngle( ANGLE_HORIZONTAL );
 
-            EDA_RECT bbox = field->GetBoundingBox();
-            int      field_width = bbox.GetWidth();
-            int      field_height = bbox.GetHeight();
+            BOX2I bbox = field->GetBoundingBox();
+            int   field_width = bbox.GetWidth();
+            int   field_height = bbox.GetHeight();
 
             max_field_width = std::max( max_field_width, field_width );
 
@@ -228,7 +228,7 @@ protected:
                 total_height += field_height + FIELD_PADDING;
         }
 
-        return wxSize( max_field_width, total_height );
+        return VECTOR2I( max_field_width, total_height );
     }
 
     /**
@@ -277,12 +277,12 @@ protected:
     {
         wxCHECK_RET( m_screen, "getPossibleCollisions() with null m_screen" );
 
-        EDA_RECT symbolBox = m_symbol->GetBodyAndPinsBoundingBox();
+        BOX2I symbolBox = m_symbol->GetBodyAndPinsBoundingBox();
         std::vector<SIDE_AND_NPINS> sides = getPreferredSides();
 
         for( SIDE_AND_NPINS& side : sides )
         {
-            EDA_RECT box( fieldBoxPlacement( side ), m_fbox_size );
+            BOX2I box( fieldBoxPlacement( side ), m_fbox_size );
             box.Merge( symbolBox );
 
             for( SCH_ITEM* item : m_screen->Items().Overlapping( box ) )
@@ -308,13 +308,13 @@ protected:
      * Filter a list of possible colliders to include only those that actually collide
      * with a given rectangle. Returns the new vector.
      */
-    std::vector<SCH_ITEM*> filterCollisions( const EDA_RECT& aRect )
+    std::vector<SCH_ITEM*> filterCollisions( const BOX2I& aRect )
     {
         std::vector<SCH_ITEM*> filtered;
 
         for( SCH_ITEM* item : m_colliders )
         {
-            EDA_RECT item_box;
+            BOX2I item_box;
 
             if( SCH_SYMBOL* item_comp = dynamic_cast<SCH_SYMBOL*>( item ) )
                 item_box = item_comp->GetBodyAndPinsBoundingBox();
@@ -412,7 +412,7 @@ protected:
             sideandpins.side = side;
             sideandpins.pins = pinsOnSide( side );
 
-            EDA_RECT box( fieldBoxPlacement( sideandpins ), m_fbox_size );
+            BOX2I box( fieldBoxPlacement( sideandpins ), m_fbox_size );
 
             COLLISION collision = COLLIDE_NONE;
 
@@ -540,8 +540,8 @@ protected:
     VECTOR2I fieldBoxPlacement( SIDE_AND_NPINS aFieldSideAndPins )
     {
         VECTOR2I fbox_center = m_symbol_bbox.Centre();
-        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_x = ( m_symbol_bbox.GetWidth() + m_fbox_size.x ) / 2;
+        int      offs_y = ( m_symbol_bbox.GetHeight() + m_fbox_size.y ) / 2;
 
         if( aFieldSideAndPins.side.x != 0 )
             offs_x += HPADDING;
@@ -551,13 +551,13 @@ protected:
         fbox_center.x += aFieldSideAndPins.side.x * offs_x;
         fbox_center.y += aFieldSideAndPins.side.y * offs_y;
 
-        int     x = fbox_center.x - ( m_fbox_size.GetWidth() / 2 );
-        int     y = fbox_center.y - ( m_fbox_size.GetHeight() / 2 );
+        int     x = fbox_center.x - ( m_fbox_size.x / 2 );
+        int     y = fbox_center.y - ( m_fbox_size.y / 2 );
 
         auto getPinsBox =
                 [&]( const VECTOR2I& aSide )
                 {
-                    EDA_RECT pinsBox;
+                    BOX2I pinsBox;
 
                     for( SCH_PIN* each_pin : m_symbol->GetPins() )
                     {
@@ -581,7 +581,7 @@ protected:
             }
             else if( aFieldSideAndPins.side == SIDE_RIGHT || aFieldSideAndPins.side == SIDE_LEFT )
             {
-                y = pinsBox.GetTop() - ( m_fbox_size.GetHeight() + ( VPADDING * 2 ) );
+                y = pinsBox.GetTop() - ( m_fbox_size.y + ( VPADDING * 2 ) );
             }
         }
 
@@ -592,7 +592,7 @@ protected:
      * Shift a field box up or down a bit to make the fields fit between some wires.
      * Returns true if a shift was made.
      */
-    bool fitFieldsBetweenWires( EDA_RECT* aBox, SIDE aSide )
+    bool fitFieldsBetweenWires( BOX2I* aBox, SIDE aSide )
     {
         if( aSide != SIDE_TOP && aSide != SIDE_BOTTOM )
             return false;
@@ -719,8 +719,8 @@ private:
     SCH_SYMBOL*             m_symbol;
     std::vector<SCH_FIELD*> m_fields;
     std::vector<SCH_ITEM*>  m_colliders;
-    EDA_RECT                m_symbol_bbox;
-    wxSize                  m_fbox_size;
+    BOX2I                   m_symbol_bbox;
+    VECTOR2I                m_fbox_size;
     bool                    m_allow_rejustify;
     bool                    m_align_to_grid;
     bool                    m_is_power_symbol;

eeschema/bus-wire-junction.cpp

@@ -80,17 +80,15 @@ void SCH_EDIT_FRAME::TestDanglingEnds()
 
 bool SCH_EDIT_FRAME::TrimWire( const VECTOR2I& aStart, const VECTOR2I& aEnd )
 {
-    SCH_SCREEN* screen = GetScreen();
-    bool        retval = false;
+    if( aStart == aEnd )
+        return false;
 
+    SCH_SCREEN*            screen = GetScreen();
     std::vector<SCH_LINE*> wires;
-    EDA_RECT    bb( aStart, wxSize( 1, 1 ) );
+    BOX2I                  bb( aStart );
 
     bb.Merge( aEnd );
 
-    if( aStart == aEnd )
-        return retval;
-
     // We cannot modify the RTree while iterating, so push the possible
     // wires into a separate structure.
     for( EDA_ITEM* item : screen->Items().Overlapping( bb ) )
@@ -138,10 +136,10 @@ bool SCH_EDIT_FRAME::TrimWire( const VECTOR2I& aStart, const VECTOR2I& aEnd )
         SaveCopyInUndoList( screen, line, UNDO_REDO::DELETED, true );
         RemoveFromScreen( line, screen );
 
-        retval = true;
+        return true;
     }
 
-    return retval;
+    return false;
 }
 
 

eeschema/cross-probing.cpp

@@ -135,7 +135,7 @@ SCH_ITEM* SCH_EDITOR_CONTROL::FindSymbolAndItem( const wxString* aPath, const wx
         {
             if( crossProbingSettings.zoom_to_fit )
             {
-                EDA_RECT bbox = symbol->GetBoundingBox();
+                BOX2I bbox = symbol->GetBoundingBox();
 
                 m_toolMgr->GetTool<EE_SELECTION_TOOL>()->ZoomFitCrossProbeBBox( bbox );
             }

eeschema/lib_field.cpp

@@ -323,7 +323,7 @@ void LIB_FIELD::Plot( PLOTTER* aPlotter, bool aBackground, const VECTOR2I& aOffs
             orient = ANGLE_HORIZONTAL;
     }
 
-    EDA_RECT bbox = GetBoundingBox();
+    BOX2I bbox = GetBoundingBox();
     bbox.RevertYAxis();
 
     GR_TEXT_H_ALIGN_T hjustify = GR_TEXT_H_ALIGN_CENTER;
@@ -368,28 +368,28 @@ wxString LIB_FIELD::GetFullText( int unit ) const
 }
 
 
-const EDA_RECT LIB_FIELD::GetBoundingBox() const
+const BOX2I LIB_FIELD::GetBoundingBox() const
 {
     /* Y coordinates for LIB_ITEMS are bottom to top, so we must invert the Y position when
      * calling GetTextBox() that works using top to bottom Y axis orientation.
      */
-    BOX2I rect = GetTextBox( -1, true );
-    rect.RevertYAxis();
+    BOX2I bbox = GetTextBox( -1, true );
+    bbox.RevertYAxis();
 
     // We are using now a bottom to top Y axis.
-    VECTOR2I orig = rect.GetOrigin();
-    VECTOR2I end = rect.GetEnd();
+    VECTOR2I orig = bbox.GetOrigin();
+    VECTOR2I end = bbox.GetEnd();
 
     RotatePoint( orig, GetTextPos(), -GetTextAngle() );
     RotatePoint( end, GetTextPos(), -GetTextAngle() );
 
-    rect.SetOrigin( orig );
-    rect.SetEnd( end );
+    bbox.SetOrigin( orig );
+    bbox.SetEnd( end );
 
     // We are using now a top to bottom Y axis:
-    rect.RevertYAxis();
+    bbox.RevertYAxis();
 
-    return rect;
+    return bbox;
 }
 
 

eeschema/lib_field.h

@@ -128,7 +128,7 @@ public:
 
     void ViewGetLayers( int aLayers[], int& aCount ) const override;
 
-    const EDA_RECT GetBoundingBox() const override;
+    const BOX2I GetBoundingBox() const override;
 
     void GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_ITEM>& aList ) override;
 

eeschema/lib_item.h

@@ -184,7 +184,7 @@ public:
     /**
      * @return the boundary box for this, in library coordinates
      */
-    const EDA_RECT GetBoundingBox() const override { return EDA_ITEM::GetBoundingBox(); }
+    const BOX2I GetBoundingBox() const override { return EDA_ITEM::GetBoundingBox(); }
 
     /**
      * Display basic info (type, part and convert) about the current item in message panel.

eeschema/lib_pin.cpp

@@ -141,7 +141,7 @@ LIB_PIN::LIB_PIN( LIB_SYMBOL* aParent, const wxString& aName, const wxString& aN
 
 bool LIB_PIN::HitTest( const VECTOR2I& aPosition, int aAccuracy ) const
 {
-    EDA_RECT rect = GetBoundingBox( false, true, m_flags & SHOW_ELEC_TYPE );
+    BOX2I rect = GetBoundingBox( false, true, m_flags & SHOW_ELEC_TYPE );
 
     return rect.Inflate( aAccuracy ).Contains( aPosition );
 }
@@ -1124,12 +1124,12 @@ void LIB_PIN::ViewGetLayers( int aLayers[], int& aCount ) const
 }
 
 
-const EDA_RECT LIB_PIN::GetBoundingBox( bool aIncludeInvisiblePins, bool aIncludeNameAndNumber,
-                                        bool aIncludeElectricalType ) const
+const BOX2I LIB_PIN::GetBoundingBox( bool aIncludeInvisiblePins, bool aIncludeNameAndNumber,
+                                     bool aIncludeElectricalType ) const
 {
     KIFONT::FONT* font = KIFONT::FONT::GetFont( Pgm().GetSettingsManager().GetAppSettings<EESCHEMA_SETTINGS>()->m_Appearance.default_font );
 
-    EDA_RECT       bbox;
+    BOX2I          bbox;
     VECTOR2I       begin;
     VECTOR2I       end;
     int            nameTextOffset = 0;

eeschema/lib_pin.h

@@ -182,14 +182,14 @@ public:
     void ViewGetLayers( int aLayers[], int& aCount ) const override;
 
     /* Cannot use a default parameter here as it will not be compatible with the virtual. */
-    const EDA_RECT GetBoundingBox() const override { return GetBoundingBox( false, true, false ); }
+    const BOX2I GetBoundingBox() const override { return GetBoundingBox( false, true, false ); }
 
     /**
      * @param aIncludeInvisibles - if false, do not include labels for invisible pins
      *      in the calculation.
      */
-    const EDA_RECT GetBoundingBox( bool aIncludeInvisiblePins, bool aIncludeNameAndNumber,
-                                   bool aIncludeElectricalType ) const;
+    const BOX2I GetBoundingBox( bool aIncludeInvisiblePins, bool aIncludeNameAndNumber,
+                                bool aIncludeElectricalType ) const;
 
     /**
      * Return whether this pin forms an implicit power connection: i.e., is hidden

eeschema/lib_shape.cpp

@@ -413,13 +413,13 @@ void LIB_SHAPE::print( const RENDER_SETTINGS* aSettings, const VECTOR2I& aOffset
 }
 
 
-const EDA_RECT LIB_SHAPE::GetBoundingBox() const
+const BOX2I LIB_SHAPE::GetBoundingBox() const
 {
-    BOX2I rect = getBoundingBox();
+    BOX2I bbox = getBoundingBox();
 
-    rect.RevertYAxis();
+    bbox.RevertYAxis();
 
-    return rect;
+    return bbox;
 }
 
 

eeschema/lib_shape.h

@@ -65,7 +65,7 @@ public:
             return m_stroke.GetPlotStyle();
     }
 
-    const EDA_RECT GetBoundingBox() const override;
+    const BOX2I GetBoundingBox() const override;
 
     void GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_ITEM>& aList ) override;
 

eeschema/lib_symbol.cpp

@@ -863,10 +863,9 @@ bool LIB_SYMBOL::PinsConflictWith( const LIB_SYMBOL& aOtherPart, bool aTestNums,
 }
 
 
-const EDA_RECT LIB_SYMBOL::GetUnitBoundingBox( int aUnit, int aConvert ) const
+const BOX2I LIB_SYMBOL::GetUnitBoundingBox( int aUnit, int aConvert ) const
 {
-    EDA_RECT bBox;
-    bool initialized = false;
+    BOX2I bBox;     // Start with a fresh BOX2I so the Merge algorithm works
 
     for( const LIB_ITEM& item : m_drawings )
     {
@@ -884,15 +883,7 @@ const EDA_RECT LIB_SYMBOL::GetUnitBoundingBox( int aUnit, int aConvert ) const
         if ( ( item.Type() == LIB_FIELD_T ) && !( ( LIB_FIELD& ) item ).IsVisible() )
             continue;
 
-        if( initialized )
-        {
-            bBox.Merge( item.GetBoundingBox() );
-        }
-        else
-        {
-            bBox = item.GetBoundingBox();
-            initialized = true;
-        }
+        bBox.Merge( item.GetBoundingBox() );
     }
 
     return bBox;

eeschema/lib_symbol.h

@@ -213,7 +213,7 @@ public:
      *  if aConvert == 0 Convert is non used
      *  Invisible fields are not taken in account
      **/
-    const EDA_RECT GetUnitBoundingBox( int aUnit, int aConvert ) const;
+    const BOX2I GetUnitBoundingBox( int aUnit, int aConvert ) const;
 
     /**
      * Get the symbol bounding box excluding fields.
@@ -228,7 +228,7 @@ public:
     const BOX2I GetBodyBoundingBox( int aUnit, int aConvert, bool aIncludePins,
                                     bool aIncludePrivateItems ) const;
 
-    const EDA_RECT GetBoundingBox() const override
+    const BOX2I GetBoundingBox() const override
     {
         return GetUnitBoundingBox( 0, 0 );
     }

eeschema/lib_text.cpp

@@ -270,17 +270,16 @@ void LIB_TEXT::Plot( PLOTTER* plotter, bool aBackground, const VECTOR2I& offset,
     if( aBackground )
         return;
 
-    EDA_RECT bBox = GetBoundingBox();
+    BOX2I bBox = GetBoundingBox();
     // convert coordinates from draw Y axis to symbol_editor Y axis
     bBox.RevertYAxis();
     VECTOR2I txtpos = bBox.Centre();
 
     // The text orientation may need to be flipped if the transformation matrix causes xy
     // axes to be flipped.
-    int t1  = ( aTransform.x1 != 0 ) ^ ( GetTextAngle() != ANGLE_HORIZONTAL );
+    int      t1  = ( aTransform.x1 != 0 ) ^ ( GetTextAngle() != ANGLE_HORIZONTAL );
     VECTOR2I pos = aTransform.TransformCoordinate( txtpos ) + offset;
-
-    COLOR4D color = GetTextColor();
+    COLOR4D  color = GetTextColor();
 
     if( !plotter->GetColorMode() || color == COLOR4D::UNSPECIFIED )
         color = plotter->RenderSettings()->GetLayerColor( LAYER_DEVICE );
@@ -345,7 +344,7 @@ void LIB_TEXT::print( const RENDER_SETTINGS* aSettings, const VECTOR2I& aOffset,
      *   to calculate so the more easily way is to use no justifications (centered text) and
      *   use GetBoundingBox to know the text coordinate considered as centered
     */
-    EDA_RECT bBox = GetBoundingBox();
+    BOX2I bBox = GetBoundingBox();
 
     // convert coordinates from draw Y axis to symbol_editor Y axis:
     bBox.RevertYAxis();
@@ -395,28 +394,28 @@ void LIB_TEXT::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_IT
 }
 
 
-const EDA_RECT LIB_TEXT::GetBoundingBox() const
+const BOX2I LIB_TEXT::GetBoundingBox() const
 {
     /* Y coordinates for LIB_ITEMS are bottom to top, so we must invert the Y position when
      * calling GetTextBox() that works using top to bottom Y axis orientation.
      */
-    BOX2I rect = GetTextBox( -1, true );
-    rect.RevertYAxis();
+    BOX2I bbox = GetTextBox( -1, true );
+    bbox.RevertYAxis();
 
     // We are using now a bottom to top Y axis.
-    VECTOR2I orig = rect.GetOrigin();
-    VECTOR2I end = rect.GetEnd();
+    VECTOR2I orig = bbox.GetOrigin();
+    VECTOR2I end = bbox.GetEnd();
 
     RotatePoint( orig, GetTextPos(), -GetTextAngle() );
     RotatePoint( end, GetTextPos(), -GetTextAngle() );
 
-    rect.SetOrigin( orig );
-    rect.SetEnd( end );
+    bbox.SetOrigin( orig );
+    bbox.SetEnd( end );
 
     // We are using now a top to bottom Y axis:
-    rect.RevertYAxis();
+    bbox.RevertYAxis();
 
-    return rect;
+    return bbox;
 }
 
 

eeschema/lib_text.h

@@ -81,7 +81,7 @@ public:
 
     KIFONT::FONT* GetDrawFont() const override;
 
-    const EDA_RECT GetBoundingBox() const override;
+    const BOX2I GetBoundingBox() const override;
 
     void BeginEdit( const VECTOR2I& aStartPoint ) override;
     void CalcEdit( const VECTOR2I& aPosition ) override;

eeschema/lib_textbox.cpp

@@ -286,7 +286,7 @@ bool LIB_TEXTBOX::HitTest( const VECTOR2I& aPosition, int aAccuracy ) const
     if( aAccuracy < Mils2iu( MINIMUM_SELECTION_DISTANCE ) )
         aAccuracy = Mils2iu( MINIMUM_SELECTION_DISTANCE );
 
-    EDA_RECT rect = GetBoundingBox();
+    BOX2I rect = GetBoundingBox();
 
     rect.Inflate( aAccuracy );
 

eeschema/sch_bitmap.cpp

@@ -104,13 +104,13 @@ void SCH_BITMAP::SwapData( SCH_ITEM* aItem )
 }
 
 
-const EDA_RECT SCH_BITMAP::GetBoundingBox() const
+const BOX2I SCH_BITMAP::GetBoundingBox() const
 {
-    EDA_RECT rect = m_image->GetBoundingBox();
+    BOX2I bbox = m_image->GetBoundingBox();
 
-    rect.Move( m_pos );
+    bbox.Move( m_pos );
 
-    return rect;
+    return bbox;
 }
 
 
@@ -122,7 +122,7 @@ void SCH_BITMAP::Print( const RENDER_SETTINGS* aSettings, const VECTOR2I& aOffse
 }
 
 
-wxSize SCH_BITMAP::GetSize() const
+VECTOR2I SCH_BITMAP::GetSize() const
 {
     return m_image->GetSize();
 }
@@ -162,7 +162,7 @@ void SCH_BITMAP::Show( int nestLevel, std::ostream& os ) const
 
 bool SCH_BITMAP::HitTest( const VECTOR2I& aPosition, int aAccuracy ) const
 {
-    EDA_RECT rect = GetBoundingBox();
+    BOX2I rect = GetBoundingBox();
 
     rect.Inflate( aAccuracy );
 

eeschema/sch_bitmap.h

@@ -86,9 +86,9 @@ public:
     /**
      * @return the actual size (in user units, not in pixels) of the image.
      */
-    wxSize GetSize() const;
+    VECTOR2I GetSize() const;
 
-    const EDA_RECT GetBoundingBox() const override;
+    const BOX2I GetBoundingBox() const override;
 
     void SwapData( SCH_ITEM* aItem ) override;
 

eeschema/sch_bus_entry.cpp

@@ -159,17 +159,15 @@ void SCH_BUS_ENTRY_BASE::ViewGetLayers( int aLayers[], int& aCount ) const
 }
 
 
-const EDA_RECT SCH_BUS_ENTRY_BASE::GetBoundingBox() const
+const BOX2I SCH_BUS_ENTRY_BASE::GetBoundingBox() const
 {
-    EDA_RECT box;
+    BOX2I bbox( m_pos );
+    bbox.SetEnd( GetEnd() );
 
-    box.SetOrigin( m_pos );
-    box.SetEnd( GetEnd() );
+    bbox.Normalize();
+    bbox.Inflate( ( GetPenWidth() / 2 ) + 1 );
 
-    box.Normalize();
-    box.Inflate( ( GetPenWidth() / 2 ) + 1 );
-
-    return box;
+    return bbox;
 }
 
 

eeschema/sch_bus_entry.h

@@ -89,7 +89,7 @@ public:
 
     void Print( const RENDER_SETTINGS* aSettings, const VECTOR2I& aOffset ) override;
 
-    const EDA_RECT GetBoundingBox() const override;
+    const BOX2I GetBoundingBox() const override;
 
     void Move( const VECTOR2I& aMoveVector ) override
     {

eeschema/sch_field.cpp

@@ -399,16 +399,16 @@ EDA_ANGLE SCH_FIELD::GetDrawRotation() const
 }
 
 
-const EDA_RECT SCH_FIELD::GetBoundingBox() const
+const BOX2I SCH_FIELD::GetBoundingBox() const
 {
     // Calculate the text bounding box:
-    BOX2I rect = GetTextBox();
+    BOX2I bbox = GetTextBox();
 
     // Calculate the bounding box position relative to the parent:
     VECTOR2I origin = GetParentPosition();
     VECTOR2I pos = GetTextPos() - origin;
-    VECTOR2I begin = rect.GetOrigin() - origin;
-    VECTOR2I end = rect.GetEnd() - origin;
+    VECTOR2I begin = bbox.GetOrigin() - origin;
+    VECTOR2I end = bbox.GetEnd() - origin;
     RotatePoint( begin, pos, GetTextAngle() );
     RotatePoint( end, pos, GetTextAngle() );
 
@@ -431,13 +431,13 @@ const EDA_RECT SCH_FIELD::GetBoundingBox() const
         transform = TRANSFORM( 1, 0, 0, 1 );  // identity transform
     }
 
-    rect.SetOrigin( transform.TransformCoordinate( begin ) );
-    rect.SetEnd( transform.TransformCoordinate( end ) );
+    bbox.SetOrigin( transform.TransformCoordinate( begin ) );
+    bbox.SetEnd( transform.TransformCoordinate( end ) );
 
-    rect.Move( origin );
-    rect.Normalize();
+    bbox.Move( origin );
+    bbox.Normalize();
 
-    return rect;
+    return bbox;
 }
 
 
@@ -874,7 +874,7 @@ bool SCH_FIELD::HitTest( const VECTOR2I& aPosition, int aAccuracy ) const
     if( !IsVisible() || IsVoid() )
         return false;
 
-    EDA_RECT rect = GetBoundingBox();
+    BOX2I rect = GetBoundingBox();
 
     rect.Inflate( aAccuracy );
 

eeschema/sch_field.h

@@ -124,7 +124,7 @@ public:
      */
     EDA_ANGLE         GetDrawRotation() const override;
 
-    const EDA_RECT GetBoundingBox() const override;
+    const BOX2I GetBoundingBox() const override;
 
     /**
      * Return whether the field will be rendered with the horizontal justification

eeschema/sch_junction.cpp

@@ -100,14 +100,12 @@ SHAPE_CIRCLE SCH_JUNCTION::getEffectiveShape() const
 }
 
 
-const EDA_RECT SCH_JUNCTION::GetBoundingBox() const
+const BOX2I SCH_JUNCTION::GetBoundingBox() const
 {
-    EDA_RECT rect;
+    BOX2I bbox( m_pos );
+    bbox.Inflate( getEffectiveShape().GetRadius() );
 
-    rect.SetOrigin( m_pos );
-    rect.Inflate( getEffectiveShape().GetRadius() );
-
-    return rect;
+    return bbox;
 }