/////////////////////////////////////////////////////////////////////////////
-// Name: dcpsg.cpp
+// Name: src/generic/dcpsg.cpp
// Purpose: Generic wxPostScriptDC implementation
// Author: Julian Smart, Robert Roebling, Markus Holzhem
// Modified by:
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "dcpsg.h"
-#endif
-
#include "wx/wxprec.h"
#ifdef __BORLANDC__
#if wxUSE_POSTSCRIPT
-#include "wx/setup.h"
-
#include "wx/dcmemory.h"
#include "wx/utils.h"
#include "wx/intl.h"
#include "wx/paper.h"
#include "wx/filefn.h"
#include "wx/math.h"
+#include "wx/stdpaths.h"
#ifdef __WXMSW__
alpha1 = 0.0;
alpha2 = 360.0;
}
- else if (radius == 0.0)
+ else if ( wxIsNullDouble(radius) )
{
- alpha1 = alpha2 = 0.0;
+ alpha1 =
+ alpha2 = 0.0;
}
else
{
{
wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
- if (sa>=360 || sa<=-360) sa=sa-int(sa/360)*360;
- if (ea>=360 || ea<=-360) ea=ea-int(ea/360)*360;
- if (sa<0) sa+=360;
- if (ea<0) ea+=360;
+ if ( sa >= 360 || sa <= -360 )
+ sa -= int(sa/360)*360;
+ if ( ea >= 360 || ea <=- 360 )
+ ea -= int(ea/360)*360;
+ if ( sa < 0 )
+ sa += 360;
+ if ( ea < 0 )
+ ea += 360;
- if (sa==ea)
+ if ( wxIsSameDouble(sa, ea) )
{
DrawEllipse(x,y,w,h);
return;
/* Draw rectangle anticlockwise */
PsPrintf( wxT("newpath\n")
wxT("%d %d %d 90 180 arc\n")
- wxT("%d %d moveto\n")
+ wxT("%d %d lineto\n")
wxT("%d %d %d 180 270 arc\n")
wxT("%d %d lineto\n")
wxT("%d %d %d 270 0 arc\n")
wxT("closepath\n")
wxT("fill\n"),
LogicalToDeviceX(x + rad), LogicalToDeviceY(y + rad), LogicalToDeviceXRel(rad),
- LogicalToDeviceX(x), LogicalToDeviceY(y + rad),
+ LogicalToDeviceX(x), LogicalToDeviceY(y + height - rad),
LogicalToDeviceX(x + rad), LogicalToDeviceY(y + height - rad), LogicalToDeviceXRel(rad),
LogicalToDeviceX(x + width - rad), LogicalToDeviceY(y + height),
LogicalToDeviceX(x + width - rad), LogicalToDeviceY(y + height - rad), LogicalToDeviceXRel(rad),
/* Draw rectangle anticlockwise */
PsPrintf( wxT("newpath\n")
wxT("%d %d %d 90 180 arc\n")
- wxT("%d %d moveto\n")
+ wxT("%d %d lineto\n")
wxT("%d %d %d 180 270 arc\n")
wxT("%d %d lineto\n")
wxT("%d %d %d 270 0 arc\n")
wxT("closepath\n")
wxT("stroke\n"),
LogicalToDeviceX(x + rad), LogicalToDeviceY(y + rad), LogicalToDeviceXRel(rad),
- LogicalToDeviceX(x), LogicalToDeviceY(y + rad),
+ LogicalToDeviceX(x), LogicalToDeviceY(y + height - rad),
LogicalToDeviceX(x + rad), LogicalToDeviceY(y + height - rad), LogicalToDeviceXRel(rad),
LogicalToDeviceX(x + width - rad), LogicalToDeviceY(y + height),
LogicalToDeviceX(x + width - rad), LogicalToDeviceY(y + height - rad), LogicalToDeviceXRel(rad),
unsigned char* data = image.GetData();
- /* buffer = line = width*rgb(3)*hexa(2)+'\n'(1)+null(1) */
- char* buffer = new char[ w*6+2 ];
+ // size of the buffer = width*rgb(3)*hexa(2)+'\n'
+ wxCharBuffer buffer(w*6 + 1);
int firstDigit, secondDigit;
//rows
for (int j = 0; j < h; j++)
{
- char* bufferindex = buffer;
+ char* bufferindex = buffer.data();
//cols
for (int i = 0; i < w*3; i++)
case wxSHORT_DASH: psdash = short_dashed; break;
case wxLONG_DASH: psdash = wxCoord_dashed; break;
case wxDOT_DASH: psdash = dotted_dashed; break;
+ case wxUSER_DASH:
+ {
+ wxDash *dashes;
+ int nDashes = m_pen.GetDashes (&dashes);
+ PsPrint ("[");
+ for (int i = 0; i < nDashes; ++i)
+ {
+ sprintf( buffer, "%d ", dashes [i] );
+ PsPrint( buffer );
+ }
+ PsPrint ("] 0 setdash\n");
+ psdash = 0;
+ }
+ break;
case wxSOLID:
case wxTRANSPARENT:
default: psdash = "[] 0"; break;
}
- if ( (oldStyle != m_pen.GetStyle()) )
+ if ( psdash && (oldStyle != m_pen.GetStyle()) )
{
PsPrint( psdash );
PsPrint( " setdash\n" );
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 );
void wxPostScriptDC::DoDrawRotatedText( const wxString& text, wxCoord x, wxCoord y, double angle )
{
- if (angle == 0.0)
+ if ( wxIsNullDouble(angle) )
{
DoDrawText(text, x, y);
return;
{
wxCoord uy = (wxCoord)(y + size - m_underlinePosition);
wxCoord w, h;
- char buffer[100];
GetTextExtent(text, &w, &h);
sprintf( buffer,
wxFAIL_MSG( wxT("wxPostScriptDC::SetLogicalFunction not implemented.") );
}
+#if wxUSE_SPLINES
void wxPostScriptDC::DoDrawSpline( wxList *points )
{
wxCHECK_RET( m_ok, wxT("invalid postscript dc") );
wxT("stroke\n"),
LogicalToDeviceX((wxCoord)c), LogicalToDeviceY((wxCoord)d) );
}
+#endif // wxUSE_SPLINES
wxCoord wxPostScriptDC::GetCharWidth() const
{
m_signX = (xLeftRight ? 1 : -1);
m_signY = (yBottomUp ? 1 : -1);
- // FIXME there is no such function in MSW nor in OS2/PM
-#if !defined(__WXMSW__) && !defined(__WXPM__)
ComputeScaleAndOrigin();
-#endif
}
void wxPostScriptDC::SetDeviceOrigin( wxCoord x, wxCoord y )
m_printData.SetFilename(filename);
}
- // FIXME: use fn_str() here under Unicode?
- m_pstream = wxFopen( m_printData.GetFilename().c_str(), wxT("w+") );
+ m_pstream = wxFopen( m_printData.GetFilename(), wxT("w+") );
if (!m_pstream)
{
FILE *afmFile = NULL;
- wxPostScriptPrintNativeData *data =
- (wxPostScriptPrintNativeData *) m_printData.GetNativeData();
-
// Get the directory of the AFM files
wxString afmName;
- if (!data->GetFontMetricPath().empty())
+
+ // VZ: I don't know if the cast always works under Unix but it clearly
+ // never does under Windows where the pointer is
+ // wxWindowsPrintNativeData and so calling GetFontMetricPath() on
+ // it just crashes
+#ifndef __WIN32__
+ wxPostScriptPrintNativeData *data =
+ wxDynamicCast(m_printData.GetNativeData(), wxPostScriptPrintNativeData);
+
+ if (data && !data->GetFontMetricPath().empty())
{
afmName = data->GetFontMetricPath();
afmName << wxFILE_SEP_PATH << name;
- afmFile = wxFopen(afmName,wxT("r"));
}
+#endif // __WIN32__
-#if defined(__UNIX__) && !defined(__VMS__)
- if (afmFile==NULL)
+ if ( !afmName.empty() )
+ afmFile = wxFopen(afmName, wxT("r"));
+
+ if ( !afmFile )
{
+#if defined(__UNIX__) && !defined(__VMS__)
afmName = wxGetDataDir();
+#else // !__UNIX__
+ afmName = wxStandardPaths::Get().GetDataDir();
+#endif // __UNIX__/!__UNIX__
+
afmName << wxFILE_SEP_PATH
#if defined(__LINUX__) || defined(__FREEBSD__)
<< wxT("gs_afm") << wxFILE_SEP_PATH
<< name;
afmFile = wxFopen(afmName,wxT("r"));
}
-#endif
/* 2. open and process the file
/ a short explanation of the AFM format:
projects / wxWidgets.git / blobdiff