X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0624ce56d83b31d187146374cc0cb97128d01816..ca77701441e39245dcbfce903049e76f166979e5:/include/wx/geometry.h?ds=sidebyside diff --git a/include/wx/geometry.h b/include/wx/geometry.h index 0c61a813ba..63d120b20e 100644 --- a/include/wx/geometry.h +++ b/include/wx/geometry.h @@ -4,7 +4,7 @@ // Author: Stefan Csomor // Modified by: // Created: 08/05/99 -// RCS-ID: +// RCS-ID: $Id$ // Copyright: (c) 1999 Stefan Csomor // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -12,32 +12,16 @@ #ifndef _WX_GEOMETRY_H_ #define _WX_GEOMETRY_H_ -#ifdef __GNUG__ - #pragma interface "geometry.cpp" -#endif - #include "wx/defs.h" -#ifndef wxUSE_GEOMETRY - #define wxUSE_GEOMETRY 0 -#endif - #if wxUSE_GEOMETRY #include "wx/utils.h" #include "wx/gdicmn.h" -#include +#include "wx/math.h" -#ifdef __WXMSW__ - #define wxMulDivInt32( a , b , c ) ::MulDiv( a , b , c ) -#elif defined( __WXMAC__ ) - #define wxMulDivInt32( a , b , c ) ( (wxInt32) ( ( (wxInt64)(a) * (wxInt64)(b) ) / (wxInt64)(c) ) ) -#else - #define wxMulDivInt32( a , b , c ) ((wxInt32)((a)*(((wxDouble)b)/((wxDouble)c)))) -#endif - -class wxDataInputStream; -class wxDataOutputStream; +class WXDLLIMPEXP_FWD_BASE wxDataInputStream; +class WXDLLIMPEXP_FWD_BASE wxDataOutputStream; // clipping from Cohen-Sutherland @@ -50,7 +34,7 @@ enum wxOutCode wxOutBottom = 0x04 }; -class WXDLLEXPORT wxPoint2DInt +class WXDLLIMPEXP_CORE wxPoint2DInt { public : inline wxPoint2DInt(); @@ -59,11 +43,11 @@ public : inline wxPoint2DInt( const wxPoint &pt ); // noops for this class, just return the coords - inline void GetFloor( wxInt32 *x , wxInt32 *y ); - inline void GetRounded( wxInt32 *x , wxInt32 *y ); + inline void GetFloor( wxInt32 *x , wxInt32 *y ) const; + inline void GetRounded( wxInt32 *x , wxInt32 *y ) const; - inline wxDouble GetVectorLength(); - wxDouble GetVectorAngle(); + inline wxDouble GetVectorLength() const; + wxDouble GetVectorAngle() const; inline void SetVectorLength( wxDouble length ); void SetVectorAngle( wxDouble degrees ); void SetPolarCoordinates( wxInt32 angle , wxInt32 length ); @@ -91,8 +75,10 @@ public : inline bool operator==(const wxPoint2DInt& pt) const; inline bool operator!=(const wxPoint2DInt& pt) const; +#if wxUSE_STREAMS void WriteTo( wxDataOutputStream &stream ) const; void ReadFrom( wxDataInputStream &stream ); +#endif // wxUSE_STREAMS wxInt32 m_x; wxInt32 m_y; @@ -102,12 +88,9 @@ inline wxPoint2DInt operator+(const wxPoint2DInt& pt1 , const wxPoint2DInt& pt2) inline wxPoint2DInt operator-(const wxPoint2DInt& pt1 , const wxPoint2DInt& pt2); inline wxPoint2DInt operator*(const wxPoint2DInt& pt1 , const wxPoint2DInt& pt2); inline wxPoint2DInt operator*(wxInt32 n , const wxPoint2DInt& pt); -inline wxPoint2DInt operator*(wxInt32 n , const wxPoint2DInt& pt); -inline wxPoint2DInt operator*(const wxPoint2DInt& pt , wxInt32 n); inline wxPoint2DInt operator*(const wxPoint2DInt& pt , wxInt32 n); inline wxPoint2DInt operator/(const wxPoint2DInt& pt1 , const wxPoint2DInt& pt2); inline wxPoint2DInt operator/(const wxPoint2DInt& pt , wxInt32 n); -inline wxPoint2DInt operator/(const wxPoint2DInt& pt , wxInt32 n); inline wxPoint2DInt::wxPoint2DInt() { @@ -133,7 +116,7 @@ inline wxPoint2DInt::wxPoint2DInt( const wxPoint &pt ) m_y = pt.y; } -inline void wxPoint2DInt::GetFloor( wxInt32 *x , wxInt32 *y ) +inline void wxPoint2DInt::GetFloor( wxInt32 *x , wxInt32 *y ) const { if ( x ) *x = m_x; @@ -141,12 +124,12 @@ inline void wxPoint2DInt::GetFloor( wxInt32 *x , wxInt32 *y ) *y = m_y; } -inline void wxPoint2DInt::GetRounded( wxInt32 *x , wxInt32 *y ) +inline void wxPoint2DInt::GetRounded( wxInt32 *x , wxInt32 *y ) const { GetFloor(x, y); } -inline wxDouble wxPoint2DInt::GetVectorLength() +inline wxDouble wxPoint2DInt::GetVectorLength() const { // cast needed MIPSpro compiler under SGI return sqrt( (double)(m_x)*(m_x) + (m_y)*(m_y) ); @@ -196,8 +179,11 @@ inline wxPoint2DInt wxPoint2DInt::operator-() inline wxPoint2DInt& wxPoint2DInt::operator=(const wxPoint2DInt& pt) { - m_x = pt.m_x; - m_y = pt.m_y; + if (this != &pt) + { + m_x = pt.m_x; + m_y = pt.m_y; + } return *this; } @@ -292,20 +278,20 @@ inline wxPoint2DInt operator/(const wxPoint2DInt& pt , wxDouble n) // wxPoint2Ds represent a point or a vector in a 2d coordinate system -class WXDLLEXPORT wxPoint2DDouble +class WXDLLIMPEXP_CORE wxPoint2DDouble { public : inline wxPoint2DDouble(); inline wxPoint2DDouble( wxDouble x , wxDouble y ); inline wxPoint2DDouble( const wxPoint2DDouble &pt ); - wxPoint2DDouble( const wxPoint2DInt &pt ) - { m_x = (wxDouble) pt.m_x ; m_y = (wxDouble) pt.m_y ; } - wxPoint2DDouble( const wxPoint &pt ) - { m_x = (wxDouble) pt.x ; m_y = (wxDouble) pt.y ; } + wxPoint2DDouble( const wxPoint2DInt &pt ) + { m_x = (wxDouble) pt.m_x ; m_y = (wxDouble) pt.m_y ; } + wxPoint2DDouble( const wxPoint &pt ) + { m_x = (wxDouble) pt.x ; m_y = (wxDouble) pt.y ; } // two different conversions to integers, floor and rounding - inline void GetFloor( wxInt32 *x , wxInt32 *y ); - inline void GetRounded( wxInt32 *x , wxInt32 *y ); + inline void GetFloor( wxInt32 *x , wxInt32 *y ) const; + inline void GetRounded( wxInt32 *x , wxInt32 *y ) const; inline wxDouble GetVectorLength() const; wxDouble GetVectorAngle() const ; @@ -315,10 +301,10 @@ public : // set the vector length to 1.0, preserving the angle void Normalize(); - inline wxDouble GetDistance( const wxPoint2DDouble &pt ); - inline wxDouble GetDistanceSquare( const wxPoint2DDouble &pt ); - inline wxDouble GetDotProduct( const wxPoint2DDouble &vec ); - inline wxDouble GetCrossProduct( const wxPoint2DDouble &vec ); + inline wxDouble GetDistance( const wxPoint2DDouble &pt ) const; + inline wxDouble GetDistanceSquare( const wxPoint2DDouble &pt ) const; + inline wxDouble GetDotProduct( const wxPoint2DDouble &vec ) const; + inline wxDouble GetCrossProduct( const wxPoint2DDouble &vec ) const; // the reflection of this point inline wxPoint2DDouble operator-(); @@ -369,13 +355,13 @@ inline wxPoint2DDouble::wxPoint2DDouble( const wxPoint2DDouble &pt ) m_y = pt.m_y; } -inline void wxPoint2DDouble::GetFloor( wxInt32 *x , wxInt32 *y ) +inline void wxPoint2DDouble::GetFloor( wxInt32 *x , wxInt32 *y ) const { *x = (wxInt32) floor( m_x ); *y = (wxInt32) floor( m_y ); } -inline void wxPoint2DDouble::GetRounded( wxInt32 *x , wxInt32 *y ) +inline void wxPoint2DDouble::GetRounded( wxInt32 *x , wxInt32 *y ) const { *x = (wxInt32) floor( m_x + 0.5 ); *y = (wxInt32) floor( m_y + 0.5); @@ -386,29 +372,34 @@ inline wxDouble wxPoint2DDouble::GetVectorLength() const return sqrt( (m_x)*(m_x) + (m_y)*(m_y) ) ; } -inline void wxPoint2DDouble::SetVectorLength( wxDouble length ) +inline void wxPoint2DDouble::SetVectorLength( wxDouble length ) { wxDouble before = GetVectorLength() ; m_x = (m_x * length / before) ; m_y = (m_y * length / before) ; } -inline wxDouble wxPoint2DDouble::GetDistance( const wxPoint2DDouble &pt ) +inline void wxPoint2DDouble::Normalize() +{ + SetVectorLength( 1 ); +} + +inline wxDouble wxPoint2DDouble::GetDistance( const wxPoint2DDouble &pt ) const { return sqrt( GetDistanceSquare( pt ) ); } -inline wxDouble wxPoint2DDouble::GetDistanceSquare( const wxPoint2DDouble &pt ) +inline wxDouble wxPoint2DDouble::GetDistanceSquare( const wxPoint2DDouble &pt ) const { return ( (pt.m_x-m_x)*(pt.m_x-m_x) + (pt.m_y-m_y)*(pt.m_y-m_y) ); } -inline wxDouble wxPoint2DDouble::GetDotProduct( const wxPoint2DDouble &vec ) +inline wxDouble wxPoint2DDouble::GetDotProduct( const wxPoint2DDouble &vec ) const { return ( m_x * vec.m_x + m_y * vec.m_y ); } -inline wxDouble wxPoint2DDouble::GetCrossProduct( const wxPoint2DDouble &vec ) +inline wxDouble wxPoint2DDouble::GetCrossProduct( const wxPoint2DDouble &vec ) const { return ( m_x * vec.m_y - vec.m_x * m_y ); } @@ -420,8 +411,11 @@ inline wxPoint2DDouble wxPoint2DDouble::operator-() inline wxPoint2DDouble& wxPoint2DDouble::operator=(const wxPoint2DDouble& pt) { - m_x = pt.m_x; - m_y = pt.m_y; + if (this != &pt) + { + m_x = pt.m_x; + m_y = pt.m_y; + } return *this; } @@ -455,12 +449,12 @@ inline wxPoint2DDouble& wxPoint2DDouble::operator/=(const wxPoint2DDouble& pt) inline bool wxPoint2DDouble::operator==(const wxPoint2DDouble& pt) const { - return m_x == pt.m_x && m_y == pt.m_y; + return wxIsSameDouble(m_x, pt.m_x) && wxIsSameDouble(m_y, pt.m_y); } inline bool wxPoint2DDouble::operator!=(const wxPoint2DDouble& pt) const { - return m_x != pt.m_x || m_y != pt.m_y; + return !(*this == pt); } inline wxPoint2DDouble operator+(const wxPoint2DDouble& pt1 , const wxPoint2DDouble& pt2) @@ -518,7 +512,7 @@ inline wxPoint2DDouble operator/(const wxPoint2DDouble& pt , wxInt32 n) // top left and bottom right corner, or by the top left corner and size. A point is contained within the rectangle if // left <= x < right and top <= m_y < bottom , thus it is a half open interval. -class WXDLLEXPORT wxRect2DDouble +class WXDLLIMPEXP_CORE wxRect2DDouble { public: wxRect2DDouble() @@ -532,13 +526,13 @@ public: */ // single attribute accessors - inline wxPoint2DDouble GetPosition() + wxPoint2DDouble GetPosition() const { return wxPoint2DDouble(m_x, m_y); } - inline wxSize GetSize() + wxSize GetSize() const { return wxSize((int) m_width, (int) m_height); } - // for the edge and corner accessors there are two setters conterparts, the Set.. functions keep the other corners at their - // position whenever sensible, the Move.. functions keep the size of the rect and move the other corners apropriately + // for the edge and corner accessors there are two setters counterparts, the Set.. functions keep the other corners at their + // position whenever sensible, the Move.. functions keep the size of the rect and move the other corners appropriately inline wxDouble GetLeft() const { return m_x; } inline void SetLeft( wxDouble n ) { m_width += m_x - n; m_x = n; } @@ -585,20 +579,20 @@ public: { m_x += pt.m_x - (m_x+m_width/2) , m_y += pt.m_y -(m_y+m_height/2); } inline wxOutCode GetOutCode( const wxPoint2DDouble &pt ) const { return (wxOutCode) (( ( pt.m_x < m_x ) ? wxOutLeft : 0 ) + - ( ( pt.m_x >= m_x + m_width ) ? wxOutRight : 0 ) + + ( ( pt.m_x > m_x + m_width ) ? wxOutRight : 0 ) + ( ( pt.m_y < m_y ) ? wxOutTop : 0 ) + - ( ( pt.m_y >= m_y + m_height ) ? wxOutBottom : 0 )); } - inline wxOutCode GetOutcode(const wxPoint2DDouble &pt) const - { return GetOutCode(pt) ; } + ( ( pt.m_y > m_y + m_height ) ? wxOutBottom : 0 )); } + inline wxOutCode GetOutcode(const wxPoint2DDouble &pt) const + { return GetOutCode(pt) ; } inline bool Contains( const wxPoint2DDouble &pt ) const { return GetOutCode( pt ) == wxInside; } inline bool Contains( const wxRect2DDouble &rect ) const { return ( ( ( m_x <= rect.m_x ) && ( rect.m_x + rect.m_width <= m_x + m_width ) ) && ( ( m_y <= rect.m_y ) && ( rect.m_y + rect.m_height <= m_y + m_height ) ) ); } inline bool IsEmpty() const - { return ( m_width <= 0 || m_height <= 0 ); } + { return m_width <= 0 || m_height <= 0; } inline bool HaveEqualSize( const wxRect2DDouble &rect ) const - { return ( rect.m_width == m_width && rect.m_height == m_height ); } + { return wxIsSameDouble(rect.m_width, m_width) && wxIsSameDouble(rect.m_height, m_height); } inline void Inset( wxDouble x , wxDouble y ) { m_x += x; m_y += y; m_width -= 2 * x; m_height -= 2 * y; } @@ -632,11 +626,11 @@ public: { m_x *= ((wxDouble)num)/((wxDouble)denum); m_y *= ((wxDouble)num)/((wxDouble)denum); m_width *= ((wxDouble)num)/((wxDouble)denum); m_height *= ((wxDouble)num)/((wxDouble)denum);} -/* wxRect2DDouble& operator = (const wxRect2DDouble& rect); - bool operator == (const wxRect2DDouble& rect); - bool operator != (const wxRect2DDouble& rect); -*/ + inline bool operator == (const wxRect2DDouble& rect) const + { return wxIsSameDouble(m_x, rect.m_x) && wxIsSameDouble(m_y, rect.m_y) && HaveEqualSize(rect); } + inline bool operator != (const wxRect2DDouble& rect) const + { return !(*this == rect); } wxDouble m_x; wxDouble m_y; @@ -649,7 +643,7 @@ public: // top left and bottom right corner, or by the top left corner and size. A point is contained within the rectangle if // left <= x < right and top <= m_y < bottom , thus it is a half open interval. -class WXDLLEXPORT wxRect2DInt +class WXDLLIMPEXP_CORE wxRect2DInt { public: wxRect2DInt() { m_x = m_y = m_width = m_height = 0; } @@ -661,11 +655,11 @@ public: // single attribute accessors - inline wxPoint2DInt GetPosition() { return wxPoint2DInt(m_x, m_y); } - inline wxSize GetSize() { return wxSize(m_width, m_height); } + wxPoint2DInt GetPosition() const { return wxPoint2DInt(m_x, m_y); } + wxSize GetSize() const { return wxSize(m_width, m_height); } - // for the edge and corner accessors there are two setters conterparts, the Set.. functions keep the other corners at their - // position whenever sensible, the Move.. functions keep the size of the rect and move the other corners apropriately + // for the edge and corner accessors there are two setters counterparts, the Set.. functions keep the other corners at their + // position whenever sensible, the Move.. functions keep the size of the rect and move the other corners appropriately inline wxInt32 GetLeft() const { return m_x; } inline void SetLeft( wxInt32 n ) { m_width += m_x - n; m_x = n; } @@ -700,8 +694,8 @@ public: ( ( pt.m_x >= m_x + m_width ) ? wxOutRight : 0 ) + ( ( pt.m_y < m_y ) ? wxOutTop : 0 ) + ( ( pt.m_y >= m_y + m_height ) ? wxOutBottom : 0 )); } - inline wxOutCode GetOutcode( const wxPoint2DInt &pt ) const - { return GetOutCode( pt ) ; } + inline wxOutCode GetOutcode( const wxPoint2DInt &pt ) const + { return GetOutCode( pt ) ; } inline bool Contains( const wxPoint2DInt &pt ) const { return GetOutCode( pt ) == wxInside; } inline bool Contains( const wxRect2DInt &rect ) const @@ -735,16 +729,18 @@ public: m_width *= ((wxInt32)num)/((wxInt32)denum); m_height *= ((wxInt32)num)/((wxInt32)denum);} wxRect2DInt& operator = (const wxRect2DInt& rect); - bool operator == (const wxRect2DInt& rect); - bool operator != (const wxRect2DInt& rect); + bool operator == (const wxRect2DInt& rect) const; + bool operator != (const wxRect2DInt& rect) const; - void WriteTo( wxDataOutputStream &stream ) const; - void ReadFrom( wxDataInputStream &stream ); +#if wxUSE_STREAMS + void WriteTo( wxDataOutputStream &stream ) const; + void ReadFrom( wxDataInputStream &stream ); +#endif // wxUSE_STREAMS wxInt32 m_x; - wxInt32 m_y; - wxInt32 m_width; - wxInt32 m_height; + wxInt32 m_y; + wxInt32 m_width; + wxInt32 m_height; }; inline wxRect2DInt::wxRect2DInt( const wxRect2DInt &r ) @@ -763,9 +759,29 @@ inline wxRect2DInt::wxRect2DInt( const wxPoint2DInt &a , const wxPoint2DInt &b) m_height = abs( a.m_y - b.m_y ); } +inline wxRect2DInt::wxRect2DInt( const wxPoint2DInt& pos, const wxSize& size) +{ + m_x = pos.m_x; + m_y = pos.m_y; + m_width = size.x; + m_height = size.y; +} + +inline bool wxRect2DInt::operator == (const wxRect2DInt& rect) const +{ + return (m_x==rect.m_x && m_y==rect.m_y && + m_width==rect.m_width && m_height==rect.m_height); +} + +inline bool wxRect2DInt::operator != (const wxRect2DInt& rect) const +{ + return !(*this == rect); +} + class wxTransform2D { public : + virtual ~wxTransform2D() { } virtual void Transform( wxPoint2DInt* pt )const = 0; virtual void Transform( wxRect2DInt* r ) const; virtual wxPoint2DInt Transform( const wxPoint2DInt &pt ) const;