X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04ee05f92add0ab92ce08ecb827e3be41336aa06..cc4d5638c66a409e421420ed7110917755a66788:/src/common/dcsvg.cpp?ds=inline diff --git a/src/common/dcsvg.cpp b/src/common/dcsvg.cpp index 2d0b4dcbab..6fd0c2a46f 100644 --- a/src/common/dcsvg.cpp +++ b/src/common/dcsvg.cpp @@ -1,10 +1,9 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: svg.cpp +// Name: src/common/svg.cpp // Purpose: SVG sample // Author: Chris Elliott // Modified by: -// RCS-ID: $Id$ -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -26,71 +25,112 @@ #include "wx/dcsvg.h" #include "wx/wfstream.h" +#include "wx/filename.h" -#define wxSVG_DEBUG FALSE -// or TRUE to see the calls being executed +// ---------------------------------------------------------- +// Global utilities +// ---------------------------------------------------------- + +namespace +{ -#define newline wxString(wxT("\n")) -#define space wxString(wxT(" ")) -#define semicolon wxString(wxT(";")) -#define wx_round(a) (int)((a)+.5) +inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; } -static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; } +// This function returns a string representation of a floating point number in +// C locale (i.e. always using "." for the decimal separator) and with the +// fixed precision (which is 2 for some unknown reason but this is what it was +// in this code originally). +inline wxString NumStr(double f) +{ + return wxString::FromCDouble(f, 2); +} -wxString wxColStr ( wxColour c ) +// Return the colour representation as HTML-like "#rrggbb" string and also +// returns its alpha as opacity number in 0..1 range. +wxString Col2SVG(wxColour c, float *opacity) { - unsigned char r, g, b ; - r = c.Red (); - g = c.Green (); - b = c. Blue (); + if ( c.Alpha() != wxALPHA_OPAQUE ) + { + *opacity = c.Alpha()/255.; + + // Remove the alpha before using GetAsString(wxC2S_HTML_SYNTAX) as it + // doesn't support colours with alpha channel. + c = wxColour(c.GetRGB()); + } + else // No alpha. + { + *opacity = 1.; + } - // possible Unicode bug here - wxString s = wxDecToHex(r) + wxDecToHex(g) + wxDecToHex(b) ; - return s ; + return c.GetAsString(wxC2S_HTML_SYNTAX); } +wxString wxPenString(wxColour c, int style = wxPENSTYLE_SOLID) +{ + float opacity; + wxString s = wxT("stroke:") + Col2SVG(c, &opacity) + wxT("; "); -wxString wxBrushString ( wxColour c, int style ) + switch ( style ) + { + case wxPENSTYLE_SOLID: + s += wxString::Format(wxT("stroke-opacity:%s; "), NumStr(opacity)); + break; + case wxPENSTYLE_TRANSPARENT: + s += wxT("stroke-opacity:0.0; "); + break; + default : + wxASSERT_MSG(false, wxT("wxSVGFileDC::Requested Pen Style not available")); + } + + return s; +} + +wxString wxBrushString(wxColour c, int style = wxBRUSHSTYLE_SOLID) { - wxString s = wxT("fill:#") + wxColStr (c) + semicolon + space ; + float opacity; + wxString s = wxT("fill:") + Col2SVG(c, &opacity) + wxT("; "); + switch ( style ) { - case wxBRUSHSTYLE_SOLID : - s = s + wxT("fill-opacity:1.0; "); - break ; + case wxBRUSHSTYLE_SOLID: + s += wxString::Format(wxT("fill-opacity:%s; "), NumStr(opacity)); + break; case wxBRUSHSTYLE_TRANSPARENT: - s = s + wxT("fill-opacity:0.0; "); - break ; - + s += wxT("fill-opacity:0.0; "); + break; default : - wxASSERT_MSG(FALSE, wxT("wxSVGFileDC::Requested Brush Style not available")) ; - + wxASSERT_MSG(false, wxT("wxSVGFileDC::Requested Brush Style not available")); } - s = s + newline ; - return s ; + + return s; } +} // anonymous namespace + // ---------------------------------------------------------- -// wxSVGFileDC +// wxSVGFileDCImpl // ---------------------------------------------------------- IMPLEMENT_ABSTRACT_CLASS(wxSVGFileDCImpl, wxDC) -wxSVGFileDCImpl::wxSVGFileDCImpl( wxSVGFileDC *owner, const wxString &filename, - int width, int height, double dpi ) : +wxSVGFileDCImpl::wxSVGFileDCImpl( wxSVGFileDC *owner, const wxString &filename, + int width, int height, double dpi ) : wxDCImpl( owner ) { - Init( filename, width, height, dpi ); + Init( filename, width, height, dpi ); } void wxSVGFileDCImpl::Init (const wxString &filename, int Width, int Height, double dpi) { - m_width = Width ; - m_height = Height ; + m_width = Width; + m_height = Height; m_dpi = dpi; - m_OK = TRUE; + m_OK = true; + + m_clipUniqueId = 0; + m_clipNestingLevel = 0; m_mm_to_pix_x = dpi/25.4; m_mm_to_pix_y = dpi/25.4; @@ -104,53 +144,52 @@ void wxSVGFileDCImpl::Init (const wxString &filename, int Width, int Height, dou m_font = *wxNORMAL_FONT; m_brush = *wxWHITE_BRUSH; - m_graphics_changed = TRUE ; + m_graphics_changed = true; ////////////////////code here - m_outfile = new wxFileOutputStream(filename) ; - m_OK = m_outfile->Ok (); + m_outfile = new wxFileOutputStream(filename); + m_OK = m_outfile->IsOk(); if (m_OK) { - m_filename = filename ; - m_sub_images = 0 ; - wxString s ; - s = wxT("") ; s = s + newline ; + m_filename = filename; + m_sub_images = 0; + wxString s; + s = wxT("\n"); write(s); - s = wxT(" ")+ newline ; + s = wxT("\"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd\">\n"); write(s); - s.Printf ( wxT(" \n"), float(Width)/dpi*2.54, float(Height)/dpi*2.54, Width, Height ); + s = wxT("SVG Picture created as ") + wxFileNameFromPath(filename) + wxT(" ") + newline ; + s.Printf( wxT(" width=\"%scm\" height=\"%scm\" viewBox=\"0 0 %d %d \">\n"), NumStr(float(Width)/dpi*2.54), NumStr(float(Height)/dpi*2.54), Width, Height ); write(s); - s = wxString (wxT("Picture generated by wxSVG ")) + wxSVGVersion + wxT(" ")+ newline ; + s = wxT("SVG Picture created as ") + wxFileName(filename).GetFullName() + wxT(" \n"); write(s); - s = wxT("") + newline ; + s = wxString (wxT("Picture generated by wxSVG ")) + wxSVGVersion + wxT(" \n"); + write(s); + s = wxT("\n"); write(s); - } } - - wxSVGFileDCImpl::~wxSVGFileDCImpl() { - wxString s = wxT(" \n \n") ; + wxString s = wxT(" \n \n"); write(s); - delete m_outfile ; + delete m_outfile; } void wxSVGFileDCImpl::DoGetSizeMM( int *width, int *height ) const { if (width) *width = wxRound( (double)m_width / m_mm_to_pix_x ); - + if (height) *height = wxRound( (double)m_height / m_mm_to_pix_y ); } - + wxSize wxSVGFileDCImpl::GetPPI() const { return wxSize( wxRound(m_dpi), wxRound(m_dpi) ); @@ -158,62 +197,55 @@ wxSize wxSVGFileDCImpl::GetPPI() const void wxSVGFileDCImpl::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) { - if (m_graphics_changed) NewGraphics (); - wxString s ; + NewGraphicsIfNeeded(); + wxString s; s.Printf ( wxT(" \n"), x1,y1,x2,y2 ); if (m_OK) { write(s); } - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DrawLine Call executed")) ; - CalcBoundingBox(x1, y1) ; - CalcBoundingBox(x2, y2) ; - return; + CalcBoundingBox(x1, y1); + CalcBoundingBox(x2, y2); } -void wxSVGFileDCImpl::DoDrawLines(int n, wxPoint points[], wxCoord xoffset , wxCoord yoffset ) +void wxSVGFileDCImpl::DoDrawLines(int n, const wxPoint points[], wxCoord xoffset , wxCoord yoffset ) { - for ( int i = 1; i < n ; i++ ) + for ( int i = 1; i < n; i++ ) { DoDrawLine ( points [i-1].x + xoffset, points [i-1].y + yoffset, - points [ i ].x + xoffset, points [ i ].y + yoffset ) ; + points [ i ].x + xoffset, points [ i ].y + yoffset ); } } - void wxSVGFileDCImpl::DoDrawPoint (wxCoord x1, wxCoord y1) { wxString s; - if (m_graphics_changed) NewGraphics (); - s = wxT(" ") + newline ; + NewGraphicsIfNeeded(); + s = wxT(" \n"); write(s); DoDrawLine ( x1,y1,x1,y1 ); s = wxT(""); write(s); } - void wxSVGFileDCImpl::DoDrawCheckMark(wxCoord x1, wxCoord y1, wxCoord width, wxCoord height) { - wxDCImpl::DoDrawCheckMark (x1,y1,width,height) ; + wxDCImpl::DoDrawCheckMark (x1,y1,width,height); } - void wxSVGFileDCImpl::DoDrawText(const wxString& text, wxCoord x1, wxCoord y1) { DoDrawRotatedText(text, x1,y1,0.0); - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DrawText Call executed")) ; } - void wxSVGFileDCImpl::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoord y, double angle) { //known bug; if the font is drawn in a scaled DC, it will not behave exactly as wxMSW - if (m_graphics_changed) NewGraphics (); + NewGraphicsIfNeeded(); wxString s, sTmp; // calculate bounding box - wxCoord w, h, desc ; + wxCoord w, h, desc; DoGetTextExtent(sText, &w, &h, &desc); double rad = DegToRad(angle); @@ -223,122 +255,114 @@ void wxSVGFileDCImpl::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoor 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((wxCoord)(x + h*sin(rad)), (wxCoord)(y + h*cos(rad))); + CalcBoundingBox((wxCoord)(x + h*sin(rad) + w*cos(rad)), (wxCoord)(y + h*cos(rad) - w*sin(rad))); if (m_backgroundMode == wxBRUSHSTYLE_SOLID) { // draw background first // just like DoDrawRectangle except we pass the text color to it and set the border to a 1 pixel wide text background - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::Draw Rotated Text Call plotting text background")) ; - sTmp.Printf ( wxT(" "), -angle, x,y ) ; - s = s + sTmp + newline ; + sTmp.Printf ( wxT(" "), NumStr(-angle), x,y ); + s += sTmp + wxT("\n"); write(s); } + + // convert x,y to SVG text x,y (the coordinates of the text baseline) + x = (wxCoord)(x + (h-desc)*sin(rad)); + y = (wxCoord)(y + (h-desc)*cos(rad)); + //now do the text itself s.Printf (wxT(" 0) s = s + wxT("style=\"font-family:") + sTmp + wxT("; "); - else s = s + wxT("style=\" ") ; + sTmp = m_font.GetFaceName(); + if (sTmp.Len() > 0) s += wxT("style=\"font-family:") + sTmp + wxT("; "); + else s += wxT("style=\" "); wxString fontweights [3] = { wxT("normal"), wxT("lighter"), wxT("bold") }; - s = s + wxT("font-weight:") + fontweights[m_font.GetWeight() - wxNORMAL] + semicolon + space; + s += wxT("font-weight:") + fontweights[m_font.GetWeight() - wxNORMAL] + wxT("; "); 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("; ") ; - sTmp.Printf ( wxT("stroke-width:0;\" transform=\"rotate( %.2g %d %d ) \" >"), -angle, x,y ) ; - s = s + sTmp + sText + wxT(" ") + newline ; + s += wxT("font-style:") + fontstyles[m_font.GetStyle() - wxNORMAL] + wxT("; "); + + sTmp.Printf (wxT("font-size:%dpt; "), m_font.GetPointSize() ); + s += sTmp; + //text will be solid, unless alpha value isn't opaque in the foreground colour + s += wxBrushString(m_textForegroundColour) + wxPenString(m_textForegroundColour); + sTmp.Printf ( wxT("stroke-width:0;\" transform=\"rotate( %s %d %d ) \" >"), NumStr(-angle), x,y ); + s += sTmp + sText + wxT(" ") + wxT("\n"); if (m_OK) { write(s); } - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DrawRotatedText Call executed")) ; - } - void wxSVGFileDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { - DoDrawRoundedRectangle(x, y, width, height, 0) ; + DoDrawRoundedRectangle(x, y, width, height, 0); } - void wxSVGFileDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius ) { - if (m_graphics_changed) NewGraphics (); - wxString s ; + NewGraphicsIfNeeded(); + wxString s; - s.Printf ( wxT(" ") + newline ; + s += wxT(" /> \n"); write(s); - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DoDrawRoundedRectangle Call executed")) ; - CalcBoundingBox(x, y) ; - CalcBoundingBox(x + width, y + height) ; - + CalcBoundingBox(x, y); + CalcBoundingBox(x + width, y + height); } - -void wxSVGFileDCImpl::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset,int fillStyle) +void wxSVGFileDCImpl::DoDrawPolygon(int n, const wxPoint points[], + wxCoord xoffset, wxCoord yoffset, + wxPolygonFillMode fillStyle) { - if (m_graphics_changed) NewGraphics (); - wxString s, sTmp ; - s = wxT(" ") ; - s = s + newline ; + s += wxT("\" /> \n"); write(s); - - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DoDrawPolygon Call executed")) ; } - void wxSVGFileDCImpl::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxCoord height) { - if (m_graphics_changed) NewGraphics (); + NewGraphicsIfNeeded(); - int rh = height /2 ; - int rw = width /2 ; + int rh = height /2; + int rw = width /2; wxString s; s.Printf ( wxT(" ") + newline ; + s += wxT(" /> \n"); write(s); - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DoDrawEllipse Call executed")) ; - CalcBoundingBox(x, y) ; - CalcBoundingBox(x + width, y + height) ; + CalcBoundingBox(x, y); + CalcBoundingBox(x + width, y + height); } - void wxSVGFileDCImpl::DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc) { /* Draws an arc of a circle, centred on (xc, yc), with starting point @@ -350,17 +374,17 @@ void wxSVGFileDCImpl::DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, Might be better described as Pie drawing */ - if (m_graphics_changed) NewGraphics (); - wxString s ; + NewGraphicsIfNeeded(); + wxString s; // we need the radius of the circle which has two estimates double r1 = sqrt ( double( (x1-xc)*(x1-xc) ) + double( (y1-yc)*(y1-yc) ) ); double r2 = sqrt ( double( (x2-xc)*(x2-xc) ) + double( (y2-yc)*(y2-yc) ) ); - wxASSERT_MSG( (fabs ( r2-r1 ) <= 3), wxT("wxSVGFileDC::DoDrawArc Error in getting radii of circle")) ; + wxASSERT_MSG( (fabs ( r2-r1 ) <= 3), wxT("wxSVGFileDC::DoDrawArc Error in getting radii of circle")); if ( fabs ( r2-r1 ) > 3 ) //pixels { - s = wxT(" \n") ; + s = wxT(" \n"); write(s); } @@ -368,29 +392,26 @@ void wxSVGFileDCImpl::DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, 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 ; + 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) > M_PI ) fArc = 1; else fArc = 0 ; + int fArc; // flag for large or small arc 0 means less than 180 degrees + 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 - s.Printf ( wxT(" ") + newline ; + s += wxT(" \" /> \n"); if (m_OK) { write(s); } - - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DoDrawArc Call executed")) ; } - void wxSVGFileDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) { /* @@ -412,107 +433,147 @@ void wxSVGFileDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h, //known bug: SVG draws with the current pen along the radii, but this does not happen in wxMSW - if (m_graphics_changed) NewGraphics (); + NewGraphicsIfNeeded(); - wxString s ; + wxString s; //radius - double rx = w / 2 ; - double ry = h / 2 ; + double rx = w / 2; + double ry = h / 2; // center - double xc = x + rx ; - double yc = y + ry ; + double xc = x + rx; + double yc = y + ry; - double xs, ys, xe, ye ; - xs = xc + rx * cos (DegToRad(sa)) ; - xe = xc + rx * cos (DegToRad(ea)) ; - ys = yc - ry * sin (DegToRad(sa)) ; - ye = yc - ry * sin (DegToRad(ea)) ; + double xs, ys, xe, ye; + xs = xc + rx * cos (DegToRad(sa)); + xe = xc + rx * cos (DegToRad(ea)); + ys = yc - ry * sin (DegToRad(sa)); + ye = yc - ry * sin (DegToRad(ea)); ///now same as circle arc... double theta1 = atan2(ys-yc, xs-xc); double theta2 = atan2(ye-yc, xe-xc); - int fArc ; // flag for large or small arc 0 means less than 180 degrees - if ( (theta2 - theta1) > 0 ) fArc = 1; else fArc = 0 ; + int fArc; // flag for large or small arc 0 means less than 180 degrees + if ( (theta2 - theta1) > 0 ) fArc = 1; else fArc = 0; - int fSweep ; - if ( fabs(theta2 - theta1) > M_PI) fSweep = 1; else fSweep = 0 ; + int fSweep; + if ( fabs(theta2 - theta1) > M_PI) fSweep = 1; else fSweep = 0; s.Printf ( wxT(" ") + newline ; + s += wxT(" \" /> \n"); if (m_OK) { write(s); } +} - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DoDrawEllipticArc Call executed")) ; +void wxSVGFileDCImpl::DoSetClippingRegion( int x, int y, int width, int height ) +{ + wxString svg; + + // End current graphics group to ensure proper xml nesting (e.g. so that + // graphics can be subsequently changed inside the clipping region) + svg << "\n" + "\n" + "\n" + "\n" + "\n" + "\n" + "\n"; + + write(svg); + + // Re-apply current graphics to ensure proper xml nesting + DoStartNewGraphics(); + + m_clipUniqueId++; + m_clipNestingLevel++; } +void wxSVGFileDCImpl::DestroyClippingRegion() +{ + wxString svg; + + // End current graphics element to ensure proper xml nesting (e.g. graphics + // might have been changed inside the clipping region) + svg << "\n"; + + // Close clipping group elements + for ( size_t i = 0; i < m_clipUniqueId; i++ ) + { + svg << ""; + } + svg << "\n"; + + write(svg); + + // Re-apply current graphics (e.g. brush may have been changed inside one + // of the clipped regions - that change will have been lost after xml + // elements for the clipped region have been closed). + DoStartNewGraphics(); + + m_clipUniqueId = 0; +} void wxSVGFileDCImpl::DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *descent , wxCoord *externalLeading , const wxFont *font) const { - wxScreenDC sDC ; + wxScreenDC sDC; sDC.SetFont (m_font); if ( font != NULL ) sDC.SetFont ( *font ); sDC.GetTextExtent(string, w, h, descent, externalLeading ); - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::GetTextExtent Call executed")) ; } - wxCoord wxSVGFileDCImpl::GetCharHeight() const - { - wxScreenDC sDC ; + wxScreenDC sDC; sDC.SetFont (m_font); - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::GetCharHeight Call executing")) ; - return ( sDC.GetCharHeight() ); + return sDC.GetCharHeight(); } - wxCoord wxSVGFileDCImpl::GetCharWidth() const { - wxScreenDC sDC ; + wxScreenDC sDC; sDC.SetFont (m_font); - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::GetCharWidth Call executing")) ; - return ( sDC.GetCharWidth() ) ; - + return sDC.GetCharWidth(); } -/// Set Functions ///////////////////////////////////////////////////////////////// +// ---------------------------------------------------------- +// wxSVGFileDCImpl - set functions +// ---------------------------------------------------------- + void wxSVGFileDCImpl::SetBackground( const wxBrush &brush ) { - m_backgroundBrush = brush; - return; } void wxSVGFileDCImpl::SetBackgroundMode( int mode ) { m_backgroundMode = mode; - return; } void wxSVGFileDCImpl::SetBrush(const wxBrush& brush) - { - m_brush = brush ; + m_brush = brush; - m_graphics_changed = TRUE ; - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::SetBrush Call executed")) ; + m_graphics_changed = true; } @@ -520,123 +581,110 @@ void wxSVGFileDCImpl::SetPen(const wxPen& pen) { // width, color, ends, joins : currently implemented // dashes, stipple : not implemented - m_pen = pen ; + m_pen = pen; - m_graphics_changed = TRUE ; - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::SetPen Call executed")) ; + m_graphics_changed = true; } -void wxSVGFileDCImpl::NewGraphics () +void wxSVGFileDCImpl::NewGraphicsIfNeeded() { + if ( !m_graphics_changed ) + return; + + m_graphics_changed = false; + + write(wxS("\n")); - int w = m_pen.GetWidth (); - wxColour c = m_pen.GetColour () ; + DoStartNewGraphics(); +} - wxString s, sBrush, sPenCap, sPenJoin, sPenStyle, sLast, sWarn; +void wxSVGFileDCImpl::DoStartNewGraphics() +{ + wxString s, sBrush, sPenCap, sPenJoin, sPenStyle, sLast; - sBrush = wxT("\n \n") ; + sPenJoin = wxT("stroke-linejoin:round; "); } - sLast.Printf( wxT("stroke-width:%d\" \n transform=\"translate(%.2g %.2g) scale(%.2g %.2g)\">"), - w, (double)m_logicalOriginX, m_logicalOriginY, m_scaleX, m_scaleY ); + sLast.Printf( wxT("stroke-width:%d\" \n transform=\"translate(%s %s) scale(%s %s)\">"), + m_pen.GetWidth(), NumStr(m_logicalOriginX), NumStr(m_logicalOriginY), NumStr(m_scaleX), NumStr(m_scaleY) ); - s = sBrush + sPenCap + sPenJoin + sPenStyle + sLast + newline + sWarn; + s = sBrush + sPenCap + sPenJoin + sPenStyle + sLast + wxT("\n"); write(s); - m_graphics_changed = FALSE ; - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::NewGraphics Call executed")) ; } void wxSVGFileDCImpl::SetFont(const wxFont& font) { - m_font = font ; - - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::SetFont Call executed")) ; + m_font = font; } - // export a bitmap as a raster image in png bool wxSVGFileDCImpl::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, + wxRasterOperationMode 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")) ; - return FALSE ; + wxASSERT_MSG(false, wxT("wxSVGFileDC::DoBlit Call requested nonCopy mode; this is not possible")); + return false; } - if (useMask != FALSE) + if (useMask != false) { - wxASSERT_MSG(FALSE, wxT("wxSVGFileDC::DoBlit Call requested False mask ; this is not possible")) ; - return FALSE ; + wxASSERT_MSG(false, wxT("wxSVGFileDC::DoBlit Call requested false mask; this is not possible")); + return false; } - wxBitmap myBitmap (width, height) ; + wxBitmap myBitmap (width, height); wxMemoryDC memDC; memDC.SelectObject( myBitmap ); memDC.Blit(0, 0, width, height, source, xsrc, ysrc); memDC.SelectObject( wxNullBitmap ); DoDrawBitmap(myBitmap, xdest, ydest); - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DoBlit Call executed")) ; - return FALSE ; + return false; } void wxSVGFileDCImpl::DoDrawIcon(const class wxIcon & myIcon, wxCoord x, wxCoord y) { - wxBitmap myBitmap (myIcon.GetWidth(), myIcon.GetHeight() ) ; + wxBitmap myBitmap (myIcon.GetWidth(), myIcon.GetHeight() ); wxMemoryDC memDC; memDC.SelectObject( myBitmap ); memDC.DrawIcon(myIcon,0,0); memDC.SelectObject( wxNullBitmap ); DoDrawBitmap(myBitmap, x, y); - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DoDrawIcon Call executed")) ; - return ; } void wxSVGFileDCImpl::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y , bool WXUNUSED(bTransparent) /*=0*/ ) { - if (m_graphics_changed) NewGraphics (); + NewGraphicsIfNeeded(); - wxString sTmp, s, sPNG ; + wxString sTmp, s, sPNG; if ( wxImage::FindHandler(wxBITMAP_TYPE_PNG) == NULL ) wxImage::AddHandler(new wxPNGHandler); @@ -645,39 +693,40 @@ void wxSVGFileDCImpl::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoor sPNG = m_filename.BeforeLast(wxT('.')) + sTmp; while (wxFile::Exists(sPNG) ) { - m_sub_images ++ ; + m_sub_images ++; 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 ; + wxBitmap myBitmap = bmp; //save it bool bPNG_OK = myBitmap.SaveFile(sPNG,wxBITMAP_TYPE_PNG); -// refrence the bitmap from the SVG doc +// reference the bitmap from the SVG doc +// only use filename & ext + sPNG = sPNG.AfterLast(wxFileName::GetPathSeparator()); + +// reference the bitmap from the SVG doc int w = myBitmap.GetWidth(); int h = myBitmap.GetHeight(); sTmp.Printf ( wxT(" \n"), sPNG.c_str() ); - s = s + sTmp + wxT("Image from wxSVG ") + newline; + s += sTmp + wxT("Image from wxSVG ") + wxT("\n"); if (m_OK && bPNG_OK) { write(s); } - m_OK = m_outfile->Ok () && bPNG_OK; - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DoDrawBitmap Call executed")) ; - - return ; + m_OK = m_outfile->IsOk() && bPNG_OK; } void wxSVGFileDCImpl::write(const wxString &s) { const wxCharBuffer buf = s.utf8_str(); m_outfile->Write(buf, strlen((const char *)buf)); - m_OK = m_outfile->Ok(); + m_OK = m_outfile->IsOk(); }