Replacement of classes BOX2 and VECTOR2 with their extended versions

include/vector2d.h: Removed old version
include/math/math_util.h: rescale() for VECTOR2
include/math/vector2d.h: New version of VECTOR2
include/math/box2.h: New version of BOX2
common/drawframe.cpp: Refactorization of code, so it is compatible with new classes
include/plot_common.h, pcbnew/basepcbframe.cpp: Changed header inclusion path
CMakeLists.txt: Added definition to turn on WX_COMPATIBILITY for replacement classes

CMakeLists.txt

@@ -248,6 +248,9 @@ include(Functions)
 #================================================
 include(CheckFindPackageResult)
 
+# Turn on wxWidgets compatibility mode for some classes 
+add_definitions(-DWX_COMPATIBILITY)
+
 #######################
 # Find OpenGL library #
 #######################

common/drawframe.cpp

@@ -42,7 +42,7 @@
 #include <kicad_device_context.h>
 #include <dialog_helpers.h>
 #include <base_units.h>
-#include <vector2d.h>
+#include <math/box2.h>
 
 #include <wx/fontdlg.h>
 
@@ -753,7 +753,7 @@ void EDA_DRAW_FRAME::AdjustScrollBars( const wxPoint& aCenterPositionIU )
     DSIZE   clientSizeIU( clientSizeDU.x / scale, clientSizeDU.y / scale );
 
     // Full drawing or "page" rectangle in internal units
-    DBOX    pageRectIU( 0, 0, GetPageSizeIU().x, GetPageSizeIU().y );
+    DBOX    pageRectIU( wxPoint( 0, 0 ), wxSize( GetPageSizeIU().x, GetPageSizeIU().y ) );
 
     // The upper left corner of the client rectangle in internal units.
     double xIU = aCenterPositionIU.x - clientSizeIU.x / 2.0;
@@ -763,11 +763,11 @@ void EDA_DRAW_FRAME::AdjustScrollBars( const wxPoint& aCenterPositionIU )
     if( screen->m_Center )
     {
         // half page offset.
-        xIU += pageRectIU.width  / 2.0;
-        yIU += pageRectIU.height / 2.0;
+        xIU += pageRectIU.GetWidth()  / 2.0;
+        yIU += pageRectIU.GetHeight() / 2.0;
     }
 
-    DBOX    clientRectIU( xIU, yIU, clientSizeIU.x, clientSizeIU.y );
+    DBOX    clientRectIU( wxPoint( xIU, yIU ), wxSize( clientSizeIU.x, clientSizeIU.y ) );
     wxPoint centerPositionIU;
 
 #if 1 || defined( USE_PCBNEW_NANOMETRES )
@@ -782,13 +782,13 @@ void EDA_DRAW_FRAME::AdjustScrollBars( const wxPoint& aCenterPositionIU )
         clientRectIU.MoveBottomTo( VIRT_MAX );
 #endif
 
-    centerPositionIU.x = KiROUND( clientRectIU.x + clientRectIU.width/2 );
-    centerPositionIU.y = KiROUND( clientRectIU.y + clientRectIU.height/2 );
+    centerPositionIU.x = KiROUND( clientRectIU.GetX() + clientRectIU.GetWidth() / 2 );
+    centerPositionIU.y = KiROUND( clientRectIU.GetY() + clientRectIU.GetHeight() / 2 );
 
     if( screen->m_Center )
     {
-        centerPositionIU.x -= KiROUND( pageRectIU.width  / 2.0 );
-        centerPositionIU.y -= KiROUND( pageRectIU.height  / 2.0 );
+        centerPositionIU.x -= KiROUND( pageRectIU.GetWidth() / 2.0 );
+        centerPositionIU.y -= KiROUND( pageRectIU.GetHeight() / 2.0 );
     }
 
     DSIZE   virtualSizeIU;
