suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix EPS bounding box for rects, rrects, and ellipses based on pen width

Browse Source 
svn: r5843
This commit is contained in:
Matthew Flatt 2007-03-30 01:40:41 +00:00
parent cf36c1d856
commit a3edbc9068
1 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/wxcommon/PSDC.cxx
View File

@ -811,6 +811,8 @@ void wxPostScriptDC::DrawRectangle (double x, double y, double width, double hei
}
if (current_pen && current_pen->GetStyle () != wxTRANSPARENT)
{
double pw;
SetPen (current_pen);
pstream->Out("newpath\n");
@ -821,8 +823,14 @@ void wxPostScriptDC::DrawRectangle (double x, double y, double width, double hei
pstream->Out("closepath\n");
pstream->Out("stroke\n");
CalcBoundingBoxClip(XSCALEBND(x), YSCALEBND(y));
CalcBoundingBoxClip(XSCALEBND(x + width), YSCALEBND(y + height));
if (current_pen) {
pw = current_pen->GetWidthF();
pw /= 2;
} else
pw = 0;
CalcBoundingBoxClip(XSCALEBND(x - pw), YSCALEBND(y - pw));
CalcBoundingBoxClip(XSCALEBND(x + width + pw), YSCALEBND(y + height + pw));
}
}
@ -908,8 +916,18 @@ void wxPostScriptDC::DrawRoundedRectangle (double x, double y, double width, dou
pstream->Out("stroke\n");
CalcBoundingBoxClip(XSCALEBND(x), YSCALEBND(y));
CalcBoundingBoxClip(XSCALEBND(x + width), YSCALEBND(y + height));
{
double pw;
if (current_pen) {
pw = current_pen->GetWidthF();
pw /= 2;
} else
pw = 0;
CalcBoundingBoxClip(XSCALEBND(x - pw), YSCALEBND(y - pw));
CalcBoundingBoxClip(XSCALEBND(x + width + pw), YSCALEBND(y + height + pw));
}
}
}
@ -937,9 +955,19 @@ void wxPostScriptDC::DrawEllipse (double x, double y, double width, double heigh
pstream->Out(XSCALE(x + width / 2)); pstream->Out(" "); pstream->Out(YSCALE(y + height / 2)); pstream->Out(" ");
pstream->Out(XSCALEREL(width / 2)); pstream->Out(" "); pstream->Out(YSCALEREL(height / 2)); pstream->Out(" 0 360 ellipse\n");
pstream->Out("stroke\n");
{
double pw;
CalcBoundingBoxClip (XSCALEBND(x), YSCALEBND(y));
CalcBoundingBoxClip (XSCALEBND(x + width), YSCALEBND(y + height));
if (current_pen) {
pw = current_pen->GetWidthF();
pw /= 2;
} else
pw = 0;
CalcBoundingBoxClip(XSCALEBND(x - pw), YSCALEBND(y - pw));
CalcBoundingBoxClip(XSCALEBND(x + width + pw), YSCALEBND(y + height + pw));
}
}
}