Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

math.h/PI integration

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-12-13 20:10:59 +00:00
parent e77c5d9682
commit 3454ecd508
6 changed files with 78 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/samples/ogl/studio/shapes.cpp
View File

@@ -1155,7 +1155,7 @@ void studioShapeEditProc(wxMenu& menu, wxCommandEvent& event)
break;
double theta = shape->GetRotation();
const double myPi = 3.1415926535897932384626433832795 ;
const double myPi = M_PI;
double ninetyDegrees = myPi/2.0;
wxString opStr;

7
contrib/src/ogl/basic.cpp
View File

@@ -34,7 +34,6 @@
#include <stdio.h>
#include <ctype.h>
#include <math.h>
#include "wx/ogl/ogl.h"
@@ -3190,7 +3189,7 @@ bool wxShape::GetAttachmentPositionEdge(int attachment, double *x, double *y,
// to logical (0 -> 1 if rotated by 90 degrees)
int wxShape::PhysicalToLogicalAttachment(int physicalAttachment) const
{
const double pi = 3.1415926535897932384626433832795 ;
const double pi = M_PI ;
int i;
if (oglRoughlyEqual(GetRotation(), 0.0))
{
@@ -3222,7 +3221,7 @@ int wxShape::PhysicalToLogicalAttachment(int physicalAttachment) const
// to physical (0 is always North)
int wxShape::LogicalToPhysicalAttachment(int logicalAttachment) const
{
const double pi = 3.1415926535897932384626433832795 ;
const double pi = M_PI ;
int i;
if (oglRoughlyEqual(GetRotation(), 0.0))
{
@@ -3252,7 +3251,7 @@ int wxShape::LogicalToPhysicalAttachment(int logicalAttachment) const
void wxShape::Rotate(double WXUNUSED(x), double WXUNUSED(y), double theta)
{
const double pi = 3.1415926535897932384626433832795 ;
const double pi = M_PI ;
m_rotation = theta;
if (m_rotation < 0.0)
{

14
contrib/src/ogl/drawn.cpp
View File

@@ -31,9 +31,6 @@
#include "wx/ogl/ogl.h"
#include <math.h>
static void IntToHex(unsigned int dec, wxChar *buf);
static unsigned long HexToInt(wxChar *buf);
extern wxChar *oglBuffer;
@@ -165,7 +162,7 @@ void wxDrawnShape::Rotate(double x, double y, double theta)
int wxDrawnShape::DetermineMetaFile(double rotation)
{
double tolerance = 0.0001;
const double pi = 3.1415926535897932384626433832795 ;
const double pi = M_PI ;
double angle1 = 0.0;
double angle2 = pi/2.0;
double angle3 = pi;
@@ -733,7 +730,7 @@ void wxOpDraw::Do(wxDC& dc, double xoffset, double yoffset)
}
case DRAWOP_DRAW_ELLIPTIC_ARC:
{
const double pi = 3.1415926535897932384626433832795 ;
const double pi = M_PI ;
// Convert back to degrees
dc.DrawEllipticArc(
@@ -1332,11 +1329,6 @@ static int HexToInt1(wxChar hex)
return 14;
case _T('F'):
return 15;
#if 0
// handling this default outside switch removes warning under Borland
default:
return 0;
#endif
}
return 0;
@@ -2335,7 +2327,7 @@ void wxPseudoMetaFile::DrawArc(const wxPoint& centrePt, const wxPoint& startPt,
void wxPseudoMetaFile::DrawEllipticArc(const wxRect& rect, double startAngle, double endAngle)
{
const double pi = 3.1415926535897932384626433832795 ;
const double pi = M_PI ;
double startAngleRadians = startAngle* (pi*2.0/360.0);
double endAngleRadians = endAngle* (pi*2.0/360.0);

3
contrib/src/ogl/lines.cpp
View File

@@ -34,7 +34,6 @@
#endif
#include <ctype.h>
#include <math.h>
#include "wx/ogl/ogl.h"
@@ -668,7 +667,7 @@ void wxLineShape::DrawArrow(wxDC& dc, wxArrowHead *arrow, double xOffset, bool p
* Add yOffset to arrow, if any
*/
const double myPi = (double) 3.14159265;
const double myPi = (double) M_PI;
// The translation that the y offset may give
double deltaX = 0.0;
double deltaY = 0.0;

14
contrib/src/svg/dcsvg.cpp
View File

@@ -21,7 +21,6 @@
#include "wx/svg/dcsvg.h"
#include <math.h>
#include "wx/image.h"
#define wxSVG_DEBUG FALSE
@@ -36,7 +35,7 @@
#pragma warn -ccc
#endif
static inline double DegToRad(double deg) { return (deg * 3.14) / 180.0; } ;
static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; } ;
wxString wxColStr ( wxColour c )
{
@@ -374,13 +373,13 @@ void wxSVGFileDC::DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCo
}
double theta1 = atan2((double)(yc-y1),(double)(x1-xc));
if ( theta1 < 0 ) theta1 = theta1 + 3.14 * 2;
if ( theta1 < 0 ) theta1 = theta1 + M_PI * 2;
double theta2 = atan2((double)(yc-y2), (double)(x2-xc));
if ( theta2 < 0 ) theta2 = theta2 + 3.14 * 2;
if ( theta2 < theta1 ) theta2 = theta2 + 3.14 *2 ;
if ( theta2 < 0 ) theta2 = theta2 + M_PI * 2;
if ( theta2 < theta1 ) theta2 = theta2 + M_PI *2 ;
int fArc ; // flag for large or small arc 0 means less than 180 degrees
if ( fabs(theta2 - theta1) > 3.14 ) fArc = 1; else fArc = 0 ;
if ( fabs(theta2 - theta1) > M_PI ) fArc = 1; else fArc = 0 ;
int fSweep = 0 ; // flag for sweep always 0
@@ -446,7 +445,7 @@ void wxSVGFileDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,doub
if ( (theta2 - theta1) > 0 ) fArc = 1; else fArc = 0 ;
int fSweep ;
if ( fabs(theta2 - theta1) > 3.14) fSweep = 1; else fSweep = 0 ;
if ( fabs(theta2 - theta1) > M_PI) fSweep = 1; else fSweep = 0 ;
s.Printf ( wxT("<path d=\"M%d %d A%d %d 0.0 %d %d %d %d L %d %d z "),
int(xs), int(ys), int(rx), int(ry),
@@ -710,7 +709,6 @@ bool wxSVGFileDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord he
int logicalFunc /*= wxCOPY*/, bool useMask /*= FALSE*/,
wxCoord /*xsrcMask = -1*/, wxCoord /*ysrcMask = -1*/)
{
if (logicalFunc != wxCOPY)
{
wxASSERT_MSG(FALSE, wxT("wxSVGFileDC::DoBlit Call requested nonCopy mode; this is not possible")) ;

14
src/common/dcsvg.cpp
View File

@@ -21,7 +21,6 @@
#include "wx/svg/dcsvg.h"
#include <math.h>
#include "wx/image.h"
#define wxSVG_DEBUG FALSE
@@ -36,7 +35,7 @@
#pragma warn -ccc
#endif
static inline double DegToRad(double deg) { return (deg * 3.14) / 180.0; } ;
static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; } ;
wxString wxColStr ( wxColour c )
{
@@ -374,13 +373,13 @@ void wxSVGFileDC::DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCo
}
double theta1 = atan2((double)(yc-y1),(double)(x1-xc));
if ( theta1 < 0 ) theta1 = theta1 + 3.14 * 2;
if ( theta1 < 0 ) theta1 = theta1 + M_PI * 2;
double theta2 = atan2((double)(yc-y2), (double)(x2-xc));
if ( theta2 < 0 ) theta2 = theta2 + 3.14 * 2;
if ( theta2 < theta1 ) theta2 = theta2 + 3.14 *2 ;
if ( theta2 < 0 ) theta2 = theta2 + M_PI * 2;
if ( theta2 < theta1 ) theta2 = theta2 + M_PI *2 ;
int fArc ; // flag for large or small arc 0 means less than 180 degrees
if ( fabs(theta2 - theta1) > 3.14 ) fArc = 1; else fArc = 0 ;
if ( fabs(theta2 - theta1) > M_PI ) fArc = 1; else fArc = 0 ;
int fSweep = 0 ; // flag for sweep always 0
@@ -446,7 +445,7 @@ void wxSVGFileDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,doub
if ( (theta2 - theta1) > 0 ) fArc = 1; else fArc = 0 ;
int fSweep ;
if ( fabs(theta2 - theta1) > 3.14) fSweep = 1; else fSweep = 0 ;
if ( fabs(theta2 - theta1) > M_PI) fSweep = 1; else fSweep = 0 ;
s.Printf ( wxT("<path d=\"M%d %d A%d %d 0.0 %d %d %d %d L %d %d z "),
int(xs), int(ys), int(rx), int(ry),
@@ -710,7 +709,6 @@ bool wxSVGFileDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord he
int logicalFunc /*= wxCOPY*/, bool useMask /*= FALSE*/,
wxCoord /*xsrcMask = -1*/, wxCoord /*ysrcMask = -1*/)
{
if (logicalFunc != wxCOPY)
{
wxASSERT_MSG(FALSE, wxT("wxSVGFileDC::DoBlit Call requested nonCopy mode; this is not possible")) ;