X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1a55595e69e5c5a3847fef936d7d7caa3df800de..69659fd770f615210efac4b4fa741b3ad6223616:/src/common/dcsvg.cpp diff --git a/src/common/dcsvg.cpp b/src/common/dcsvg.cpp index ed303084a4..9a94179c2d 100644 --- a/src/common/dcsvg.cpp +++ b/src/common/dcsvg.cpp @@ -15,28 +15,27 @@ #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/svg/dcsvg.h" -#include -#include "wx/image.h" +#include "wx/dcsvg.h" +#include "wx/wfstream.h" #define wxSVG_DEBUG FALSE // or TRUE to see the calls being executed -#define newline wxString(wxT("\n")) -#define space wxString(wxT(" ")) -#define semicolon wxString(wxT(";")) -#define wx_round(a) (int)((a)+.5) -#ifdef __BORLANDC__ -#pragma warn -rch -#pragma warn -ccc -#endif +#define newline wxString(wxT("\n")) +#define space wxString(wxT(" ")) +#define semicolon wxString(wxT(";")) +#define wx_round(a) (int)((a)+.5) -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 ) { @@ -71,34 +70,23 @@ wxString wxBrushString ( wxColour c, int style ) return s ; } +// ---------------------------------------------------------- +// wxSVGFileDC +// ---------------------------------------------------------- + +IMPLEMENT_ABSTRACT_CLASS(wxSVGFileDC, wxDC) void wxSVGFileDC::Init (wxString f, int Width, int Height, float dpi) { - //set up things first wxDCBase does all this? m_width = Width ; m_height = Height ; - m_clipping = FALSE; 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; @@ -120,47 +108,45 @@ 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); -}; +} wxSVGFileDC::wxSVGFileDC (wxString f, int Width, int Height) { Init (f,Width,Height,72.0); -}; +} wxSVGFileDC::wxSVGFileDC (wxString f, int Width, int Height, float dpi) { Init (f,Width,Height,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,14 +160,13 @@ 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) ; return; -}; +} void wxSVGFileDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset , wxCoord yoffset ) { @@ -198,11 +183,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 +217,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 +236,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 +258,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 +277,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 +310,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 +328,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 +358,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 +381,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 +434,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")) ; } -void wxSVGFileDC::DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *descent , wxCoord *externalLeading , wxFont *font) const +void wxSVGFileDC::DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *descent , wxCoord *externalLeading , const wxFont *font) const { wxScreenDC sDC ; @@ -540,7 +518,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 +530,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)\">"), - 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, m_logicalOriginY, 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,119 +586,17 @@ void wxSVGFileDC::SetFont(const wxFont& font) { m_font = font ; - - wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::SetFont Call executed")) ; -} - - -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(); + wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::SetFont Call executed")) ; } // 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")) ; @@ -742,7 +617,6 @@ bool wxSVGFileDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord he return FALSE ; } - void wxSVGFileDC::DoDrawIcon(const class wxIcon & myIcon, wxCoord x, wxCoord y) { wxBitmap myBitmap (myIcon.GetWidth(), myIcon.GetHeight() ) ; @@ -755,16 +629,14 @@ 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*/ ) { 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 +645,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 +658,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")) ; @@ -797,60 +669,53 @@ void wxSVGFileDC::DoDrawBitmap(const class wxBitmap & bmp, wxCoord x, wxCoord y return ; } +void wxSVGFileDC::write(const wxString &s) +{ + const wxCharBuffer buf = s.utf8_str(); + m_outfile->Write(buf, strlen((const char *)buf)); + m_OK = m_outfile->Ok(); +} // --------------------------------------------------------------------------- // coordinates transformations // --------------------------------------------------------------------------- -wxCoord wxSVGFileDC::DeviceToLogicalX(wxCoord x) const -{ - return XDEV2LOG(x); -} - - -wxCoord wxSVGFileDC::DeviceToLogicalY(wxCoord y) const +void wxSVGFileDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp ) { - return YDEV2LOG(y); + wxDCBase::SetAxisOrientation( xLeftRight, yBottomUp ); } - -wxCoord wxSVGFileDC::DeviceToLogicalXRel(wxCoord x) const +void wxSVGFileDC::SetMapMode(int mode) { - return XDEV2LOGREL(x); + wxDCBase::SetMapMode(mode); } - -wxCoord wxSVGFileDC::DeviceToLogicalYRel(wxCoord y) const +void wxSVGFileDC::SetUserScale(double x, double y) { - return YDEV2LOGREL(y); + wxDCBase::SetUserScale(x,y); } - -wxCoord wxSVGFileDC::LogicalToDeviceX(wxCoord x) const +void wxSVGFileDC::SetLogicalScale(double x, double y) { - return XLOG2DEV(x); + wxDCBase::SetLogicalScale(x,y); } - -wxCoord wxSVGFileDC::LogicalToDeviceY(wxCoord y) const +void wxSVGFileDC::SetLogicalOrigin(wxCoord x, wxCoord y) { - return YLOG2DEV(y); + wxDCBase::SetLogicalOrigin(x,y); } - -wxCoord wxSVGFileDC::LogicalToDeviceXRel(wxCoord x) const +void wxSVGFileDC::SetDeviceOrigin(wxCoord x, wxCoord y) { - return XLOG2DEVREL(x); + wxDCBase::SetDeviceOrigin(x,y); } -wxCoord wxSVGFileDC::LogicalToDeviceYRel(wxCoord y) const -{ - return YLOG2DEVREL(y); -} - #ifdef __BORLANDC__ #pragma warn .rch #pragma warn .ccc #endif + +#endif // wxUSE_SVG +