#ifndef WX_PRECOMP
#include "wx/wx.h"
#endif
-
+
#include "wx/svg/dcsvg.h"
-#include <math.h>
#include "wx/image.h"
#define wxSVG_DEBUG FALSE
#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 )
{
m_sub_images = 0 ;
wxString s ;
s = wxT("<?xml version=\"1.0\" standalone=\"no\"?>") ; s = s + newline ;
- m_outfile->Write (s.c_str(), s.Len() ) ;
+ write(s);
s = wxT("<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 20010904//EN\" ") + newline ;
- m_outfile->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("<svg width=\"%.2gcm\" height=\"%.2gcm\" viewBox=\"0 0 %d %d \"> \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("<title>SVG Picture created as ") + wxFileNameFromPath(f) + wxT(" </title>") + newline ;
- m_outfile->Write (s.c_str(), s.Len() ) ;
+ write(s);
s = wxString (wxT("<desc>Picture generated by wxSVG ")) + wxSVGVersion + wxT(" </desc>")+ newline ;
- m_outfile->Write (s.c_str(), s.Len() ) ;
+ write(s);
s = wxT("<g style=\"fill:black; stroke:black; stroke-width:1\">") + 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 s = wxT("</g> \n</svg> \n") ;
- m_outfile->Write (s.c_str(), s.Len() ) ;
- m_OK = m_outfile->Ok ();
+ write(s);
delete m_outfile ;
}
s.Printf ( wxT("<path d=\"M%d %d L%d %d\" /> \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) ;
wxString s;
if (m_graphics_changed) NewGraphics ();
s = wxT("<g style = \"stroke-linecap:round;\" > ") + newline ;
- m_outfile->Write (s.c_str(), s.Len() ) ;
+ write(s);
DrawLine ( x1,y1,x1,y1 );
s = wxT("</g>");
- m_outfile->Write (s.c_str(), s.Len() ) ;
- m_OK = m_outfile->Ok ();
+ write(s);
}
// 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)
{
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(" <text x=\"%d\" y=\"%d\" "),x,y );
-
+
sTmp = m_font.GetFaceName () ;
if (sTmp.Len () > 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("; ") ;
s = s + sTmp + sText + wxT("</text> ") + 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")) ;
}
if (m_graphics_changed) NewGraphics ();
wxString s ;
- s.Printf ( wxT(" <rect x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" rx=\"%.2g\" "),
+ s.Printf ( wxT(" <rect x=\"%d\" y=\"%d\" width=\"%d\" height=\"%d\" rx=\"%.2g\" "),
x, y, width, height, radius );
s = s + 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) ;
}
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")) ;
}
s.Printf ( wxT("<ellipse cx=\"%d\" cy=\"%d\" rx=\"%d\" ry=\"%d\" "), x+rw,y+rh, rw, rh );
s = s + 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) ;
if ( fabs ( r2-r1 ) > 3 ) //pixels
{
s = wxT("<!--- wxSVGFileDC::DoDrawArc Error in getting radii of circle --> \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
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")) ;
}
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("<path d=\"M%d %d A%d %d 0.0 %d %d %d %d L %d %d z "),
int(xs), int(ys), int(rx), int(ry),
if (m_OK)
{
- m_outfile->Write (s.c_str(), s.Len() ) ;
+ write(s);
}
- m_OK = m_outfile->Ok ();
wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::DoDrawEllipticArc Call executed")) ;
}
// 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")) ;
}
wxColour c = m_pen.GetColour () ;
wxString s, sBrush, sPenCap, sPenJoin, sPenStyle, sLast, sWarn;
-
- sBrush = wxT("</g>\n<g style=\"") + wxBrushString ( m_brush.GetColour (), m_brush.GetStyle () )
- + wxT(" stroke:#") + wxColStr (c) + wxT("; ") ;
-
+
+ sBrush = wxT("</g>\n<g style=\"") + wxBrushString ( m_brush.GetColour (), m_brush.GetStyle () )
+ + wxT(" stroke:#") + wxColStr (c) + wxT("; ") ;
+
switch ( m_pen.GetCap () )
{
case wxCAP_PROJECTING :
sWarn = sWarn + wxT("<!--- wxSVGFileDC::SetPen Call called to set a Style which is not available --> \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")) ;
}
{
m_font = font ;
-
+
wxASSERT_MSG(!wxSVG_DEBUG, wxT("wxSVGFileDC::SetFont Call executed")) ;
}
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();
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();
// 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")) ;
}
-
-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) )
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
s = s + sTmp ;
sTmp.Printf ( wxT(" xlink:href=\"%s\"> \n"), sPNG.c_str() );
s = s + sTmp + wxT("<title>Image from wxSVG</title> </image>") + 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")) ;
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
projects / wxWidgets.git / blobdiff