X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1bb592b878bb9d4be76dfa2c9e5324d1b536dc5b..6362d82b3ed82aa6795e4ad03160820f94c9e4d4:/src/common/dcsvg.cpp diff --git a/src/common/dcsvg.cpp b/src/common/dcsvg.cpp index 0fc94d97de..daafe55ff6 100644 --- a/src/common/dcsvg.cpp +++ b/src/common/dcsvg.cpp @@ -15,12 +15,18 @@ #pragma hdrstop #endif +#if wxUSE_SVG + #ifndef WX_PRECOMP -#include "wx/wx.h" + #include "wx/dcmemory.h" + #include "wx/dcscreen.h" + #include "wx/icon.h" + #include "wx/image.h" #endif #include "wx/dcsvg.h" -#include "wx/image.h" +#include "wx/wfstream.h" +#include "wx/filename.h" #define wxSVG_DEBUG FALSE // or TRUE to see the calls being executed @@ -50,10 +56,10 @@ wxString wxBrushString ( wxColour c, int style ) wxString s = wxT("fill:#") + wxColStr (c) + semicolon + space ; switch ( style ) { - case wxSOLID : + case wxBRUSHSTYLE_SOLID : s = s + wxT("fill-opacity:1.0; "); break ; - case wxTRANSPARENT: + case wxBRUSHSTYLE_TRANSPARENT: s = s + wxT("fill-opacity:0.0; "); break ; @@ -65,34 +71,31 @@ wxString wxBrushString ( wxColour c, int style ) return s ; } +// ---------------------------------------------------------- +// wxSVGFileDC +// ---------------------------------------------------------- + +IMPLEMENT_ABSTRACT_CLASS(wxSVGFileDCImpl, wxDC) -void wxSVGFileDC::Init (wxString f, int Width, int Height, float dpi) +wxSVGFileDCImpl::wxSVGFileDCImpl( wxSVGFileDC *owner, const wxString &filename, + int width, int height, double dpi ) : + wxDCImpl( owner ) + { + Init( filename, width, height, dpi ); + } +void wxSVGFileDCImpl::Init (const wxString &filename, int Width, int Height, double dpi) { - //set up things first wxDCBase does all this? m_width = Width ; m_height = Height ; - m_clipping = FALSE; + m_dpi = dpi; + m_OK = TRUE; m_mm_to_pix_x = dpi/25.4; m_mm_to_pix_y = dpi/25.4; - m_signX = m_signY = 1; - - m_userScaleX = m_userScaleY = - m_deviceOriginX = m_deviceOriginY = 0; - - m_OriginX = m_OriginY = 0; - m_logicalOriginX = m_logicalOriginY = 0; - m_logicalScaleX = m_logicalScaleY = 0 ; - m_scaleX = m_scaleY = 1.0 ; - - m_logicalFunction = wxCOPY; - m_backgroundMode = wxTRANSPARENT; - m_mappingMode = wxMM_TEXT; - m_backgroundBrush = *wxTRANSPARENT_BRUSH; m_textForegroundColour = *wxBLACK; m_textBackgroundColour = *wxWHITE; @@ -106,22 +109,24 @@ void wxSVGFileDC::Init (wxString f, int Width, int Height, float dpi) ////////////////////code here - m_outfile = new wxFileOutputStream(f) ; + m_outfile = new wxFileOutputStream(filename) ; m_OK = m_outfile->Ok (); if (m_OK) { - m_filename = f ; + m_filename = filename ; m_sub_images = 0 ; wxString s ; s = wxT("") ; s = s + newline ; write(s); s = wxT(" ")+ newline ; - write(s); - s.Printf ( wxT(" \n"), float(Width)/dpi*2.54, float(Height)/dpi*2.54, Width, Height ); + s = wxT("\"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd\"> ") + newline ; write(s); - s = wxT("SVG Picture created as ") + wxFileNameFromPath(f) + wxT(" ") + newline ; + s = wxT(" \n"), float(Width)/dpi*2.54, float(Height)/dpi*2.54, Width, Height ); + write(s); + s = wxT("SVG Picture created as ") + wxFileNameFromPath(filename) + wxT(" ") + newline ; write(s); s = wxString (wxT("Picture generated by wxSVG ")) + wxSVGVersion + wxT(" ")+ newline ; write(s); @@ -132,34 +137,29 @@ void wxSVGFileDC::Init (wxString f, int Width, int Height, float dpi) } -// constructors -wxSVGFileDC::wxSVGFileDC (wxString f) -{ - // quarter 640x480 screen display at 72 dpi - Init (f,320,240,72.0); -} -wxSVGFileDC::wxSVGFileDC (wxString f, int Width, int Height) +wxSVGFileDCImpl::~wxSVGFileDCImpl() { - Init (f,Width,Height,72.0); + wxString s = wxT(" \n \n") ; + write(s); + delete m_outfile ; } -wxSVGFileDC::wxSVGFileDC (wxString f, int Width, int Height, float dpi) +void wxSVGFileDCImpl::DoGetSizeMM( int *width, int *height ) const { - Init (f,Width,Height,dpi); + if (width) + *width = wxRound( (double)m_width / m_mm_to_pix_x ); + + if (height) + *height = wxRound( (double)m_height / m_mm_to_pix_y ); } - -wxSVGFileDC::~wxSVGFileDC() + +wxSize wxSVGFileDCImpl::GetPPI() const { - wxString s = wxT(" \n \n") ; - write(s); - delete m_outfile ; + return wxSize( wxRound(m_dpi), wxRound(m_dpi) ); } - -////////////////////////////////////////////////////////////////////////////////////////// - -void wxSVGFileDC::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) +void wxSVGFileDCImpl::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) { if (m_graphics_changed) NewGraphics (); wxString s ; @@ -174,7 +174,7 @@ void wxSVGFileDC::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) return; } -void wxSVGFileDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset , wxCoord yoffset ) +void wxSVGFileDCImpl::DoDrawLines(int n, wxPoint points[], wxCoord xoffset , wxCoord yoffset ) { for ( int i = 1; i < n ; i++ ) { @@ -184,32 +184,32 @@ void wxSVGFileDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset , wxCoord } -void wxSVGFileDC::DoDrawPoint (wxCoord x1, wxCoord y1) +void wxSVGFileDCImpl::DoDrawPoint (wxCoord x1, wxCoord y1) { wxString s; if (m_graphics_changed) NewGraphics (); s = wxT(" ") + newline ; write(s); - DrawLine ( x1,y1,x1,y1 ); + DoDrawLine ( x1,y1,x1,y1 ); s = wxT(""); write(s); } -void wxSVGFileDC::DoDrawCheckMark(wxCoord x1, wxCoord y1, wxCoord width, wxCoord height) +void wxSVGFileDCImpl::DoDrawCheckMark(wxCoord x1, wxCoord y1, wxCoord width, wxCoord height) { - wxDCBase::DoDrawCheckMark (x1,y1,width,height) ; + wxDCImpl::DoDrawCheckMark (x1,y1,width,height) ; } -void wxSVGFileDC::DoDrawText(const wxString& text, wxCoord x1, wxCoord y1) +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 wxSVGFileDC::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoord y, double angle) +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 (); @@ -231,7 +231,7 @@ void wxSVGFileDC::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoord y, CalcBoundingBox(x, y); CalcBoundingBox((wxCoord)(x + h*sin(rad)), (wxCoord)(y + h*cos(rad))); - if (m_backgroundMode == wxSOLID) + 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 @@ -271,13 +271,13 @@ void wxSVGFileDC::DoDrawRotatedText(const wxString& sText, wxCoord x, wxCoord y, } -void wxSVGFileDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) +void wxSVGFileDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { DoDrawRoundedRectangle(x, y, width, height, 0) ; } -void wxSVGFileDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius ) +void wxSVGFileDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius ) { if (m_graphics_changed) NewGraphics (); @@ -296,7 +296,7 @@ void wxSVGFileDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wx } -void wxSVGFileDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset,int fillStyle) +void wxSVGFileDCImpl::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset,int fillStyle) { if (m_graphics_changed) NewGraphics (); wxString s, sTmp ; @@ -322,7 +322,7 @@ void wxSVGFileDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoor } -void wxSVGFileDC::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxCoord height) +void wxSVGFileDCImpl::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxCoord height) { if (m_graphics_changed) NewGraphics (); @@ -342,7 +342,7 @@ void wxSVGFileDC::DoDrawEllipse (wxCoord x, wxCoord y, wxCoord width, wxCoord he } -void wxSVGFileDC::DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc) +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 (x1, y1) and ending at (x2, y2). The current pen is used for the outline @@ -394,7 +394,7 @@ void wxSVGFileDC::DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCo } -void wxSVGFileDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) +void wxSVGFileDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) { /* Draws an arc of an ellipse. The current pen is used for drawing the arc @@ -458,7 +458,7 @@ void wxSVGFileDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,doub } -void wxSVGFileDC::DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *descent , wxCoord *externalLeading , wxFont *font) const +void wxSVGFileDCImpl::DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *descent , wxCoord *externalLeading , const wxFont *font) const { wxScreenDC sDC ; @@ -470,7 +470,7 @@ void wxSVGFileDC::DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h } -wxCoord wxSVGFileDC::GetCharHeight() const +wxCoord wxSVGFileDCImpl::GetCharHeight() const { wxScreenDC sDC ; @@ -482,7 +482,7 @@ wxCoord wxSVGFileDC::GetCharHeight() const } -wxCoord wxSVGFileDC::GetCharWidth() const +wxCoord wxSVGFileDCImpl::GetCharWidth() const { wxScreenDC sDC ; sDC.SetFont (m_font); @@ -494,7 +494,7 @@ wxCoord wxSVGFileDC::GetCharWidth() const /// Set Functions ///////////////////////////////////////////////////////////////// -void wxSVGFileDC::SetBackground( const wxBrush &brush ) +void wxSVGFileDCImpl::SetBackground( const wxBrush &brush ) { m_backgroundBrush = brush; @@ -502,14 +502,14 @@ void wxSVGFileDC::SetBackground( const wxBrush &brush ) } -void wxSVGFileDC::SetBackgroundMode( int mode ) +void wxSVGFileDCImpl::SetBackgroundMode( int mode ) { m_backgroundMode = mode; return; } -void wxSVGFileDC::SetBrush(const wxBrush& brush) +void wxSVGFileDCImpl::SetBrush(const wxBrush& brush) { m_brush = brush ; @@ -519,7 +519,7 @@ void wxSVGFileDC::SetBrush(const wxBrush& brush) } -void wxSVGFileDC::SetPen(const wxPen& pen) +void wxSVGFileDCImpl::SetPen(const wxPen& pen) { // width, color, ends, joins : currently implemented // dashes, stipple : not implemented @@ -529,7 +529,7 @@ void wxSVGFileDC::SetPen(const wxPen& pen) wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::SetPen Call executed")) ; } -void wxSVGFileDC::NewGraphics () +void wxSVGFileDCImpl::NewGraphics () { int w = m_pen.GetWidth (); @@ -567,10 +567,10 @@ void wxSVGFileDC::NewGraphics () switch ( m_pen.GetStyle () ) { - case wxSOLID : + case wxPENSTYLE_SOLID : sPenStyle = wxT("stroke-opacity:1.0; stroke-opacity:1.0; ") ; break ; - case wxTRANSPARENT : + case wxPENSTYLE_TRANSPARENT : sPenStyle = wxT("stroke-opacity:0.0; stroke-opacity:0.0; ") ; break ; default : @@ -578,8 +578,8 @@ void wxSVGFileDC::NewGraphics () sWarn = sWarn + wxT(" \n") ; } - sLast.Printf ( wxT("stroke-width:%d\" \n transform=\"translate(%.2g %.2g) scale(%.2g %.2g)\">"), - w, m_OriginX, m_OriginY, m_scaleX, m_scaleY ); + sLast.Printf( wxT("stroke-width:%d\" \n transform=\"translate(%.2g %.2g) scale(%.2g %.2g)\">"), + w, double(m_logicalOriginX), double(m_logicalOriginY), m_scaleX, m_scaleY ); s = sBrush + sPenCap + sPenJoin + sPenStyle + sLast + newline + sWarn; write(s); @@ -588,7 +588,7 @@ void wxSVGFileDC::NewGraphics () } -void wxSVGFileDC::SetFont(const wxFont& font) +void wxSVGFileDCImpl::SetFont(const wxFont& font) { m_font = font ; @@ -597,109 +597,8 @@ void wxSVGFileDC::SetFont(const wxFont& font) } -void wxSVGFileDC::ComputeScaleAndOrigin() -{ - m_scaleX = m_logicalScaleX * m_userScaleX; - m_scaleY = m_logicalScaleY * m_userScaleY; - m_OriginX = m_logicalOriginX * m_logicalScaleX + m_deviceOriginX ; - m_OriginY = m_logicalOriginY * m_logicalScaleY + m_deviceOriginY ; - m_graphics_changed = TRUE; -} - - -int wxSVGFileDC::GetMapMode() -{ - return m_mappingMode ; -} - - -void wxSVGFileDC::SetMapMode( int mode ) -{ - switch (mode) - { - case wxMM_TWIPS: - SetLogicalScale( twips2mm*m_mm_to_pix_x, twips2mm*m_mm_to_pix_y ); - break; - case wxMM_POINTS: - SetLogicalScale( pt2mm*m_mm_to_pix_x, pt2mm*m_mm_to_pix_y ); - break; - case wxMM_METRIC: - SetLogicalScale( m_mm_to_pix_x, m_mm_to_pix_y ); - break; - case wxMM_LOMETRIC: - SetLogicalScale( m_mm_to_pix_x/10.0, m_mm_to_pix_y/10.0 ); - break; - default: - case wxMM_TEXT: - SetLogicalScale( 1.0, 1.0 ); - break; - } - m_mappingMode = mode; - - /* we don't do this mega optimisation - if (mode != wxMM_TEXT) - { - m_needComputeScaleX = TRUE; - m_needComputeScaleY = TRUE; - } - */ -} - - -void wxSVGFileDC::GetUserScale(double *x, double *y) const -{ - *x = m_userScaleX ; - *y = m_userScaleY ; -} - - -void wxSVGFileDC::SetUserScale( double x, double y ) -{ - // allow negative ? -> no - m_userScaleX = x; - m_userScaleY = y; - ComputeScaleAndOrigin(); -} - - -void wxSVGFileDC::SetLogicalScale( double x, double y ) -{ - // allow negative ? - m_logicalScaleX = x; - m_logicalScaleY = y; - ComputeScaleAndOrigin(); -} - - -void wxSVGFileDC::SetLogicalOrigin( wxCoord x, wxCoord y ) -{ - // is this still correct ? - m_logicalOriginX = x * m_signX; - m_logicalOriginY = y * m_signY; - ComputeScaleAndOrigin(); -} - - -void wxSVGFileDC::SetDeviceOrigin( wxCoord x, wxCoord y ) -{ - // only wxPostScripDC has m_signX = -1, - m_deviceOriginX = x; - m_deviceOriginY = y; - ComputeScaleAndOrigin(); -} - - -void wxSVGFileDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp ) -{ - // only wxPostScripDC has m_signX = -1, - m_signX = (xLeftRight ? 1 : -1); - m_signY = (yBottomUp ? -1 : 1); - ComputeScaleAndOrigin(); -} - - // export a bitmap as a raster image in png -bool wxSVGFileDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, +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*/) @@ -724,8 +623,7 @@ bool wxSVGFileDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord he return FALSE ; } - -void wxSVGFileDC::DoDrawIcon(const class wxIcon & myIcon, wxCoord x, wxCoord y) +void wxSVGFileDCImpl::DoDrawIcon(const class wxIcon & myIcon, wxCoord x, wxCoord y) { wxBitmap myBitmap (myIcon.GetWidth(), myIcon.GetHeight() ) ; wxMemoryDC memDC; @@ -737,14 +635,13 @@ void wxSVGFileDC::DoDrawIcon(const class wxIcon & myIcon, wxCoord x, wxCoord y) return ; } - - -void wxSVGFileDC::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y , bool WXUNUSED(bTransparent) /*=0*/ ) +void wxSVGFileDCImpl::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y , bool WXUNUSED(bTransparent) /*=0*/ ) { if (m_graphics_changed) NewGraphics (); wxString sTmp, s, sPNG ; - wxImage::AddHandler(new wxPNGHandler); + if ( wxImage::FindHandler(wxBITMAP_TYPE_PNG) == NULL ) + wxImage::AddHandler(new wxPNGHandler); // create suitable file name sTmp.Printf ( wxT("_image%d.png"), m_sub_images); @@ -761,6 +658,10 @@ void wxSVGFileDC::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y //save it bool bPNG_OK = myBitmap.SaveFile(sPNG,wxBITMAP_TYPE_PNG); +// reference the bitmap from the SVG doc +// only use filename & ext + sPNG = sPNG.AfterLast(wxFileName::GetPathSeparator()); + // refrence the bitmap from the SVG doc int w = myBitmap.GetWidth(); int h = myBitmap.GetHeight(); @@ -779,66 +680,18 @@ void wxSVGFileDC::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y return ; } - -// --------------------------------------------------------------------------- -// coordinates transformations -// --------------------------------------------------------------------------- - -wxCoord wxSVGFileDC::DeviceToLogicalX(wxCoord x) const -{ - return XDEV2LOG(x); -} - - -wxCoord wxSVGFileDC::DeviceToLogicalY(wxCoord y) const +void wxSVGFileDCImpl::write(const wxString &s) { - return YDEV2LOG(y); -} - - -wxCoord wxSVGFileDC::DeviceToLogicalXRel(wxCoord x) const -{ - return XDEV2LOGREL(x); -} - - -wxCoord wxSVGFileDC::DeviceToLogicalYRel(wxCoord y) const -{ - return YDEV2LOGREL(y); -} - - -wxCoord wxSVGFileDC::LogicalToDeviceX(wxCoord x) const -{ - return XLOG2DEV(x); -} - - -wxCoord wxSVGFileDC::LogicalToDeviceY(wxCoord y) const -{ - return YLOG2DEV(y); -} - - -wxCoord wxSVGFileDC::LogicalToDeviceXRel(wxCoord x) const -{ - return XLOG2DEVREL(x); -} - - -wxCoord wxSVGFileDC::LogicalToDeviceYRel(wxCoord y) const -{ - return YLOG2DEVREL(y); -} - -void wxSVGFileDC::write(const wxString &s) -{ - const wxWX2MBbuf buf = s.mb_str(wxConvUTF8); + const wxCharBuffer buf = s.utf8_str(); m_outfile->Write(buf, strlen((const char *)buf)); m_OK = m_outfile->Ok(); } + #ifdef __BORLANDC__ #pragma warn .rch #pragma warn .ccc #endif + +#endif // wxUSE_SVG +