@@ -799,26 +799,26 @@ void EDA_DRAW_FRAME::AdjustScrollBars( const wxPoint& aCenterPositionIU )
     }
     else
     {
-        double pageCenterX    = pageRectIU.x   + ( pageRectIU.width / 2 );
-        double clientCenterX  = clientRectIU.x + ( clientRectIU.width / 2 );
+        double pageCenterX    = pageRectIU.GetX()   + ( pageRectIU.GetWidth() / 2 );
+        double clientCenterX  = clientRectIU.GetX() + ( clientRectIU.GetWidth() / 2 );
 
-        if( clientRectIU.width > pageRectIU.width )
+        if( clientRectIU.GetWidth() > pageRectIU.GetWidth() )
         {
             if( pageCenterX > clientCenterX )
                 virtualSizeIU.x = ( pageCenterX - clientRectIU.GetLeft() ) * 2;
             else if( pageCenterX < clientCenterX )
                 virtualSizeIU.x = ( clientRectIU.GetRight() - pageCenterX ) * 2;
             else
-                virtualSizeIU.x = clientRectIU.width;
+                virtualSizeIU.x = clientRectIU.GetWidth();
         }
         else
         {
             if( pageCenterX > clientCenterX )
-                virtualSizeIU.x = pageRectIU.width + ( (pageRectIU.GetLeft() - clientRectIU.GetLeft() ) * 2 );
+                virtualSizeIU.x = pageRectIU.GetWidth() + ( (pageRectIU.GetLeft() - clientRectIU.GetLeft() ) * 2 );
             else if( pageCenterX < clientCenterX )
-                virtualSizeIU.x = pageRectIU.width + ( (clientRectIU.GetRight() - pageRectIU.GetRight() ) * 2 );
+                virtualSizeIU.x = pageRectIU.GetWidth() + ( (clientRectIU.GetRight() - pageRectIU.GetRight() ) * 2 );
             else
-                virtualSizeIU.x = pageRectIU.width;
+                virtualSizeIU.x = pageRectIU.GetWidth();
         }
     }
 
@@ -828,28 +828,28 @@ void EDA_DRAW_FRAME::AdjustScrollBars( const wxPoint& aCenterPositionIU )
     }
     else
     {
-        double pageCenterY   = pageRectIU.y   + ( pageRectIU.height / 2 );
-        double clientCenterY = clientRectIU.y + ( clientRectIU.height / 2 );
+        double pageCenterY   = pageRectIU.GetY()   + ( pageRectIU.GetHeight() / 2 );
+        double clientCenterY = clientRectIU.GetY() + ( clientRectIU.GetHeight() / 2 );
 
-        if( clientRectIU.height > pageRectIU.height )
+        if( clientRectIU.GetHeight() > pageRectIU.GetHeight() )
         {
             if( pageCenterY > clientCenterY )
                 virtualSizeIU.y = ( pageCenterY - clientRectIU.GetTop() ) * 2;
             else if( pageCenterY < clientCenterY )
                 virtualSizeIU.y = ( clientRectIU.GetBottom() - pageCenterY ) * 2;
             else
-                virtualSizeIU.y = clientRectIU.height;
+                virtualSizeIU.y = clientRectIU.GetHeight();
         }
         else
         {
             if( pageCenterY > clientCenterY )
-                virtualSizeIU.y = pageRectIU.height +
+                virtualSizeIU.y = pageRectIU.GetHeight() +
                                 ( ( pageRectIU.GetTop() - clientRectIU.GetTop() ) * 2 );
             else if( pageCenterY < clientCenterY )
-                virtualSizeIU.y = pageRectIU.height +
+                virtualSizeIU.y = pageRectIU.GetHeight() +
                                 ( ( clientRectIU.GetBottom() - pageRectIU.GetBottom() ) * 2 );
             else
-                virtualSizeIU.y = pageRectIU.height;
+                virtualSizeIU.y = pageRectIU.GetHeight();
         }
     }
 
