X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/54429bb380a74d200ec735ac360599914b016266..69659fd770f615210efac4b4fa741b3ad6223616:/src/common/dcsvg.cpp?ds=sidebyside diff --git a/src/common/dcsvg.cpp b/src/common/dcsvg.cpp index f0be9f504f..9a94179c2d 100644 --- a/src/common/dcsvg.cpp +++ b/src/common/dcsvg.cpp @@ -15,27 +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/dcsvg.h" - -#include "wx/image.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 * M_PI) / 180.0; } ; +static inline double DegToRad(double deg) { return (deg * M_PI) / 180.0; } wxString wxColStr ( wxColour c ) { @@ -70,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; @@ -142,17 +131,17 @@ 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() { @@ -177,7 +166,7 @@ void wxSVGFileDC::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) CalcBoundingBox(x1, y1) ; CalcBoundingBox(x2, y2) ; return; -}; +} void wxSVGFileDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset , wxCoord yoffset ) { @@ -463,7 +452,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 wxSVGFileDC::DoGetTextExtent(const wxString& string, wxCoord *w, wxCoord *h, wxCoord *descent , wxCoord *externalLeading , const wxFont *font) const { wxScreenDC sDC ; @@ -583,8 +572,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, m_logicalOriginY, m_scaleX, m_scaleY ); s = sBrush + sPenCap + sPenJoin + sPenStyle + sLast + newline + sWarn; write(s); @@ -602,107 +591,6 @@ 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, wxDC* source, wxCoord xsrc, wxCoord ysrc, @@ -729,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() ) ; @@ -742,8 +629,6 @@ 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 (); @@ -784,66 +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); -} - -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 #pragma warn .ccc #endif + +#endif // wxUSE_SVG +