AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed warnings about double to int conversions, defined PI as a constant, untabbed

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13563 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2002-01-14 12:07:30 +00:00
parent ea44a6310e
commit ade7e576a1
1 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/common/geometry.cpp
View File

@ -26,10 +26,14 @@
#include "wx/log.h" #include "wx/log.h"
#include <string.h> #include <string.h>
#include "wx/geometry.h" #include "wx/geometry.h"
#include "wx/datstrm.h" #include "wx/datstrm.h"
// normally this is defined in <math.h>
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
// //
// wxPoint2D // wxPoint2D
// //
@ -177,8 +181,8 @@ wxDouble wxPoint2DInt::GetVectorAngle()
return 180; return 180;
} }
// casts needed MIPSpro compiler under SGI // casts needed for MIPSpro compiler under SGI
wxDouble deg = atan2( (double)m_y , (double)m_x ) * 180 / 3.14159265359; wxDouble deg = atan2( (double)m_y , (double)m_x ) * 180 / M_PI;
if ( deg < 0 ) if ( deg < 0 )
{ {
deg += 360; deg += 360;
@ -187,10 +191,11 @@ wxDouble wxPoint2DInt::GetVectorAngle()
} }
void wxPoint2DInt::SetVectorAngle( wxDouble degrees ) { void wxPoint2DInt::SetVectorAngle( wxDouble degrees )
wxDouble length = this->GetVectorLength() ; {
m_x = length * cos( degrees / 180 * 3.14159265359 ) ; wxDouble length = GetVectorLength();
m_y = length * sin( degrees / 180 * 3.14159265359 ) ; m_x = (int)(length * cos( degrees / 180 * M_PI ));
m_y = (int)(length * sin( degrees / 180 * M_PI ));
} }
wxDouble wxPoint2DDouble::GetVectorAngle() const wxDouble wxPoint2DDouble::GetVectorAngle() const
@ -198,29 +203,30 @@ wxDouble wxPoint2DDouble::GetVectorAngle() const
if ( m_x == 0 ) if ( m_x == 0 )
{ {
if ( m_y >= 0 ) if ( m_y >= 0 )
return 90 ; return 90;
else else
return 270 ; return 270;
} }
if ( m_y == 0 ) if ( m_y == 0 )
{ {
if ( m_x >= 0 ) if ( m_x >= 0 )
return 0 ; return 0;
else else
return 180 ; return 180;
} }
wxDouble deg = atan2( m_y , m_x ) * 180 / 3.14159265359 ; wxDouble deg = atan2( m_y , m_x ) * 180 / M_PI;
if ( deg < 0 ) if ( deg < 0 )
{ {
deg += 360 ; deg += 360;
} }
return deg ; return deg;
} }
void wxPoint2DDouble::SetVectorAngle( wxDouble degrees ) { void wxPoint2DDouble::SetVectorAngle( wxDouble degrees )
wxDouble length = this->GetVectorLength() ; {
m_x = length * cos( degrees / 180 * 3.14159265359 ) ; wxDouble length = GetVectorLength();
m_y = length * sin( degrees / 180 * 3.14159265359 ) ; m_x = length * cos( degrees / 180 * M_PI );
m_y = length * sin( degrees / 180 * M_PI );
} }
// wxRect2D // wxRect2D