X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/11aac4baa6172481674b017e8529ad7ef18758fd..ed8f0b067521d3b86db3a73c5843aea6f3b13605:/src/generic/dcpsg.cpp diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp index 0f0ded3abd..c18a7dd391 100644 --- a/src/generic/dcpsg.cpp +++ b/src/generic/dcpsg.cpp @@ -32,11 +32,9 @@ #include "wx/prntbase.h" #include "wx/generic/prntdlgg.h" #include "wx/paper.h" -#include "wx/filefn.h" +#include "wx/filename.h" #include "wx/stdpaths.h" -WXDLLIMPEXP_DATA_CORE(int) wxPageNumber; - #ifdef __WXMSW__ #ifdef DrawText @@ -192,7 +190,7 @@ static const char *wxPostScriptHeaderColourImage = "\ } ifelse % end of 'false' case\n\ "; -static char wxPostScriptHeaderReencodeISO1[] = +static const char wxPostScriptHeaderReencodeISO1[] = "\n/reencodeISO {\n" "dup dup findfont dup length dict begin\n" "{ 1 index /FID ne { def }{ pop pop } ifelse } forall\n" @@ -216,7 +214,7 @@ static char wxPostScriptHeaderReencodeISO1[] = "/.notdef/dotlessi/grave/acute/circumflex/tilde/macron/breve\n" "/dotaccent/dieresis/.notdef/ring/cedilla/.notdef/hungarumlaut\n"; -static char wxPostScriptHeaderReencodeISO2[] = +static const char wxPostScriptHeaderReencodeISO2[] = "/ogonek/caron/space/exclamdown/cent/sterling/currency/yen/brokenbar\n" "/section/dieresis/copyright/ordfeminine/guillemotleft/logicalnot\n" "/hyphen/registered/macron/degree/plusminus/twosuperior/threesuperior\n" @@ -237,44 +235,85 @@ static char wxPostScriptHeaderReencodeISO2[] = // wxPostScriptDC //------------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC) -float wxPostScriptDC::ms_PSScaleFactor = 1.0; +IMPLEMENT_DYNAMIC_CLASS(wxPostScriptDC, wxDC) -void wxPostScriptDC::SetResolution(int ppi) +wxPostScriptDC::wxPostScriptDC() + : wxDC(new wxPostScriptDCImpl(this)) { - ms_PSScaleFactor = (float)ppi / 72.0; } -int wxPostScriptDC::GetResolution() +wxPostScriptDC::wxPostScriptDC(const wxPrintData& printData) + : wxDC(new wxPostScriptDCImpl(this, printData)) { - return (int)(ms_PSScaleFactor * 72.0); } +// conversion +static const double RAD2DEG = 180.0 / M_PI; + +// we don't want to use only 72 dpi from PS print +static const int DPI = 600; +static const double PS2DEV = 600.0 / 72.0; +static const double DEV2PS = 72.0 / 600.0; + +#define XLOG2DEV(x) ((double)(LogicalToDeviceX(x)) * DEV2PS) +#define XLOG2DEVREL(x) ((double)(LogicalToDeviceXRel(x)) * DEV2PS) +#define YLOG2DEV(x) ((m_pageHeight - (double)LogicalToDeviceY(x)) * DEV2PS) +#define YLOG2DEVREL(x) ((double)(LogicalToDeviceYRel(x)) * DEV2PS) + + +IMPLEMENT_ABSTRACT_CLASS(wxPostScriptDCImpl, wxDCImpl) + //------------------------------------------------------------------------------- -wxPostScriptDC::wxPostScriptDC () +wxPostScriptDCImpl::wxPostScriptDCImpl( wxPostScriptDC *owner ) : + wxDCImpl( owner ) { - m_pstream = (FILE*) NULL; + Init(); - m_currentRed = 0; - m_currentGreen = 0; - m_currentBlue = 0; + m_pageHeight = 842 * PS2DEV; - m_pageNumber = 0; + m_ok = true; +} - m_clipping = false; +wxPostScriptDCImpl::wxPostScriptDCImpl( wxPostScriptDC *owner, const wxPrintData& data ) : + wxDCImpl( owner ) +{ + Init(); - m_underlinePosition = 0.0; - m_underlineThickness = 0.0; + // this calculates m_pageHeight required for + // taking the inverted Y axis into account + SetPrintData( data ); + + m_ok = true; +} + + +wxPostScriptDCImpl::wxPostScriptDCImpl( wxPrinterDC *owner ) : + wxDCImpl( owner ) +{ + Init(); - m_signX = 1; // default x-axis left to right - m_signY = -1; // default y-axis bottom up -> top down + m_pageHeight = 842 * PS2DEV; + + m_ok = true; +} + +wxPostScriptDCImpl::wxPostScriptDCImpl( wxPrinterDC *owner, const wxPrintData& data ) : + wxDCImpl( owner ) +{ + Init(); + + // this calculates m_pageHeight required for + // taking the inverted Y axis into account + SetPrintData( data ); + + m_ok = true; } -wxPostScriptDC::wxPostScriptDC (const wxPrintData& printData) +void wxPostScriptDCImpl::Init() { - m_pstream = (FILE*) NULL; + m_pstream = NULL; m_currentRed = 0; m_currentGreen = 0; @@ -287,52 +326,67 @@ wxPostScriptDC::wxPostScriptDC (const wxPrintData& printData) m_underlinePosition = 0.0; m_underlineThickness = 0.0; - m_signX = 1; // default x-axis left to right - m_signY = -1; // default y-axis bottom up -> top down - - m_printData = printData; - - m_ok = true; } -wxPostScriptDC::~wxPostScriptDC () +wxPostScriptDCImpl::~wxPostScriptDCImpl () { if (m_pstream) { fclose( m_pstream ); - m_pstream = (FILE*) NULL; + m_pstream = NULL; } } -bool wxPostScriptDC::IsOk() const +bool wxPostScriptDCImpl::IsOk() const { return m_ok; } -void wxPostScriptDC::DoSetClippingRegion (wxCoord x, wxCoord y, wxCoord w, wxCoord h) +wxRect wxPostScriptDCImpl::GetPaperRect() const +{ + int w = 0; + int h = 0; + DoGetSize( &w, &h ); + return wxRect(0,0,w,h); +} + +int wxPostScriptDCImpl::GetResolution() const +{ + return DPI; +} + +void wxPostScriptDCImpl::DoSetClippingRegion (wxCoord x, wxCoord y, wxCoord w, wxCoord h) { wxCHECK_RET( m_ok , wxT("invalid postscript dc") ); - if (m_clipping) DestroyClippingRegion(); + if (m_clipping) + DestroyClippingRegion(); - wxDC::DoSetClippingRegion(x, y, w, h); + m_clipX1 = x; + m_clipY1 = y; + m_clipX2 = x + w; + m_clipY2 = y + h; m_clipping = true; - PsPrintf( wxT("gsave\n newpath\n") - wxT("%d %d moveto\n") - wxT("%d %d lineto\n") - wxT("%d %d lineto\n") - wxT("%d %d lineto\n") - wxT("closepath clip newpath\n"), - LogicalToDeviceX(x), LogicalToDeviceY(y), - LogicalToDeviceX(x+w), LogicalToDeviceY(y), - LogicalToDeviceX(x+w), LogicalToDeviceY(y+h), - LogicalToDeviceX(x), LogicalToDeviceY(y+h) ); + wxString buffer; + buffer.Printf( "gsave\n" + "newpath\n" + "%f %f moveto\n" + "%f %f lineto\n" + "%f %f lineto\n" + "%f %f lineto\n" + "closepath clip newpath\n", + XLOG2DEV(x), YLOG2DEV(y), + XLOG2DEV(x+w), YLOG2DEV(y), + XLOG2DEV(x+w), YLOG2DEV(y+h), + XLOG2DEV(x), YLOG2DEV(y+h) ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); } -void wxPostScriptDC::DestroyClippingRegion() +void wxPostScriptDCImpl::DestroyClippingRegion() { wxCHECK_RET( m_ok , wxT("invalid postscript dc") ); @@ -342,61 +396,63 @@ void wxPostScriptDC::DestroyClippingRegion() PsPrint( "grestore\n" ); } - wxDC::DestroyClippingRegion(); + wxDCImpl::DestroyClippingRegion(); } -void wxPostScriptDC::Clear() +void wxPostScriptDCImpl::Clear() { // This should fail silently to avoid unnecessary // asserts - // wxFAIL_MSG( wxT("wxPostScriptDC::Clear not implemented.") ); + // wxFAIL_MSG( wxT("wxPostScriptDCImpl::Clear not implemented.") ); } -bool wxPostScriptDC::DoFloodFill (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), const wxColour &WXUNUSED(col), int WXUNUSED(style)) +bool wxPostScriptDCImpl::DoFloodFill (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), const wxColour &WXUNUSED(col), wxFloodFillStyle WXUNUSED(style)) { - wxFAIL_MSG( wxT("wxPostScriptDC::FloodFill not implemented.") ); + wxFAIL_MSG( wxT("wxPostScriptDCImpl::FloodFill not implemented.") ); return false; } -bool wxPostScriptDC::DoGetPixel (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxColour * WXUNUSED(col)) const +bool wxPostScriptDCImpl::DoGetPixel (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxColour * WXUNUSED(col)) const { - wxFAIL_MSG( wxT("wxPostScriptDC::GetPixel not implemented.") ); + wxFAIL_MSG( wxT("wxPostScriptDCImpl::GetPixel not implemented.") ); return false; } -void wxPostScriptDC::DoCrossHair (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y)) +void wxPostScriptDCImpl::DoCrossHair (wxCoord WXUNUSED(x), wxCoord WXUNUSED(y)) { - wxFAIL_MSG( wxT("wxPostScriptDC::CrossHair not implemented.") ); + wxFAIL_MSG( wxT("wxPostScriptDCImpl::CrossHair not implemented.") ); } -void wxPostScriptDC::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) +void wxPostScriptDCImpl::DoDrawLine (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - if (m_pen.GetStyle() == wxTRANSPARENT) return; + if ( m_pen.IsTransparent() ) + return; SetPen( m_pen ); - PsPrintf( wxT("newpath\n") - wxT("%d %d moveto\n") - wxT("%d %d lineto\n") - wxT("stroke\n"), - LogicalToDeviceX(x1), LogicalToDeviceY(y1), - LogicalToDeviceX(x2), LogicalToDeviceY (y2) ); + wxString buffer; + buffer.Printf( "newpath\n" + "%f %f moveto\n" + "%f %f lineto\n" + "stroke\n", + XLOG2DEV(x1), YLOG2DEV(y1), + XLOG2DEV(x2), YLOG2DEV(y2) ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); CalcBoundingBox( x1, y1 ); CalcBoundingBox( x2, y2 ); } -#define RAD2DEG 57.29577951308 - -void wxPostScriptDC::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc) +void wxPostScriptDCImpl::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc) { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); wxCoord dx = x1 - xc; wxCoord dy = y1 - yc; - wxCoord radius = (wxCoord) sqrt( (double)(dx*dx+dy*dy) ); + double radius = sqrt( (double)(dx*dx+dy*dy) ); double alpha1, alpha2; if (x1 == x2 && y1 == y2) @@ -423,40 +479,52 @@ void wxPostScriptDC::DoDrawArc (wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, while (alpha1 > 360) alpha1 -= 360; // 0 and 360 degree while (alpha2 > 360) alpha2 -= 360; - if (m_brush.GetStyle() != wxTRANSPARENT) + int i_radius = wxRound( radius ); + + if ( m_brush.IsNonTransparent() ) { SetBrush( m_brush ); - PsPrintf( wxT("newpath\n") - wxT("%d %d %d %d %d %d ellipse\n") - wxT("%d %d lineto\n") - wxT("closepath\n") - wxT("fill\n"), - LogicalToDeviceX(xc), LogicalToDeviceY(yc), LogicalToDeviceXRel(radius), LogicalToDeviceYRel(radius), (wxCoord)alpha1, (wxCoord) alpha2, - LogicalToDeviceX(xc), LogicalToDeviceY(yc) ); + wxString buffer; + buffer.Printf( "newpath\n" + "%f %f %f %f %f %f ellipse\n" + "%f %f lineto\n" + "closepath\n" + "fill\n", + XLOG2DEV(xc), YLOG2DEV(yc), + XLOG2DEVREL(i_radius), YLOG2DEVREL(i_radius), + alpha1, alpha2, + XLOG2DEV(xc), YLOG2DEV(yc) ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); - CalcBoundingBox( xc-radius, yc-radius ); - CalcBoundingBox( xc+radius, yc+radius ); + CalcBoundingBox( xc-i_radius, yc-i_radius ); + CalcBoundingBox( xc+i_radius, yc+i_radius ); } - if (m_pen.GetStyle() != wxTRANSPARENT) + if ( m_pen.IsNonTransparent() ) { SetPen( m_pen ); - PsPrintf( wxT("newpath\n") - wxT("%d %d %d %d %d %d ellipse\n") - wxT("%d %d lineto\n") - wxT("stroke\n") - wxT("fill\n"), - LogicalToDeviceX(xc), LogicalToDeviceY(yc), LogicalToDeviceXRel(radius), LogicalToDeviceYRel(radius), (wxCoord)alpha1, (wxCoord) alpha2, - LogicalToDeviceX(xc), LogicalToDeviceY(yc) ); + wxString buffer; + buffer.Printf( "newpath\n" + "%f %f %f %f %f %f ellipse\n" + "%f %f lineto\n" + "closepath\n" + "stroke\n", + XLOG2DEV(xc), YLOG2DEV(yc), + XLOG2DEVREL(i_radius), YLOG2DEVREL(i_radius), + alpha1, alpha2, + XLOG2DEV(xc), YLOG2DEV(yc) ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); - CalcBoundingBox( xc-radius, yc-radius ); - CalcBoundingBox( xc+radius, yc+radius ); + CalcBoundingBox( xc-i_radius, yc-i_radius ); + CalcBoundingBox( xc+i_radius, yc+i_radius ); } } -void wxPostScriptDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) +void wxPostScriptDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea) { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); @@ -471,82 +539,97 @@ void wxPostScriptDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,d if ( wxIsSameDouble(sa, ea) ) { - DrawEllipse(x,y,w,h); + DoDrawEllipse(x,y,w,h); return; } - if (m_brush.GetStyle () != wxTRANSPARENT) + if ( m_brush.IsNonTransparent() ) { SetBrush( m_brush ); - PsPrintf( wxT("newpath\n") - wxT("%d %d %d %d %d %d true ellipticarc\n"), - LogicalToDeviceX(x+w/2), LogicalToDeviceY(y+h/2), - LogicalToDeviceXRel(w/2), LogicalToDeviceYRel(h/2), - (wxCoord)sa, (wxCoord)ea ); + wxString buffer; + buffer.Printf( "newpath\n" + "%f %f %f %f %f %f true ellipticarc\n", + XLOG2DEV(x+w/2), YLOG2DEV(y+h/2), + XLOG2DEVREL(w/2), YLOG2DEVREL(h/2), + sa, ea ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); CalcBoundingBox( x ,y ); CalcBoundingBox( x+w, y+h ); } - if (m_pen.GetStyle () != wxTRANSPARENT) + if ( m_pen.IsNonTransparent() ) { SetPen( m_pen ); - PsPrintf( wxT("newpath\n") - wxT("%d %d %d %d %d %d false ellipticarc\n"), - LogicalToDeviceX(x+w/2), LogicalToDeviceY(y+h/2), - LogicalToDeviceXRel(w/2), LogicalToDeviceYRel(h/2), - (wxCoord)sa, (wxCoord)ea ); + wxString buffer; + buffer.Printf( "newpath\n" + "%f %f %f %f %f %f false ellipticarc\n", + XLOG2DEV(x+w/2), YLOG2DEV(y+h/2), + XLOG2DEVREL(w/2), YLOG2DEVREL(h/2), + sa, ea ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); CalcBoundingBox( x ,y ); CalcBoundingBox( x+w, y+h ); } } -void wxPostScriptDC::DoDrawPoint (wxCoord x, wxCoord y) +void wxPostScriptDCImpl::DoDrawPoint (wxCoord x, wxCoord y) { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - if (m_pen.GetStyle() == wxTRANSPARENT) return; + if ( m_pen.IsTransparent() ) + return; SetPen (m_pen); - PsPrintf( wxT("newpath\n") - wxT("%d %d moveto\n") - wxT("%d %d lineto\n") - wxT("stroke\n"), - LogicalToDeviceX(x), LogicalToDeviceY(y), - LogicalToDeviceX(x+1), LogicalToDeviceY(y) ); + wxString buffer; + buffer.Printf( "newpath\n" + "%f %f moveto\n" + "%f %f lineto\n" + "stroke\n", + XLOG2DEV(x), YLOG2DEV(y), + XLOG2DEV(x+1), YLOG2DEV(y) ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); CalcBoundingBox( x, y ); } -void wxPostScriptDC::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle) +void wxPostScriptDCImpl::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode fillStyle) { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); if (n <= 0) return; - if (m_brush.GetStyle () != wxTRANSPARENT) + if ( m_brush.IsNonTransparent() ) { SetBrush( m_brush ); PsPrint( "newpath\n" ); - wxCoord xx = LogicalToDeviceX(points[0].x + xoffset); - wxCoord yy = LogicalToDeviceY(points[0].y + yoffset); + double xx = XLOG2DEV(points[0].x + xoffset); + double yy = YLOG2DEV(points[0].y + yoffset); - PsPrintf( wxT("%d %d moveto\n"), xx, yy ); + wxString buffer; + buffer.Printf( "%f %f moveto\n", xx, yy ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset ); for (int i = 1; i < n; i++) { - xx = LogicalToDeviceX(points[i].x + xoffset); - yy = LogicalToDeviceY(points[i].y + yoffset); + xx = XLOG2DEV(points[i].x + xoffset); + yy = YLOG2DEV(points[i].y + yoffset); - PsPrintf( wxT("%d %d lineto\n"), xx, yy ); + buffer.Printf( "%f %f lineto\n", xx, yy ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset); } @@ -554,25 +637,30 @@ void wxPostScriptDC::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wx PsPrint( (fillStyle == wxODDEVEN_RULE ? "eofill\n" : "fill\n") ); } - if (m_pen.GetStyle () != wxTRANSPARENT) + if ( m_pen.IsNonTransparent() ) { SetPen( m_pen ); PsPrint( "newpath\n" ); - wxCoord xx = LogicalToDeviceX(points[0].x + xoffset); - wxCoord yy = LogicalToDeviceY(points[0].y + yoffset); + double xx = XLOG2DEV(points[0].x + xoffset); + double yy = YLOG2DEV(points[0].y + yoffset); - PsPrintf( wxT("%d %d moveto\n"), xx, yy ); + wxString buffer; + buffer.Printf( "%f %f moveto\n", xx, yy ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); CalcBoundingBox( points[0].x + xoffset, points[0].y + yoffset ); for (int i = 1; i < n; i++) { - xx = LogicalToDeviceX(points[i].x + xoffset); - yy = LogicalToDeviceY(points[i].y + yoffset); + xx = XLOG2DEV(points[i].x + xoffset); + yy = YLOG2DEV(points[i].y + yoffset); - PsPrintf( wxT("%d %d lineto\n"), xx, yy ); + buffer.Printf( "%f %f lineto\n", xx, yy ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); CalcBoundingBox( points[i].x + xoffset, points[i].y + yoffset); } @@ -582,13 +670,13 @@ void wxPostScriptDC::DoDrawPolygon (int n, wxPoint points[], wxCoord xoffset, wx } } -void wxPostScriptDC::DoDrawPolyPolygon (int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle) +void wxPostScriptDCImpl::DoDrawPolyPolygon (int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode fillStyle) { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); if (n <= 0) return; - if (m_brush.GetStyle () != wxTRANSPARENT) + if ( m_brush.IsNonTransparent() ) { SetBrush( m_brush ); @@ -597,19 +685,24 @@ void wxPostScriptDC::DoDrawPolyPolygon (int n, int count[], wxPoint points[], wx int ofs = 0; for (int i = 0; i < n; ofs += count[i++]) { - wxCoord xx = LogicalToDeviceX(points[ofs].x + xoffset); - wxCoord yy = LogicalToDeviceY(points[ofs].y + yoffset); + double xx = XLOG2DEV(points[ofs].x + xoffset); + double yy = YLOG2DEV(points[ofs].y + yoffset); - PsPrintf( wxT("%d %d moveto\n"), xx, yy ); + wxString buffer; + buffer.Printf( "%f %f moveto\n", xx, yy ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); CalcBoundingBox( points[ofs].x + xoffset, points[ofs].y + yoffset ); for (int j = 1; j < count[i]; j++) { - xx = LogicalToDeviceX(points[ofs+j].x + xoffset); - yy = LogicalToDeviceY(points[ofs+j].y + yoffset); + xx = XLOG2DEV(points[ofs+j].x + xoffset); + yy = YLOG2DEV(points[ofs+j].y + yoffset); - PsPrintf( wxT("%d %d lineto\n"), xx, yy ); + buffer.Printf( "%f %f lineto\n", xx, yy ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); CalcBoundingBox( points[ofs+j].x + xoffset, points[ofs+j].y + yoffset); } @@ -617,7 +710,7 @@ void wxPostScriptDC::DoDrawPolyPolygon (int n, int count[], wxPoint points[], wx PsPrint( (fillStyle == wxODDEVEN_RULE ? "eofill\n" : "fill\n") ); } - if (m_pen.GetStyle () != wxTRANSPARENT) + if ( m_pen.IsNonTransparent() ) { SetPen( m_pen ); @@ -626,19 +719,24 @@ void wxPostScriptDC::DoDrawPolyPolygon (int n, int count[], wxPoint points[], wx int ofs = 0; for (int i = 0; i < n; ofs += count[i++]) { - wxCoord xx = LogicalToDeviceX(points[ofs].x + xoffset); - wxCoord yy = LogicalToDeviceY(points[ofs].y + yoffset); + double xx = XLOG2DEV(points[ofs].x + xoffset); + double yy = YLOG2DEV(points[ofs].y + yoffset); - PsPrintf( wxT("%d %d moveto\n"), xx, yy ); + wxString buffer; + buffer.Printf( "%f %f moveto\n", xx, yy ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); CalcBoundingBox( points[ofs].x + xoffset, points[ofs].y + yoffset ); for (int j = 1; j < count[i]; j++) { - xx = LogicalToDeviceX(points[ofs+j].x + xoffset); - yy = LogicalToDeviceY(points[ofs+j].y + yoffset); + xx = XLOG2DEV(points[ofs+j].x + xoffset); + yy = YLOG2DEV(points[ofs+j].y + yoffset); - PsPrintf( wxT("%d %d lineto\n"), xx, yy ); + buffer.Printf( "%f %f lineto\n", xx, yy ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); CalcBoundingBox( points[ofs+j].x + xoffset, points[ofs+j].y + yoffset); } @@ -648,11 +746,12 @@ void wxPostScriptDC::DoDrawPolyPolygon (int n, int count[], wxPoint points[], wx } } -void wxPostScriptDC::DoDrawLines (int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset) +void wxPostScriptDCImpl::DoDrawLines (int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset) { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - if (m_pen.GetStyle() == wxTRANSPARENT) return; + if ( m_pen.IsTransparent() ) + return; if (n <= 0) return; @@ -660,74 +759,89 @@ void wxPostScriptDC::DoDrawLines (int n, wxPoint points[], wxCoord xoffset, wxCo int i; for ( i =0; iGetTextExtent(text, &text_w, &text_h, &text_descent); int size = m_font.GetPointSize(); @@ -1210,29 +1339,30 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y ) // - note that there is still rounding error in text_descent! wxCoord by = y + size - text_descent; // baseline - PsPrintf( wxT("%d %d moveto\n"), LogicalToDeviceX(x), LogicalToDeviceY(by) ); + wxString buffer; + buffer.Printf( "%f %f moveto\n", XLOG2DEV(x), YLOG2DEV(by) ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); PsPrint( "(" ); - const wxWX2MBbuf textbuf = text.mb_str(); - size_t len = strlen(textbuf); - size_t i; - for (i = 0; i < len; i++) + for ( const char *p = textbuf; *p != '\0'; p++ ) { - int c = (unsigned char) textbuf[i]; + int c = (unsigned char)*p; if (c == ')' || c == '(' || c == '\\') { /* Cope with special characters */ PsPrint( "\\" ); - PsPrint(c); + PsPrint( (char) c ); } else if ( c >= 128 ) { /* Cope with character codes > 127 */ - PsPrintf( wxT("\\%o"), c); + buffer.Printf( "\\%o", c ); + PsPrint( buffer ); } else { - PsPrint(c); + PsPrint( (char) c ); } } @@ -1241,20 +1371,17 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y ) if (m_font.GetUnderlined()) { wxCoord uy = (wxCoord)(y + size - m_underlinePosition); - char buffer[100]; - sprintf( buffer, - "gsave\n" - "%d %d moveto\n" - "%f setlinewidth\n" - "%d %d lineto\n" - "stroke\n" - "grestore\n", - LogicalToDeviceX(x), LogicalToDeviceY(uy), + buffer.Printf( "gsave\n" + "%f %f moveto\n" + "%f setlinewidth\n" + "%f %f lineto\n" + "stroke\n" + "grestore\n", + XLOG2DEV(x), YLOG2DEV(uy), m_underlineThickness, - LogicalToDeviceX(x + text_w), LogicalToDeviceY(uy) ); - for (i = 0; i < 100; i++) - if (buffer[i] == ',') buffer[i] = '.'; + XLOG2DEV(x + text_w), YLOG2DEV(uy) ); + buffer.Replace( ",", "." ); PsPrint( buffer ); } @@ -1262,7 +1389,7 @@ void wxPostScriptDC::DoDrawText( const wxString& text, wxCoord x, wxCoord y ) CalcBoundingBox( x + size * text.length() * 2/3 , y ); } -void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord y, double angle ) +void wxPostScriptDCImpl::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord y, double angle ) { if ( wxIsNullDouble(angle) ) { @@ -1300,12 +1427,9 @@ void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord double bluePS = (double)(blue) / 255.0; double greenPS = (double)(green) / 255.0; - char buffer[100]; - sprintf( buffer, - "%.8f %.8f %.8f setrgbcolor\n", - redPS, greenPS, bluePS ); - for (int i = 0; i < 100; i++) - if (buffer[i] == ',') buffer[i] = '.'; + wxString buffer; + buffer.Printf( "%f %f %f setrgbcolor\n", redPS, greenPS, bluePS ); + buffer.Replace( ",", "." ); PsPrint( buffer ); m_currentRed = red; @@ -1316,70 +1440,64 @@ void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord int size = m_font.GetPointSize(); - PsPrintf( wxT("%d %d moveto\n"), - LogicalToDeviceX(x), LogicalToDeviceY(y)); + wxString buffer; + buffer.Printf( "%f %f moveto\n", XLOG2DEV(x), YLOG2DEV(y)); + buffer.Replace( ",", "." ); + PsPrint( buffer ); - char buffer[100]; - sprintf(buffer, "%.8f rotate\n", angle); - size_t i; - for (i = 0; i < 100; i++) - { - if (buffer[i] == ',') buffer[i] = '.'; - } - PsPrint( buffer); + buffer.Printf( "%f rotate\n", angle ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); PsPrint( "(" ); const wxWX2MBbuf textbuf = text.mb_str(); - size_t len = strlen(textbuf); - for (i = 0; i < len; i++) + if ( textbuf ) { - int c = (unsigned char) textbuf[i]; - if (c == ')' || c == '(' || c == '\\') - { - /* Cope with special characters */ - PsPrint( "\\" ); - PsPrint(c); - } - else if ( c >= 128 ) - { - /* Cope with character codes > 127 */ - PsPrintf( wxT("\\%o"), c); - } - else + for ( const char *p = textbuf; *p != '\0'; p++ ) { - PsPrint(c); + int c = (unsigned char)*p; + if (c == ')' || c == '(' || c == '\\') + { + /* Cope with special characters */ + PsPrint( "\\" ); + PsPrint( (char) c ); + } + else if ( c >= 128 ) + { + /* Cope with character codes > 127 */ + buffer.Printf( "\\%o", c); + PsPrint( buffer ); + } + else + { + PsPrint( (char) c ); + } } } PsPrint( ") show\n" ); - sprintf( buffer, "%.8f rotate\n", -angle ); - for (i = 0; i < 100; i++) - { - if (buffer[i] == ',') buffer[i] = '.'; - } + buffer.Printf( "%f rotate\n", -angle ); + buffer.Replace( ",", "." ); PsPrint( buffer ); if (m_font.GetUnderlined()) { wxCoord uy = (wxCoord)(y + size - m_underlinePosition); wxCoord w, h; - GetTextExtent(text, &w, &h); + GetOwner()->GetTextExtent(text, &w, &h); - sprintf( buffer, + buffer.Printf( "gsave\n" - "%d %d moveto\n" + "%f %f moveto\n" "%f setlinewidth\n" - "%d %d lineto\n" + "%f %f lineto\n" "stroke\n" "grestore\n", - LogicalToDeviceX(x), LogicalToDeviceY(uy), + XLOG2DEV(x), YLOG2DEV(uy), m_underlineThickness, - LogicalToDeviceX(x + w), LogicalToDeviceY(uy) ); - for (i = 0; i < 100; i++) - { - if (buffer[i] == ',') buffer[i] = '.'; - } + XLOG2DEV(x + w), YLOG2DEV(uy) ); + buffer.Replace( ",", "." ); PsPrint( buffer ); } @@ -1387,18 +1505,18 @@ void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord CalcBoundingBox( x + size * text.length() * 2/3 , y ); } -void wxPostScriptDC::SetBackground (const wxBrush& brush) +void wxPostScriptDCImpl::SetBackground (const wxBrush& brush) { m_backgroundBrush = brush; } -void wxPostScriptDC::SetLogicalFunction (int WXUNUSED(function)) +void wxPostScriptDCImpl::SetLogicalFunction(wxRasterOperationMode WXUNUSED(function)) { - wxFAIL_MSG( wxT("wxPostScriptDC::SetLogicalFunction not implemented.") ); + wxFAIL_MSG( wxT("wxPostScriptDCImpl::SetLogicalFunction not implemented.") ); } #if wxUSE_SPLINES -void wxPostScriptDC::DoDrawSpline( wxList *points ) +void wxPostScriptDCImpl::DoDrawSpline( const wxPointList *points ) { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); @@ -1409,13 +1527,13 @@ void wxPostScriptDC::DoDrawSpline( wxList *points ) double c, d, x1, y1, x2, y2, x3, y3; wxPoint *p, *q; - wxList::compatibility_iterator node = points->GetFirst(); - p = (wxPoint *)node->GetData(); + wxPointList::compatibility_iterator node = points->GetFirst(); + p = node->GetData(); x1 = p->x; y1 = p->y; node = node->GetNext(); - p = (wxPoint *)node->GetData(); + p = node->GetData(); c = p->x; d = p->y; x3 = @@ -1429,11 +1547,14 @@ void wxPostScriptDC::DoDrawSpline( wxList *points ) #endif (double)(y1 + d) / 2; - PsPrintf( wxT("newpath\n") - wxT("%d %d moveto\n") - wxT("%d %d lineto\n"), - LogicalToDeviceX((wxCoord)x1), LogicalToDeviceY((wxCoord)y1), - LogicalToDeviceX((wxCoord)x3), LogicalToDeviceY((wxCoord)y3) ); + wxString buffer; + buffer.Printf( "newpath\n" + "%f %f moveto\n" + "%f %f lineto\n", + XLOG2DEV(wxRound(x1)), YLOG2DEV(wxRound(y1)), + XLOG2DEV(wxRound(x3)), YLOG2DEV(wxRound(y3)) ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 ); CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 ); @@ -1441,7 +1562,7 @@ void wxPostScriptDC::DoDrawSpline( wxList *points ) node = node->GetNext(); while (node) { - q = (wxPoint *)node->GetData(); + q = node->GetData(); x1 = x3; y1 = y3; @@ -1452,10 +1573,12 @@ void wxPostScriptDC::DoDrawSpline( wxList *points ) x3 = (double)(x2 + c) / 2; y3 = (double)(y2 + d) / 2; - PsPrintf( wxT("%d %d %d %d %d %d DrawSplineSection\n"), - LogicalToDeviceX((wxCoord)x1), LogicalToDeviceY((wxCoord)y1), - LogicalToDeviceX((wxCoord)x2), LogicalToDeviceY((wxCoord)y2), - LogicalToDeviceX((wxCoord)x3), LogicalToDeviceY((wxCoord)y3) ); + buffer.Printf( "%f %f %f %f %f %f DrawSplineSection\n", + XLOG2DEV(wxRound(x1)), YLOG2DEV(wxRound(y1)), + XLOG2DEV(wxRound(x2)), YLOG2DEV(wxRound(y2)), + XLOG2DEV(wxRound(x3)), YLOG2DEV(wxRound(y3)) ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); CalcBoundingBox( (wxCoord)x1, (wxCoord)y1 ); CalcBoundingBox( (wxCoord)x3, (wxCoord)y3 ); @@ -1468,41 +1591,55 @@ void wxPostScriptDC::DoDrawSpline( wxList *points ) next-to-last and last point respectively, in the point list */ - PsPrintf( wxT("%d %d lineto\n") - wxT("stroke\n"), - LogicalToDeviceX((wxCoord)c), LogicalToDeviceY((wxCoord)d) ); + buffer.Printf( "%f %f lineto\nstroke\n", XLOG2DEV(wxRound(c)), YLOG2DEV(wxRound(d)) ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); } #endif // wxUSE_SPLINES -wxCoord wxPostScriptDC::GetCharWidth() const +wxCoord wxPostScriptDCImpl::GetCharWidth() const { // Chris Breeze: reasonable approximation using wxMODERN/Courier return (wxCoord) (GetCharHeight() * 72.0 / 120.0); } - -void wxPostScriptDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp ) +void wxPostScriptDCImpl::SetPrintData(const wxPrintData& data) { - wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); + m_printData = data; - m_signX = (xLeftRight ? 1 : -1); - m_signY = (yBottomUp ? 1 : -1); + wxPaperSize id = m_printData.GetPaperId(); + wxPrintPaperType *paper = wxThePrintPaperDatabase->FindPaperType(id); + if (!paper) paper = wxThePrintPaperDatabase->FindPaperType(wxPAPER_A4); + int w = 595; + int h = 842; + if (paper) + { + w = paper->GetSizeDeviceUnits().x; + h = paper->GetSizeDeviceUnits().y; + } - ComputeScaleAndOrigin(); + if (m_printData.GetOrientation() == wxLANDSCAPE) + m_pageHeight = w * PS2DEV; + else + m_pageHeight = h * PS2DEV; } -void wxPostScriptDC::SetDeviceOrigin( wxCoord x, wxCoord y ) +void wxPostScriptDCImpl::ComputeScaleAndOrigin() { - wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); + const wxRealPoint origScale(m_scaleX, m_scaleY); - int h = 0; - int w = 0; - GetSize( &w, &h ); + wxDCImpl::ComputeScaleAndOrigin(); - wxDC::SetDeviceOrigin( x, h-y ); + // If scale has changed call SetPen to recalulate the line width + // and SetFont to recalculate font size + if ( wxRealPoint(m_scaleX, m_scaleY) != origScale && m_pen.IsOk() ) + { + SetPen( m_pen ); + SetFont( m_font ); + } } -void wxPostScriptDC::DoGetSize(int* width, int* height) const +void wxPostScriptDCImpl::DoGetSize(int* width, int* height) const { wxPaperSize id = m_printData.GetPaperId(); @@ -1525,11 +1662,14 @@ void wxPostScriptDC::DoGetSize(int* width, int* height) const h = tmp; } - if (width) *width = (int)(w * ms_PSScaleFactor); - if (height) *height = (int)(h * ms_PSScaleFactor); + if (width) + *width = wxRound( w * PS2DEV ); + + if (height) + *height = wxRound( h * PS2DEV ); } -void wxPostScriptDC::DoGetSizeMM(int *width, int *height) const +void wxPostScriptDCImpl::DoGetSizeMM(int *width, int *height) const { wxPaperSize id = m_printData.GetPaperId(); @@ -1557,14 +1697,13 @@ void wxPostScriptDC::DoGetSizeMM(int *width, int *height) const } // Resolution in pixels per logical inch -wxSize wxPostScriptDC::GetPPI(void) const +wxSize wxPostScriptDCImpl::GetPPI(void) const { - return wxSize((int)(72 * ms_PSScaleFactor), - (int)(72 * ms_PSScaleFactor)); + return wxSize( DPI, DPI ); } -bool wxPostScriptDC::StartDoc( const wxString& message ) +bool wxPostScriptDCImpl::StartDoc( const wxString& WXUNUSED(message) ) { wxCHECK_MSG( m_ok, false, wxT("invalid postscript dc") ); @@ -1572,7 +1711,7 @@ bool wxPostScriptDC::StartDoc( const wxString& message ) { if (m_printData.GetFilename() == wxEmptyString) { - wxString filename = wxGetTempFileName( wxT("ps") ); + wxString filename = wxFileName::CreateTempFileName( wxT("ps") ); m_printData.SetFilename(filename); } @@ -1587,19 +1726,21 @@ bool wxPostScriptDC::StartDoc( const wxString& message ) } m_ok = true; - m_title = message; + + wxString buffer; PsPrint( "%!PS-Adobe-2.0\n" ); - PsPrintf( wxT("%%%%Title: %s\n"), m_title.c_str() ); + PsPrint( "%%Creator: wxWidgets PostScript renderer\n" ); - PsPrintf( wxT("%%%%CreationDate: %s\n"), wxNow().c_str() ); + + buffer.Printf( "%%%%CreationDate: %s\n", wxNow() ); + PsPrint( buffer ); + if (m_printData.GetOrientation() == wxLANDSCAPE) PsPrint( "%%Orientation: Landscape\n" ); else PsPrint( "%%Orientation: Portrait\n" ); - // PsPrintf( wxT("%%%%Pages: %d\n"), (wxPageNumber - 1) ); - const wxChar *paper; switch (m_printData.GetPaperId()) { @@ -1619,7 +1760,10 @@ bool wxPostScriptDC::StartDoc( const wxString& message ) case wxPAPER_10X14: paper = wxT("10x14"); break; // 10-by-14-inch sheet default: paper = wxT("A4"); } - PsPrintf( wxT("%%%%DocumentPaperSizes: %s\n"), paper ); + + buffer.Printf( "%%%%DocumentPaperSizes: %s\n", paper ); + PsPrint( buffer ); + PsPrint( "%%EndComments\n\n" ); PsPrint( "%%BeginProlog\n" ); @@ -1641,12 +1785,11 @@ bool wxPostScriptDC::StartDoc( const wxString& message ) // set origin according to paper size SetDeviceOrigin( 0,0 ); - wxPageNumber = 1; m_pageNumber = 1; return true; } -void wxPostScriptDC::EndDoc () +void wxPostScriptDCImpl::EndDoc () { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); @@ -1658,7 +1801,7 @@ void wxPostScriptDC::EndDoc () if ( m_pstream ) { fclose( m_pstream ); - m_pstream = (FILE *) NULL; + m_pstream = NULL; } #if 0 @@ -1674,10 +1817,10 @@ void wxPostScriptDC::EndDoc () // Compute the bounding box. Note that it is in the default user // coordinate system, thus we have to convert the values. - wxCoord minX = (wxCoord) LogicalToDeviceX(m_minX); - wxCoord minY = (wxCoord) LogicalToDeviceY(m_minY); - wxCoord maxX = (wxCoord) LogicalToDeviceX(m_maxX); - wxCoord maxY = (wxCoord) LogicalToDeviceY(m_maxY); + wxCoord minX = (wxCoord) XLOG2DEV(m_minX); + wxCoord minY = (wxCoord) YLOG2DEV(m_minY); + wxCoord maxX = (wxCoord) XLOG2DEV(m_maxX); + wxCoord maxY = (wxCoord) YLOG2DEV(m_maxY); // LOG2DEV may have changed the minimum to maximum vice versa if ( minX > maxX ) { wxCoord tmp = minX; minX = maxX; maxX = tmp; } @@ -1746,85 +1889,76 @@ void wxPostScriptDC::EndDoc () #endif } -void wxPostScriptDC::StartPage() +void wxPostScriptDCImpl::StartPage() { wxCHECK_RET( m_ok, wxT("invalid postscript dc") ); - PsPrintf( wxT("%%%%Page: %d\n"), wxPageNumber++ ); + wxString buffer; + buffer.Printf( wxT("%%%%Page: %d\n"), m_pageNumber++ ); + PsPrint( buffer ); + +#if 0 + wxPostScriptPrintNativeData *data = + (wxPostScriptPrintNativeData *) m_printData.GetNativeData(); - // What is this one supposed to do? RR. -// *m_pstream << "matrix currentmatrix\n"; + wxCoord translate_x = (wxCoord)data->GetPrinterTranslateX(); + wxCoord translate_y = (wxCoord)data->GetPrinterTranslateY(); - // Added by Chris Breeze + buffer.Printf( "%d %d translate\n", translate_x, translate_y ); + PsPrint( buffer ); - // Each page starts with an "initgraphics" which resets the - // transformation and so we need to reset the origin - // (and rotate the page for landscape printing) + double scale_x = data->GetPrinterScaleX(); + double scale_y = data->GetPrinterScaleY(); - // Output scaling - wxCoord translate_x, translate_y; - double scale_x, scale_y; + buffer.Printf( "%f %f scale\n", scale_x, scale_y ); + buffer.Replace( ",", "." ); + PsPrint( buffer ); - wxPostScriptPrintNativeData *data = - (wxPostScriptPrintNativeData *) m_printData.GetNativeData(); +#endif - translate_x = (wxCoord)data->GetPrinterTranslateX(); - translate_y = (wxCoord)data->GetPrinterTranslateY(); + // Each page starts with an "initgraphics" which resets the + // transformation and so we need to rotate the page for + // landscape printing) - scale_x = data->GetPrinterScaleX(); - scale_y = data->GetPrinterScaleY(); + // I copied this one from a PostScript tutorial, but to no avail. RR. + // PsPrint( "90 rotate llx neg ury nef translate\n" ); if (m_printData.GetOrientation() == wxLANDSCAPE) - { - int h; - GetSize( (int*) NULL, &h ); - translate_y -= h; PsPrint( "90 rotate\n" ); - // I copied this one from a PostScript tutorial, but to no avail. RR. - // PsPrint( "90 rotate llx neg ury nef translate\n" ); - } - - char buffer[100]; - sprintf( buffer, "%.8f %.8f scale\n", scale_x / ms_PSScaleFactor, - scale_y / ms_PSScaleFactor); - for (int i = 0; i < 100; i++) - if (buffer[i] == ',') buffer[i] = '.'; - PsPrint( buffer ); - - PsPrintf( wxT("%d %d translate\n"), translate_x, translate_y ); } -void wxPostScriptDC::EndPage () +void wxPostScriptDCImpl::EndPage () { wxCHECK_RET( m_ok , wxT("invalid postscript dc") ); PsPrint( "showpage\n" ); } -bool wxPostScriptDC::DoBlit( wxCoord xdest, wxCoord ydest, +bool wxPostScriptDCImpl::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord fwidth, wxCoord fheight, wxDC *source, wxCoord xsrc, wxCoord ysrc, - int rop, bool WXUNUSED(useMask), wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask) ) + wxRasterOperationMode rop, + bool WXUNUSED(useMask), wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask) ) { wxCHECK_MSG( m_ok, false, wxT("invalid postscript dc") ); wxCHECK_MSG( source, false, wxT("invalid source dc") ); - /* blit into a bitmap */ + // blit into a bitmap wxBitmap bitmap( (int)fwidth, (int)fheight ); wxMemoryDC memDC; memDC.SelectObject(bitmap); memDC.Blit(0, 0, fwidth, fheight, source, xsrc, ysrc, rop); /* TODO: Blit transparently? */ memDC.SelectObject(wxNullBitmap); - /* draw bitmap. scaling and positioning is done there */ - DrawBitmap( bitmap, xdest, ydest ); + //draw bitmap. scaling and positioning is done there + GetOwner()->DrawBitmap( bitmap, xdest, ydest ); return true; } -wxCoord wxPostScriptDC::GetCharHeight() const +wxCoord wxPostScriptDCImpl::GetCharHeight() const { if (m_font.Ok()) return m_font.GetPointSize(); @@ -1832,16 +1966,44 @@ wxCoord wxPostScriptDC::GetCharHeight() const return 12; } -void wxPostScriptDC::DoGetTextExtent(const wxString& string, +void wxPostScriptDCImpl::PsPrint( const wxString& str ) +{ + const wxCharBuffer psdata(str.utf8_str()); + + wxPostScriptPrintNativeData *data = + (wxPostScriptPrintNativeData *) m_printData.GetNativeData(); + + switch (m_printData.GetPrintMode()) + { +#if wxUSE_STREAMS + // append to output stream + case wxPRINT_MODE_STREAM: + { + wxOutputStream* outputstream = data->GetOutputStream(); + wxCHECK_RET( outputstream, wxT("invalid outputstream") ); + outputstream->Write( psdata, strlen( psdata ) ); + } + break; +#endif // wxUSE_STREAMS + + // save data into file + default: + wxCHECK_RET( m_pstream, wxT("invalid postscript dc") ); + fwrite( psdata, 1, strlen( psdata ), m_pstream ); + } +} + +void wxPostScriptDCImpl::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, wxCoord *descent, wxCoord *externalLeading, - wxFont *theFont ) const + const wxFont *theFont ) const { - wxFont *fontToUse = theFont; + const wxFont *fontToUse = theFont; - if (!fontToUse) fontToUse = (wxFont*) &m_font; + if (!fontToUse) fontToUse = &m_font; - wxCHECK_RET( fontToUse, wxT("GetTextExtent: no font defined") ); + const float fontSize = + fontToUse->GetPointSize() * GetFontPointSizeAdjustment(72.0); if (string.empty()) { @@ -1856,20 +2018,19 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, const wxWX2MBbuf strbuf = string.mb_str(); + // conversion failed (non e.g. ISO characters) + if ( !strbuf ) + return; + #if !wxUSE_AFM_FOR_POSTSCRIPT /* Provide a VERY rough estimate (avoid using it). * Produces accurate results for mono-spaced font * such as Courier (aka wxMODERN) */ - int height = 12; - if (fontToUse) - { - height = fontToUse->GetPointSize(); - } if ( x ) - *x = strlen (strbuf) * height * 72 / 120; + *x = strlen (strbuf) * fontSize * 72.0 / 120.0; if ( y ) - *y = (wxCoord) (height * 1.32); /* allow for descender */ + *y = (wxCoord) (fontSize * 1.32); /* allow for descender */ if (descent) *descent = 0; if (externalLeading) *externalLeading = 0; #else @@ -1891,7 +2052,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, / in 'points' (1/72 of an inch). this should later on be / changed to depend on the mapping mode. / CAVE: the path to the AFM files must be set before calling this - / function. this is usually done by a call like the following: + / fun3B3Bction. this is usually done by a call like the following: / wxSetAFMPath("d:\\wxw161\\afm\\"); / / example: @@ -2123,22 +2284,22 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, / these values from AFM files, too. Maybe later ... */ // NB: casts to int are needed to suppress gcc 3.3 warnings - lastWidths[196] = lastWidths[(int)'A']; // Ä - lastWidths[228] = lastWidths[(int)'a']; // ä - lastWidths[214] = lastWidths[(int)'O']; // Ö - lastWidths[246] = lastWidths[(int)'o']; // ö - lastWidths[220] = lastWidths[(int)'U']; // Ü - lastWidths[252] = lastWidths[(int)'u']; // ü - lastWidths[223] = lastWidths[(int)251]; // ß + lastWidths[196] = lastWidths[(int)'A']; // U+00C4 A Umlaute + lastWidths[228] = lastWidths[(int)'a']; // U+00E4 a Umlaute + lastWidths[214] = lastWidths[(int)'O']; // U+00D6 O Umlaute + lastWidths[246] = lastWidths[(int)'o']; // U+00F6 o Umlaute + lastWidths[220] = lastWidths[(int)'U']; // U+00DC U Umlaute + lastWidths[252] = lastWidths[(int)'u']; // U+00FC u Umlaute + lastWidths[223] = lastWidths[(int)251]; // U+00DF eszett (scharfes s) /* JC: calculate UnderlineThickness/UnderlinePosition */ // VS: dirty, but is there any better solution? double *pt; pt = (double*) &m_underlinePosition; - *pt = LogicalToDeviceYRel((wxCoord)(UnderlinePosition * fontToUse->GetPointSize())) / 1000.0f; + *pt = YLOG2DEVREL((wxCoord)(UnderlinePosition * fontSize)) / 1000.0f; pt = (double*) &m_underlineThickness; - *pt = LogicalToDeviceYRel((wxCoord)(UnderlineThickness * fontToUse->GetPointSize())) / 1000.0f; + *pt = YLOG2DEVREL((wxCoord)(UnderlineThickness * fontSize)) / 1000.0f; } @@ -2148,7 +2309,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, / string. they are given in 1/1000 of the size! */ long sum=0; - wxCoord height=Size; /* by default */ + float height=fontSize; /* by default */ unsigned char *p; for(p=(unsigned char *)wxMBSTRINGCAST strbuf; *p; p++) { @@ -2164,7 +2325,7 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, } double widthSum = sum; - widthSum *= Size; + widthSum *= fontSize; widthSum /= 1000.0F; /* add descender to height (it is usually a negative value) */ @@ -2179,14 +2340,14 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, if ( x ) *x = (wxCoord)widthSum; if ( y ) - *y = height; + *y = (wxCoord)height; /* return other parameters */ if (descent) { if(lastDescender!=INT_MIN) { - *descent = (wxCoord)(((-lastDescender)/1000.0F) * Size); /* MATTHEW: forgot scale */ + *descent = (wxCoord)(((-lastDescender)/1000.0F) * fontSize); /* MATTHEW: forgot scale */ } else { @@ -2200,66 +2361,6 @@ void wxPostScriptDC::DoGetTextExtent(const wxString& string, // Use AFM } -// print postscript datas via required method (file, stream) -void wxPostScriptDC::DoPsPrintfFormat(const wxChar *fmt, ... ) -{ - va_list argptr; - va_start(argptr, fmt); - - PsPrint( wxString::FormatV( fmt, argptr ) ); -} - -void wxPostScriptDC::PsPrint( const wxString& str ) -{ - wxWX2MBbuf psdata(str.mb_str(wxConvUTF8)); - - wxPostScriptPrintNativeData *data = - (wxPostScriptPrintNativeData *) m_printData.GetNativeData(); - - switch (m_printData.GetPrintMode()) - { -#if wxUSE_STREAMS - // append to output stream - case wxPRINT_MODE_STREAM: - { - wxOutputStream* outputstream = data->GetOutputStream(); - wxCHECK_RET( outputstream, wxT("invalid outputstream") ); - outputstream->Write( psdata, strlen( psdata ) ); - } - break; -#endif // wxUSE_STREAMS - - // save data into file - default: - wxCHECK_RET( m_pstream, wxT("invalid postscript dc") ); - fwrite( psdata, 1, strlen( psdata ), m_pstream ); - } -} - -void wxPostScriptDC::PsPrint( int ch ) -{ - wxPostScriptPrintNativeData *data = - (wxPostScriptPrintNativeData *) m_printData.GetNativeData(); - - switch (m_printData.GetPrintMode()) - { -#if wxUSE_STREAMS - // append to output stream - case wxPRINT_MODE_STREAM: - { - wxOutputStream* outputstream = data->GetOutputStream(); - wxCHECK_RET( outputstream, wxT("invalid outputstream") ); - outputstream->PutC( (char)ch ); - } - break; -#endif // wxUSE_STREAMS - - // save data into file - default: - wxCHECK_RET( m_pstream, wxT("invalid postscript dc") ); - fputc( ch, m_pstream ); - } -} #endif // wxUSE_PRINTING_ARCHITECTURE && wxUSE_POSTSCRIPT