@@ -866,8 +866,8 @@ void EDA_DRAW_FRAME::AdjustScrollBars( const wxPoint& aCenterPositionIU )
     }
     else
     {
-        screen->m_DrawOrg.x = -KiROUND( ( virtualSizeIU.x - pageRectIU.width )  / 2.0 );
-        screen->m_DrawOrg.y = -KiROUND( ( virtualSizeIU.y - pageRectIU.height ) / 2.0 );
+        screen->m_DrawOrg.x = -KiROUND( ( virtualSizeIU.x - pageRectIU.GetWidth() )  / 2.0 );
+        screen->m_DrawOrg.y = -KiROUND( ( virtualSizeIU.y - pageRectIU.GetHeight() ) / 2.0 );
     }
 
     /* Always set scrollbar pixels per unit to 1 unless you want the zoom
@@ -886,8 +886,8 @@ void EDA_DRAW_FRAME::AdjustScrollBars( const wxPoint& aCenterPositionIU )
     // center position at the center of client rectangle.
     screen->SetScrollCenterPosition( centerPositionIU );
 
-    double posX = centerPositionIU.x - clientRectIU.width /2.0 - screen->m_DrawOrg.x;
-    double posY = centerPositionIU.y - clientRectIU.height/2.0 - screen->m_DrawOrg.y;
+    double posX = centerPositionIU.x - clientRectIU.GetWidth()  / 2.0 - screen->m_DrawOrg.x;
+    double posY = centerPositionIU.y - clientRectIU.GetHeight() / 2.0 - screen->m_DrawOrg.y;
 
     // Convert scroll bar position to device units.
     posX = KiROUND( posX * scale );

include/math/math_util.h

+/*
+ * This program source code file is part of KICAD, a free EDA CAD application.
+ *
+ * Copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
+ * Copyright (C) 2013 Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#ifndef __MATH_UTIL_H
+#define __MATH_UTIL_H
+
+#include <cmath>
+#include <cstdlib>
+#include <stdint.h>
+
+/**
+ * Function rescale()
+ *
+ * Scales a number (value) by rational (numerator/denominator). Numerator must be <= denominator.
+ */
+
+template<typename T> static T rescale( T numerator, T value, T denominator )
+{
+    return numerator * value / denominator;
+}
+
+
+// explicit specializations for integer types, taking care of overflow.
+template<> int rescale( int numerator, int value, int denominator )
+{
+    return (int) ( (int64_t) numerator * (int64_t) value / (int64_t) denominator );
+}
+
+template<> int64_t rescale( int64_t numerator, int64_t value, int64_t denominator )
+{
+    uint64_t r = 0;
+    int64_t sign = ( ( numerator < 0) ? -1 : 1 ) * ( denominator < 0 ? - 1: 1 ) * (value < 0 ? - 1 : 1);
+
+    uint64_t a = abs( numerator );
+    uint64_t b = abs( value );
+    uint64_t c = abs( denominator );
+
+    r = c / 2;
+
+    if( b <= INT_MAX && c <= INT_MAX )
+    {
+        if( a <= INT_MAX )
+            return sign * ( (a * b + r ) / c );
+        else
+            return sign * (a / c * b + (a % c * b + r) / c);
+    } else {
+        uint64_t a0 = a & 0xFFFFFFFF;
+        uint64_t a1 = a >> 32;
+        uint64_t b0 = b & 0xFFFFFFFF;
+        uint64_t b1 = b >> 32;
+        uint64_t t1 = a0 * b1 + a1 * b0;
+        uint64_t t1a = t1 << 32;
+        int i;
+   
+        a0 = a0 * b0 + t1a;
+        a1 = a1 * b1 + (t1 >> 32) + (a0 < t1a);
+        a0 += r;
+        a1 += a0 < r;
+
+        for( i = 63; i >= 0; i-- )
+        {
+            a1  += a1 + ( (a0 >> i) & 1 );
+            t1  += t1;
+
+            if( c <= a1 )
+            {
+                a1 -= c;
+                t1++;
+            }
+        }
+
+        return t1 * sign;
+    }
+};
+
+#endif // __MATH_UTIL_H

include/plot_common.h

@@ -9,7 +9,7 @@
 #define PLOT_COMMON_H_
 
 #include <vector>
-#include <vector2d.h>
+#include <math/box2.h>
 #include <drawtxt.h>
 #include <common.h>         // PAGE_INFO
 #include <eda_text.h>       // FILL_T

pcbnew/basepcbframe.cpp

@@ -45,7 +45,7 @@
 
 #include <collectors.h>
 #include <class_drawpanel.h>
-#include <vector2d.h>
+#include <math/vector2d.h>
 
 
 // Configuration entry names.