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

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

@@ -83,7 +83,7 @@ void csEvtHandler::CopyData(wxShapeEvtHandler& copy)
csEvtHandler& csCopy = (csEvtHandler&) copy; csEvtHandler& csCopy = (csEvtHandler&) copy;
csCopy.m_label = m_label; csCopy.m_label = m_label;
} }
void csEvtHandler::OnLeftClick(double WXUNUSED(x), double WXUNUSED(y), int keys, int WXUNUSED(attachment)) void csEvtHandler::OnLeftClick(double WXUNUSED(x), double WXUNUSED(y), int keys, int WXUNUSED(attachment))
{ {
wxClientDC dc(GetShape()->GetCanvas()); wxClientDC dc(GetShape()->GetCanvas());
@@ -226,7 +226,7 @@ void csEvtHandler::OnEndDragRight(double x, double y, int WXUNUSED(keys), int at
// Check if we're on an object // Check if we're on an object
int new_attachment; int new_attachment;
wxShape *otherShape = canvas->FindFirstSensitiveShape(x, y, &new_attachment, OP_DRAG_RIGHT); wxShape *otherShape = canvas->FindFirstSensitiveShape(x, y, &new_attachment, OP_DRAG_RIGHT);
if (otherShape && !otherShape->IsKindOf(CLASSINFO(wxLineShape))) if (otherShape && !otherShape->IsKindOf(CLASSINFO(wxLineShape)))
{ {
wxLineShape* theShape = new csLineShape; wxLineShape* theShape = new csLineShape;
@@ -707,7 +707,7 @@ bool csEvtHandler::EditProperties()
/* /*
* Diagram * Diagram
*/ */
bool csDiagram::OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr) bool csDiagram::OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
{ {
wxDiagram::OnShapeSave(db, shape, expr); wxDiagram::OnShapeSave(db, shape, expr);
@@ -723,7 +723,7 @@ bool csDiagram::OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
expr.GetAttributeValue(_T("label"), label); expr.GetAttributeValue(_T("label"), label);
csEvtHandler *handler = new csEvtHandler(&shape, &shape, label); csEvtHandler *handler = new csEvtHandler(&shape, &shape, label);
shape.SetEventHandler(handler); shape.SetEventHandler(handler);
return true; return true;
} }
@@ -1155,7 +1155,7 @@ void studioShapeEditProc(wxMenu& menu, wxCommandEvent& event)
break; break;
double theta = shape->GetRotation(); double theta = shape->GetRotation();
const double myPi = 3.1415926535897932384626433832795 ; const double myPi = M_PI;
double ninetyDegrees = myPi/2.0; double ninetyDegrees = myPi/2.0;
wxString opStr; wxString opStr;

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

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

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

@@ -31,9 +31,6 @@
#include "wx/ogl/ogl.h" #include "wx/ogl/ogl.h"
#include <math.h>
static void IntToHex(unsigned int dec, wxChar *buf); static void IntToHex(unsigned int dec, wxChar *buf);
static unsigned long HexToInt(wxChar *buf); static unsigned long HexToInt(wxChar *buf);
extern wxChar *oglBuffer; extern wxChar *oglBuffer;
@@ -165,7 +162,7 @@ void wxDrawnShape::Rotate(double x, double y, double theta)
int wxDrawnShape::DetermineMetaFile(double rotation) int wxDrawnShape::DetermineMetaFile(double rotation)
{ {
double tolerance = 0.0001; double tolerance = 0.0001;
const double pi = 3.1415926535897932384626433832795 ; const double pi = M_PI ;
double angle1 = 0.0; double angle1 = 0.0;
double angle2 = pi/2.0; double angle2 = pi/2.0;
double angle3 = pi; double angle3 = pi;
@@ -733,7 +730,7 @@ void wxOpDraw::Do(wxDC& dc, double xoffset, double yoffset)
} }
case DRAWOP_DRAW_ELLIPTIC_ARC: case DRAWOP_DRAW_ELLIPTIC_ARC:
{ {
const double pi = 3.1415926535897932384626433832795 ; const double pi = M_PI ;
// Convert back to degrees // Convert back to degrees
dc.DrawEllipticArc( dc.DrawEllipticArc(
@@ -1276,8 +1273,8 @@ bool wxOpPolyDraw::GetPerimeterPoint(double x1, double y1,
* *
*/ */
static char hexArray[] = { static char hexArray[] = {
_T('0'), _T('1'), _T('2'), _T('3'), _T('4'), _T('5'), _T('6'), _T('7'), _T('0'), _T('1'), _T('2'), _T('3'), _T('4'), _T('5'), _T('6'), _T('7'),
_T('8'), _T('9'), _T('A'), _T('B'), _T('C'), _T('D'), _T('E'), _T('F') }; _T('8'), _T('9'), _T('A'), _T('B'), _T('C'), _T('D'), _T('E'), _T('F') };
// Convert unsigned 16-bit integer to 4-character hex string // Convert unsigned 16-bit integer to 4-character hex string
@@ -1332,11 +1329,6 @@ static int HexToInt1(wxChar hex)
return 14; return 14;
case _T('F'): case _T('F'):
return 15; return 15;
#if 0
// handling this default outside switch removes warning under Borland
default:
return 0;
#endif
} }
return 0; 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) 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 startAngleRadians = startAngle* (pi*2.0/360.0);
double endAngleRadians = endAngle* (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 #endif
#include <ctype.h> #include <ctype.h>
#include <math.h>
#include "wx/ogl/ogl.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 * 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 // The translation that the y offset may give
double deltaX = 0.0; double deltaX = 0.0;
double deltaY = 0.0; double deltaY = 0.0;

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

@@ -18,10 +18,9 @@
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/wx.h" #include "wx/wx.h"
#endif #endif
#include "wx/svg/dcsvg.h" #include "wx/svg/dcsvg.h"
#include <math.h>
#include "wx/image.h" #include "wx/image.h"
#define wxSVG_DEBUG FALSE #define wxSVG_DEBUG FALSE
@@ -36,7 +35,7 @@
#pragma warn -ccc #pragma warn -ccc
#endif #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 ) wxString wxColStr ( wxColour c )
{ {
@@ -140,7 +139,7 @@ void wxSVGFileDC::Init (wxString f, int Width, int Height, float dpi)
// constructors // constructors
wxSVGFileDC::wxSVGFileDC (wxString f) wxSVGFileDC::wxSVGFileDC (wxString f)
{ {
// quarter 640x480 screen display at 72 dpi // quarter 640x480 screen display at 72 dpi
Init (f,320,240,72.0); Init (f,320,240,72.0);
}; };
@@ -252,17 +251,17 @@ void wxSVGFileDC::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoord y,
} }
//now do the text itself //now do the text itself
s.Printf (wxT(" <text x=\"%d\" y=\"%d\" "),x,y ); s.Printf (wxT(" <text x=\"%d\" y=\"%d\" "),x,y );
sTmp = m_font.GetFaceName () ; sTmp = m_font.GetFaceName () ;
if (sTmp.Len () > 0) s = s + wxT("style=\"font-family:") + sTmp + wxT("; "); if (sTmp.Len () > 0) s = s + wxT("style=\"font-family:") + sTmp + wxT("; ");
else s = s + wxT("style=\" ") ; else s = s + wxT("style=\" ") ;
wxString fontweights [3] = { wxT("normal"), wxT("lighter"), wxT("bold") }; wxString fontweights [3] = { wxT("normal"), wxT("lighter"), wxT("bold") };
s = s + wxT("font-weight:") + fontweights[m_font.GetWeight() - wxNORMAL] + semicolon + space; s = s + wxT("font-weight:") + fontweights[m_font.GetWeight() - wxNORMAL] + semicolon + space;
wxString fontstyles [5] = { wxT("normal"), wxT("style error"), wxT("style error"), wxT("italic"), wxT("oblique") }; wxString fontstyles [5] = { wxT("normal"), wxT("style error"), wxT("style error"), wxT("italic"), wxT("oblique") };
s = s + wxT("font-style:") + fontstyles[m_font.GetStyle() - wxNORMAL] + semicolon + space; s = s + wxT("font-style:") + fontstyles[m_font.GetStyle() - wxNORMAL] + semicolon + space;
sTmp.Printf (wxT("font-size:%dpt; fill:#"), m_font.GetPointSize () ); sTmp.Printf (wxT("font-size:%dpt; fill:#"), m_font.GetPointSize () );
s = s + sTmp ; s = s + sTmp ;
s = s + wxColStr (m_textForegroundColour) + wxT("; stroke:#") + wxColStr (m_textForegroundColour) + wxT("; ") ; s = s + wxColStr (m_textForegroundColour) + wxT("; stroke:#") + wxColStr (m_textForegroundColour) + wxT("; ") ;
@@ -289,7 +288,7 @@ void wxSVGFileDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wx
if (m_graphics_changed) NewGraphics (); if (m_graphics_changed) NewGraphics ();
wxString s ; wxString s ;
s.Printf ( wxT(" <rect x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" rx=\"%.2g\" "), s.Printf ( wxT(" <rect x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" rx=\"%.2g\" "),
x, y, width, height, radius ); x, y, width, height, radius );
s = s + wxT(" /> ") + newline ; s = s + wxT(" /> ") + newline ;
@@ -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)); 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)); double theta2 = atan2((double)(yc-y2), (double)(x2-xc));
if ( theta2 < 0 ) theta2 = theta2 + 3.14 * 2; if ( theta2 < 0 ) theta2 = theta2 + M_PI * 2;
if ( theta2 < theta1 ) theta2 = theta2 + 3.14 *2 ; if ( theta2 < theta1 ) theta2 = theta2 + M_PI *2 ;
int fArc ; // flag for large or small arc 0 means less than 180 degrees 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 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 ; if ( (theta2 - theta1) > 0 ) fArc = 1; else fArc = 0 ;
int fSweep ; 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 "), 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), int(xs), int(ys), int(rx), int(ry),
@@ -530,7 +529,7 @@ void wxSVGFileDC::SetPen(const wxPen& pen)
// width, color, ends, joins : currently implemented // width, color, ends, joins : currently implemented
// dashes, stipple : not implemented // dashes, stipple : not implemented
m_pen = pen ; m_pen = pen ;
m_graphics_changed = TRUE ; m_graphics_changed = TRUE ;
wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::SetPen Call executed")) ; wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::SetPen Call executed")) ;
} }
@@ -542,10 +541,10 @@ void wxSVGFileDC::NewGraphics ()
wxColour c = m_pen.GetColour () ; wxColour c = m_pen.GetColour () ;
wxString s, sBrush, sPenCap, sPenJoin, sPenStyle, sLast, sWarn; wxString s, sBrush, sPenCap, sPenJoin, sPenStyle, sLast, sWarn;
sBrush = wxT("</g>\n<g style=\"") + wxBrushString ( m_brush.GetColour (), m_brush.GetStyle () ) sBrush = wxT("</g>\n<g style=\"") + wxBrushString ( m_brush.GetColour (), m_brush.GetStyle () )
+ wxT(" stroke:#") + wxColStr (c) + wxT("; ") ; + wxT(" stroke:#") + wxColStr (c) + wxT("; ") ;
switch ( m_pen.GetCap () ) switch ( m_pen.GetCap () )
{ {
case wxCAP_PROJECTING : case wxCAP_PROJECTING :
@@ -584,7 +583,7 @@ void wxSVGFileDC::NewGraphics ()
sWarn = sWarn + wxT("<!--- wxSVGFileDC::SetPen Call called to set a Style which is not available --> \n") ; sWarn = sWarn + wxT("<!--- wxSVGFileDC::SetPen Call called to set a Style which is not available --> \n") ;
} }
sLast.Printf ( wxT("stroke-width:%d\" \n transform=\"translate(%.2g %.2g) scale(%.2g %.2g)\">"), sLast.Printf ( wxT("stroke-width:%d\" \n transform=\"translate(%.2g %.2g) scale(%.2g %.2g)\">"),
w, m_OriginX, m_OriginY, m_scaleX, m_scaleY ); w, m_OriginX, m_OriginY, m_scaleX, m_scaleY );
s = sBrush + sPenCap + sPenJoin + sPenStyle + sLast + newline + sWarn; s = sBrush + sPenCap + sPenJoin + sPenStyle + sLast + newline + sWarn;
@@ -598,7 +597,7 @@ void wxSVGFileDC::SetFont(const wxFont& font)
{ {
m_font = font ; m_font = font ;
wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::SetFont Call executed")) ; wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::SetFont Call executed")) ;
} }
@@ -688,7 +687,7 @@ void wxSVGFileDC::SetLogicalOrigin( wxCoord x, wxCoord y )
void wxSVGFileDC::SetDeviceOrigin( wxCoord x, wxCoord y ) void wxSVGFileDC::SetDeviceOrigin( wxCoord x, wxCoord y )
{ {
// only wxPostScripDC has m_signX = -1, // only wxPostScripDC has m_signX = -1,
m_deviceOriginX = x; m_deviceOriginX = x;
m_deviceOriginY = y; m_deviceOriginY = y;
ComputeScaleAndOrigin(); ComputeScaleAndOrigin();
@@ -697,7 +696,7 @@ void wxSVGFileDC::SetDeviceOrigin( wxCoord x, wxCoord y )
void wxSVGFileDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp ) void wxSVGFileDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
{ {
// only wxPostScripDC has m_signX = -1, // only wxPostScripDC has m_signX = -1,
m_signX = (xLeftRight ? 1 : -1); m_signX = (xLeftRight ? 1 : -1);
m_signY = (yBottomUp ? -1 : 1); m_signY = (yBottomUp ? -1 : 1);
ComputeScaleAndOrigin(); ComputeScaleAndOrigin();
@@ -706,11 +705,10 @@ void wxSVGFileDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
// export a bitmap as a raster image in png // export a bitmap as a raster image in png
bool wxSVGFileDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, bool wxSVGFileDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
wxDC* source, wxCoord xsrc, wxCoord ysrc, wxDC* source, wxCoord xsrc, wxCoord ysrc,
int logicalFunc /*= wxCOPY*/, bool useMask /*= FALSE*/, int logicalFunc /*= wxCOPY*/, bool useMask /*= FALSE*/,
wxCoord /*xsrcMask = -1*/, wxCoord /*ysrcMask = -1*/) wxCoord /*xsrcMask = -1*/, wxCoord /*ysrcMask = -1*/)
{ {
if (logicalFunc != wxCOPY) if (logicalFunc != wxCOPY)
{ {
wxASSERT_MSG(FALSE, wxT("wxSVGFileDC::DoBlit Call requested nonCopy mode; this is not possible")) ; wxASSERT_MSG(FALSE, wxT("wxSVGFileDC::DoBlit Call requested nonCopy mode; this is not possible")) ;
@@ -745,15 +743,15 @@ void wxSVGFileDC::DoDrawIcon(const class wxIcon & myIcon, wxCoord x, wxCoord y)
} }
void wxSVGFileDC::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y , bool WXUNUSED(bTransparent) /*=0*/ ) void wxSVGFileDC::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y , bool WXUNUSED(bTransparent) /*=0*/ )
{ {
if (m_graphics_changed) NewGraphics (); if (m_graphics_changed) NewGraphics ();
wxString sTmp, s, sPNG ; wxString sTmp, s, sPNG ;
wxImage::AddHandler(new wxPNGHandler); wxImage::AddHandler(new wxPNGHandler);
// create suitable file name // create suitable file name
sTmp.Printf ( wxT("_image%d.png"), m_sub_images); sTmp.Printf ( wxT("_image%d.png"), m_sub_images);
sPNG = m_filename.BeforeLast(wxT('.')) + sTmp; sPNG = m_filename.BeforeLast(wxT('.')) + sTmp;
while (wxFile::Exists(sPNG) ) while (wxFile::Exists(sPNG) )
@@ -762,7 +760,7 @@ void wxSVGFileDC::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y
sTmp.Printf ( wxT("_image%d.png"), m_sub_images); sTmp.Printf ( wxT("_image%d.png"), m_sub_images);
sPNG = m_filename.BeforeLast(wxT('.')) + sTmp; sPNG = m_filename.BeforeLast(wxT('.')) + sTmp;
} }
//create copy of bitmap (wxGTK doesn't like saving a constant bitmap) //create copy of bitmap (wxGTK doesn't like saving a constant bitmap)
wxBitmap myBitmap = bmp ; wxBitmap myBitmap = bmp ;
//save it //save it
@@ -775,7 +773,7 @@ void wxSVGFileDC::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y
s = s + sTmp ; s = s + sTmp ;
sTmp.Printf ( wxT(" xlink:href=\"%s\"> \n"), sPNG.c_str() ); sTmp.Printf ( wxT(" xlink:href=\"%s\"> \n"), sPNG.c_str() );
s = s + sTmp + wxT("<title>Image from wxSVG</title> </image>") + newline; s = s + sTmp + wxT("<title>Image from wxSVG</title> </image>") + newline;
if (m_OK && bPNG_OK) if (m_OK && bPNG_OK)
{ {
write(s); write(s);
@@ -840,9 +838,9 @@ wxCoord wxSVGFileDC::LogicalToDeviceYRel(wxCoord y) const
void wxSVGFileDC::write(const wxString &s) void wxSVGFileDC::write(const wxString &s)
{ {
const wxWX2MBbuf buf = s.mb_str(wxConvUTF8); const wxWX2MBbuf buf = s.mb_str(wxConvUTF8);
m_outfile->Write(buf, strlen((const char *)buf)); m_outfile->Write(buf, strlen((const char *)buf));
m_OK = m_outfile->Ok(); m_OK = m_outfile->Ok();
} }
#ifdef __BORLANDC__ #ifdef __BORLANDC__

66
src/common/dcsvg.cpp
View File

@@ -18,10 +18,9 @@
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/wx.h" #include "wx/wx.h"
#endif #endif
#include "wx/svg/dcsvg.h" #include "wx/svg/dcsvg.h"
#include <math.h>
#include "wx/image.h" #include "wx/image.h"
#define wxSVG_DEBUG FALSE #define wxSVG_DEBUG FALSE
@@ -36,7 +35,7 @@
#pragma warn -ccc #pragma warn -ccc
#endif #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 ) wxString wxColStr ( wxColour c )
{ {
@@ -140,7 +139,7 @@ void wxSVGFileDC::Init (wxString f, int Width, int Height, float dpi)
// constructors // constructors
wxSVGFileDC::wxSVGFileDC (wxString f) wxSVGFileDC::wxSVGFileDC (wxString f)
{ {
// quarter 640x480 screen display at 72 dpi // quarter 640x480 screen display at 72 dpi
Init (f,320,240,72.0); Init (f,320,240,72.0);
}; };
@@ -252,17 +251,17 @@ void wxSVGFileDC::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoord y,
} }
//now do the text itself //now do the text itself
s.Printf (wxT(" <text x=\"%d\" y=\"%d\" "),x,y ); s.Printf (wxT(" <text x=\"%d\" y=\"%d\" "),x,y );
sTmp = m_font.GetFaceName () ; sTmp = m_font.GetFaceName () ;
if (sTmp.Len () > 0) s = s + wxT("style=\"font-family:") + sTmp + wxT("; "); if (sTmp.Len () > 0) s = s + wxT("style=\"font-family:") + sTmp + wxT("; ");
else s = s + wxT("style=\" ") ; else s = s + wxT("style=\" ") ;
wxString fontweights [3] = { wxT("normal"), wxT("lighter"), wxT("bold") }; wxString fontweights [3] = { wxT("normal"), wxT("lighter"), wxT("bold") };
s = s + wxT("font-weight:") + fontweights[m_font.GetWeight() - wxNORMAL] + semicolon + space; s = s + wxT("font-weight:") + fontweights[m_font.GetWeight() - wxNORMAL] + semicolon + space;
wxString fontstyles [5] = { wxT("normal"), wxT("style error"), wxT("style error"), wxT("italic"), wxT("oblique") }; wxString fontstyles [5] = { wxT("normal"), wxT("style error"), wxT("style error"), wxT("italic"), wxT("oblique") };
s = s + wxT("font-style:") + fontstyles[m_font.GetStyle() - wxNORMAL] + semicolon + space; s = s + wxT("font-style:") + fontstyles[m_font.GetStyle() - wxNORMAL] + semicolon + space;
sTmp.Printf (wxT("font-size:%dpt; fill:#"), m_font.GetPointSize () ); sTmp.Printf (wxT("font-size:%dpt; fill:#"), m_font.GetPointSize () );
s = s + sTmp ; s = s + sTmp ;
s = s + wxColStr (m_textForegroundColour) + wxT("; stroke:#") + wxColStr (m_textForegroundColour) + wxT("; ") ; s = s + wxColStr (m_textForegroundColour) + wxT("; stroke:#") + wxColStr (m_textForegroundColour) + wxT("; ") ;
@@ -289,7 +288,7 @@ void wxSVGFileDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wx
if (m_graphics_changed) NewGraphics (); if (m_graphics_changed) NewGraphics ();
wxString s ; wxString s ;
s.Printf ( wxT(" <rect x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" rx=\"%.2g\" "), s.Printf ( wxT(" <rect x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" rx=\"%.2g\" "),
x, y, width, height, radius ); x, y, width, height, radius );
s = s + wxT(" /> ") + newline ; s = s + wxT(" /> ") + newline ;
@@ -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)); 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)); double theta2 = atan2((double)(yc-y2), (double)(x2-xc));
if ( theta2 < 0 ) theta2 = theta2 + 3.14 * 2; if ( theta2 < 0 ) theta2 = theta2 + M_PI * 2;
if ( theta2 < theta1 ) theta2 = theta2 + 3.14 *2 ; if ( theta2 < theta1 ) theta2 = theta2 + M_PI *2 ;
int fArc ; // flag for large or small arc 0 means less than 180 degrees 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 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 ; if ( (theta2 - theta1) > 0 ) fArc = 1; else fArc = 0 ;
int fSweep ; 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 "), 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), int(xs), int(ys), int(rx), int(ry),
@@ -530,7 +529,7 @@ void wxSVGFileDC::SetPen(const wxPen& pen)
// width, color, ends, joins : currently implemented // width, color, ends, joins : currently implemented
// dashes, stipple : not implemented // dashes, stipple : not implemented
m_pen = pen ; m_pen = pen ;
m_graphics_changed = TRUE ; m_graphics_changed = TRUE ;
wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::SetPen Call executed")) ; wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::SetPen Call executed")) ;
} }
@@ -542,10 +541,10 @@ void wxSVGFileDC::NewGraphics ()
wxColour c = m_pen.GetColour () ; wxColour c = m_pen.GetColour () ;
wxString s, sBrush, sPenCap, sPenJoin, sPenStyle, sLast, sWarn; wxString s, sBrush, sPenCap, sPenJoin, sPenStyle, sLast, sWarn;
sBrush = wxT("</g>\n<g style=\"") + wxBrushString ( m_brush.GetColour (), m_brush.GetStyle () ) sBrush = wxT("</g>\n<g style=\"") + wxBrushString ( m_brush.GetColour (), m_brush.GetStyle () )
+ wxT(" stroke:#") + wxColStr (c) + wxT("; ") ; + wxT(" stroke:#") + wxColStr (c) + wxT("; ") ;
switch ( m_pen.GetCap () ) switch ( m_pen.GetCap () )
{ {
case wxCAP_PROJECTING : case wxCAP_PROJECTING :
@@ -584,7 +583,7 @@ void wxSVGFileDC::NewGraphics ()
sWarn = sWarn + wxT("<!--- wxSVGFileDC::SetPen Call called to set a Style which is not available --> \n") ; sWarn = sWarn + wxT("<!--- wxSVGFileDC::SetPen Call called to set a Style which is not available --> \n") ;
} }
sLast.Printf ( wxT("stroke-width:%d\" \n transform=\"translate(%.2g %.2g) scale(%.2g %.2g)\">"), sLast.Printf ( wxT("stroke-width:%d\" \n transform=\"translate(%.2g %.2g) scale(%.2g %.2g)\">"),
w, m_OriginX, m_OriginY, m_scaleX, m_scaleY ); w, m_OriginX, m_OriginY, m_scaleX, m_scaleY );
s = sBrush + sPenCap + sPenJoin + sPenStyle + sLast + newline + sWarn; s = sBrush + sPenCap + sPenJoin + sPenStyle + sLast + newline + sWarn;
@@ -598,7 +597,7 @@ void wxSVGFileDC::SetFont(const wxFont& font)
{ {
m_font = font ; m_font = font ;
wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::SetFont Call executed")) ; wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::SetFont Call executed")) ;
} }
@@ -688,7 +687,7 @@ void wxSVGFileDC::SetLogicalOrigin( wxCoord x, wxCoord y )
void wxSVGFileDC::SetDeviceOrigin( wxCoord x, wxCoord y ) void wxSVGFileDC::SetDeviceOrigin( wxCoord x, wxCoord y )
{ {
// only wxPostScripDC has m_signX = -1, // only wxPostScripDC has m_signX = -1,
m_deviceOriginX = x; m_deviceOriginX = x;
m_deviceOriginY = y; m_deviceOriginY = y;
ComputeScaleAndOrigin(); ComputeScaleAndOrigin();
@@ -697,7 +696,7 @@ void wxSVGFileDC::SetDeviceOrigin( wxCoord x, wxCoord y )
void wxSVGFileDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp ) void wxSVGFileDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
{ {
// only wxPostScripDC has m_signX = -1, // only wxPostScripDC has m_signX = -1,
m_signX = (xLeftRight ? 1 : -1); m_signX = (xLeftRight ? 1 : -1);
m_signY = (yBottomUp ? -1 : 1); m_signY = (yBottomUp ? -1 : 1);
ComputeScaleAndOrigin(); ComputeScaleAndOrigin();
@@ -706,11 +705,10 @@ void wxSVGFileDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
// export a bitmap as a raster image in png // export a bitmap as a raster image in png
bool wxSVGFileDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, bool wxSVGFileDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
wxDC* source, wxCoord xsrc, wxCoord ysrc, wxDC* source, wxCoord xsrc, wxCoord ysrc,
int logicalFunc /*= wxCOPY*/, bool useMask /*= FALSE*/, int logicalFunc /*= wxCOPY*/, bool useMask /*= FALSE*/,
wxCoord /*xsrcMask = -1*/, wxCoord /*ysrcMask = -1*/) wxCoord /*xsrcMask = -1*/, wxCoord /*ysrcMask = -1*/)
{ {
if (logicalFunc != wxCOPY) if (logicalFunc != wxCOPY)
{ {
wxASSERT_MSG(FALSE, wxT("wxSVGFileDC::DoBlit Call requested nonCopy mode; this is not possible")) ; wxASSERT_MSG(FALSE, wxT("wxSVGFileDC::DoBlit Call requested nonCopy mode; this is not possible")) ;
@@ -745,15 +743,15 @@ void wxSVGFileDC::DoDrawIcon(const class wxIcon & myIcon, wxCoord x, wxCoord y)
} }
void wxSVGFileDC::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y , bool WXUNUSED(bTransparent) /*=0*/ ) void wxSVGFileDC::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y , bool WXUNUSED(bTransparent) /*=0*/ )
{ {
if (m_graphics_changed) NewGraphics (); if (m_graphics_changed) NewGraphics ();
wxString sTmp, s, sPNG ; wxString sTmp, s, sPNG ;
wxImage::AddHandler(new wxPNGHandler); wxImage::AddHandler(new wxPNGHandler);
// create suitable file name // create suitable file name
sTmp.Printf ( wxT("_image%d.png"), m_sub_images); sTmp.Printf ( wxT("_image%d.png"), m_sub_images);
sPNG = m_filename.BeforeLast(wxT('.')) + sTmp; sPNG = m_filename.BeforeLast(wxT('.')) + sTmp;
while (wxFile::Exists(sPNG) ) while (wxFile::Exists(sPNG) )
@@ -762,7 +760,7 @@ void wxSVGFileDC::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y
sTmp.Printf ( wxT("_image%d.png"), m_sub_images); sTmp.Printf ( wxT("_image%d.png"), m_sub_images);
sPNG = m_filename.BeforeLast(wxT('.')) + sTmp; sPNG = m_filename.BeforeLast(wxT('.')) + sTmp;
} }
//create copy of bitmap (wxGTK doesn't like saving a constant bitmap) //create copy of bitmap (wxGTK doesn't like saving a constant bitmap)
wxBitmap myBitmap = bmp ; wxBitmap myBitmap = bmp ;
//save it //save it
@@ -775,7 +773,7 @@ void wxSVGFileDC::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y
s = s + sTmp ; s = s + sTmp ;
sTmp.Printf ( wxT(" xlink:href=\"%s\"> \n"), sPNG.c_str() ); sTmp.Printf ( wxT(" xlink:href=\"%s\"> \n"), sPNG.c_str() );
s = s + sTmp + wxT("<title>Image from wxSVG</title> </image>") + newline; s = s + sTmp + wxT("<title>Image from wxSVG</title> </image>") + newline;
if (m_OK && bPNG_OK) if (m_OK && bPNG_OK)
{ {
write(s); write(s);
@@ -840,9 +838,9 @@ wxCoord wxSVGFileDC::LogicalToDeviceYRel(wxCoord y) const
void wxSVGFileDC::write(const wxString &s) void wxSVGFileDC::write(const wxString &s)
{ {
const wxWX2MBbuf buf = s.mb_str(wxConvUTF8); const wxWX2MBbuf buf = s.mb_str(wxConvUTF8);
m_outfile->Write(buf, strlen((const char *)buf)); m_outfile->Write(buf, strlen((const char *)buf));
m_OK = m_outfile->Ok(); m_OK = m_outfile->Ok();
} }
#ifdef __BORLANDC__ #ifdef __BORLANDC__