X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cdf3a589b2bb01c3ca1dc4e35661d864b2a2c227..582ca3535a3680817ec4448141437eb2812df090:/contrib/src/svg/dcsvg.cpp diff --git a/contrib/src/svg/dcsvg.cpp b/contrib/src/svg/dcsvg.cpp index d59ecb0277..213cb11369 100644 --- a/contrib/src/svg/dcsvg.cpp +++ b/contrib/src/svg/dcsvg.cpp @@ -18,10 +18,9 @@ #ifndef WX_PRECOMP #include "wx/wx.h" #endif - + #include "wx/svg/dcsvg.h" -#include #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 ) { @@ -120,28 +119,27 @@ void wxSVGFileDC::Init (wxString f, int Width, int Height, float dpi) m_sub_images = 0 ; wxString s ; s = wxT("") ; s = s + newline ; - m_outfile->Write (s.c_str(), s.Len() ) ; + write(s); s = wxT("Write (s.c_str(), s.Len() ) ; + write(s); s = wxT("\"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd\"> ")+ newline ; - m_outfile->Write (s.c_str(), s.Len() ) ; + write(s); s.Printf ( wxT(" \n"), float(Width)/dpi*2.54, float(Height)/dpi*2.54, Width, Height ); - m_outfile->Write (s.c_str(), s.Len() ) ; + write(s); s = wxT("SVG Picture created as ") + wxFileNameFromPath(f) + wxT(" ") + newline ; - m_outfile->Write (s.c_str(), s.Len() ) ; + write(s); s = wxString (wxT("Picture generated by wxSVG ")) + wxSVGVersion + wxT(" ")+ newline ; - m_outfile->Write (s.c_str(), s.Len() ) ; + write(s); s = wxT("") + newline ; - m_outfile->Write (s.c_str(), s.Len() ) ; + write(s); } - m_OK = m_outfile->Ok (); } // constructors wxSVGFileDC::wxSVGFileDC (wxString f) -{ +{ // quarter 640x480 screen display at 72 dpi Init (f,320,240,72.0); }; @@ -159,8 +157,7 @@ wxSVGFileDC::wxSVGFileDC (wxString f, int Width, int Height, float dpi) wxSVGFileDC::~wxSVGFileDC() { wxString s = wxT(" \n \n") ; - m_outfile->Write (s.c_str(), s.Len() ) ; - m_OK = m_outfile->Ok (); + write(s); delete m_outfile ; } @@ -174,9 +171,8 @@ void wxSVGFileDC::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) s.Printf ( wxT(" \n"), x1,y1,x2,y2 ); if (m_OK) { - m_outfile->Write (s.c_str(), s.Len() ) ; + write(s); } - m_OK = m_outfile->Ok (); wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DrawLine Call executed")) ; CalcBoundingBox(x1, y1) ; CalcBoundingBox(x2, y2) ; @@ -198,11 +194,10 @@ void wxSVGFileDC::DoDrawPoint (wxCoord x1, wxCoord y1) wxString s; if (m_graphics_changed) NewGraphics (); s = wxT(" ") + newline ; - m_outfile->Write (s.c_str(), s.Len() ) ; + write(s); DrawLine ( x1,y1,x1,y1 ); s = wxT(""); - m_outfile->Write (s.c_str(), s.Len() ) ; - m_OK = m_outfile->Ok (); + write(s); } @@ -233,13 +228,13 @@ void wxSVGFileDC::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoord y, // wxT("upper left") and wxT("upper right") CalcBoundingBox(x, y); - CalcBoundingBox(x + w*cos(rad), y - h*sin(rad)); + CalcBoundingBox((wxCoord)(x + w*cos(rad)), (wxCoord)(y - h*sin(rad))); // wxT("bottom left") and wxT("bottom right") x += (wxCoord)(h*sin(rad)); y += (wxCoord)(h*cos(rad)); CalcBoundingBox(x, y); - CalcBoundingBox(x + h*sin(rad), y + h*cos(rad)); + CalcBoundingBox((wxCoord)(x + h*sin(rad)), (wxCoord)(y + h*cos(rad))); if (m_backgroundMode == wxSOLID) { @@ -252,21 +247,21 @@ void wxSVGFileDC::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoord y, s = s + wxT("stroke-width:1; stroke:#") + wxColStr (m_textBackgroundColour) + wxT("; ") ; sTmp.Printf ( wxT("\" transform=\"rotate( %.2g %d %d ) \">"), -angle, x,y ) ; s = s + sTmp + newline ; - m_outfile->Write (s.c_str(), s.Len() ) ; + write(s); } //now do the text itself s.Printf (wxT(" 0) s = s + wxT("style=\"font-family:") + sTmp + wxT("; "); else s = s + wxT("style=\" ") ; wxString fontweights [3] = { wxT("normal"), wxT("lighter"), wxT("bold") }; 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") }; s = s + wxT("font-style:") + fontstyles[m_font.GetStyle() - wxNORMAL] + semicolon + space; - + sTmp.Printf (wxT("font-size:%dpt; fill:#"), m_font.GetPointSize () ); s = s + sTmp ; s = s + wxColStr (m_textForegroundColour) + wxT("; stroke:#") + wxColStr (m_textForegroundColour) + wxT("; ") ; @@ -274,9 +269,8 @@ void wxSVGFileDC::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoord y, s = s + sTmp + sText + wxT(" ") + newline ; if (m_OK) { - m_outfile->Write (s.c_str(), s.Len() ) ; + write(s); } - m_OK = m_outfile->Ok (); wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DrawRotatedText Call executed")) ; } @@ -294,12 +288,11 @@ void wxSVGFileDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wx if (m_graphics_changed) NewGraphics (); wxString s ; - s.Printf ( wxT(" ") + newline ; - m_outfile->Write (s.c_str(), s.Len() ) ; - m_OK = m_outfile->Ok (); + write(s); wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DoDrawRoundedRectangle Call executed")) ; CalcBoundingBox(x, y) ; @@ -328,8 +321,7 @@ void wxSVGFileDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoor } s = s + wxT("\" /> ") ; s = s + newline ; - m_outfile->Write (s.c_str(), s.Len() ) ; - m_OK = m_outfile->Ok (); + write(s); wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DoDrawPolygon Call executed")) ; } @@ -347,8 +339,7 @@ void wxSVGFileDC::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxCoord he s.Printf ( wxT(" ") + newline ; - m_outfile->Write (s.c_str(), s.Len() ) ; - m_OK = m_outfile->Ok (); + write(s); wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DoDrawEllipse Call executed")) ; CalcBoundingBox(x, y) ; @@ -378,17 +369,17 @@ void wxSVGFileDC::DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCo if ( fabs ( r2-r1 ) > 3 ) //pixels { s = wxT(" \n") ; - m_outfile->Write (s.c_str(), s.Len() ) ; + write(s); } - double theta1 = atan2(yc-y1,x1-xc); - if ( theta1 < 0 ) theta1 = theta1 + 3.14 * 2; - double theta2 = atan2(yc-y2, x2-xc); - if ( theta2 < 0 ) theta2 = theta2 + 3.14 * 2; - if ( theta2 < theta1 ) theta2 = theta2 + 3.14 *2 ; + double theta1 = atan2((double)(yc-y1),(double)(x1-xc)); + if ( theta1 < 0 ) theta1 = theta1 + M_PI * 2; + double theta2 = atan2((double)(yc-y2), (double)(x2-xc)); + 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 @@ -401,9 +392,8 @@ void wxSVGFileDC::DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCo if (m_OK) { - m_outfile->Write (s.c_str(), s.Len() ) ; + write(s); } - m_OK = m_outfile->Ok (); wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DoDrawArc Call executed")) ; } @@ -455,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("Write (s.c_str(), s.Len() ) ; + write(s); } - m_OK = m_outfile->Ok (); wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DoDrawEllipticArc Call executed")) ; } @@ -540,7 +529,7 @@ void wxSVGFileDC::SetPen(const wxPen& pen) // width, color, ends, joins : currently implemented // dashes, stipple : not implemented m_pen = pen ; - + m_graphics_changed = TRUE ; wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::SetPen Call executed")) ; } @@ -552,10 +541,10 @@ void wxSVGFileDC::NewGraphics () wxColour c = m_pen.GetColour () ; wxString s, sBrush, sPenCap, sPenJoin, sPenStyle, sLast, sWarn; - - sBrush = wxT("\n\n \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 ); s = sBrush + sPenCap + sPenJoin + sPenStyle + sLast + newline + sWarn; - m_outfile->Write (s.c_str(), s.Len() ) ; - m_OK = m_outfile->Ok (); + write(s); m_graphics_changed = FALSE ; wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::NewGraphics Call executed")) ; } @@ -609,7 +597,7 @@ void wxSVGFileDC::SetFont(const wxFont& font) { m_font = font ; - + wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::SetFont Call executed")) ; } @@ -699,7 +687,7 @@ void wxSVGFileDC::SetLogicalOrigin( 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_deviceOriginY = y; ComputeScaleAndOrigin(); @@ -708,7 +696,7 @@ void wxSVGFileDC::SetDeviceOrigin( wxCoord x, wxCoord y ) 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_signY = (yBottomUp ? -1 : 1); ComputeScaleAndOrigin(); @@ -717,11 +705,10 @@ void wxSVGFileDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp ) // export a bitmap as a raster image in png bool wxSVGFileDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, - wxDC* source, wxCoord xsrc, wxCoord ysrc, - int logicalFunc /*= wxCOPY*/, bool useMask /*= FALSE*/, - wxCoord /*xsrcMask = -1*/, wxCoord /*ysrcMask = -1*/) + wxDC* source, wxCoord xsrc, wxCoord ysrc, + 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")) ; @@ -756,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 bTransparent /*=0*/ ) + +void wxSVGFileDC::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y , bool WXUNUSED(bTransparent) /*=0*/ ) { if (m_graphics_changed) NewGraphics (); - wxString sTmp, s, sPNG ; + wxString sTmp, s, sPNG ; wxImage::AddHandler(new wxPNGHandler); -// create suitable file name +// create suitable file name sTmp.Printf ( wxT("_image%d.png"), m_sub_images); sPNG = m_filename.BeforeLast(wxT('.')) + sTmp; while (wxFile::Exists(sPNG) ) @@ -773,7 +760,7 @@ void wxSVGFileDC::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y sTmp.Printf ( wxT("_image%d.png"), m_sub_images); sPNG = m_filename.BeforeLast(wxT('.')) + sTmp; } - + //create copy of bitmap (wxGTK doesn't like saving a constant bitmap) wxBitmap myBitmap = bmp ; //save it @@ -786,10 +773,10 @@ void wxSVGFileDC::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y s = s + sTmp ; sTmp.Printf ( wxT(" xlink:href=\"%s\"> \n"), sPNG.c_str() ); s = s + sTmp + wxT("Image from wxSVG ") + newline; - + if (m_OK && bPNG_OK) { - m_outfile->Write (s.c_str(), s.Len() ) ; + write(s); } m_OK = m_outfile->Ok () && bPNG_OK; wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DoDrawBitmap Call executed")) ; @@ -849,6 +836,12 @@ wxCoord wxSVGFileDC::LogicalToDeviceYRel(wxCoord y) const return YLOG2DEVREL(y); } +void wxSVGFileDC::write(const wxString &s) +{ + const wxWX2MBbuf buf = s.mb_str(wxConvUTF8); + m_outfile->Write(buf, strlen((const char *)buf)); + m_OK = m_outfile->Ok(); +} #ifdef __BORLANDC__ #pragma warn .rch