diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2017-03-19 19:34:15 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2017-03-19 19:34:15 (GMT) |
| commit | fac94d1e0c1313892a0b3578e875300139f52272 (patch) | |
| tree | efd6af78dad86cee96400282396c5fa39f9a71e3 /tksao/frame/baseellipse.C | |
| parent | f689813804f73c179e5053b2fc9d4dd4cf621bb4 (diff) | |
| download | blt-fac94d1e0c1313892a0b3578e875300139f52272.zip blt-fac94d1e0c1313892a0b3578e875300139f52272.tar.gz blt-fac94d1e0c1313892a0b3578e875300139f52272.tar.bz2 | |
clean up macosx code supporting fill
Diffstat (limited to 'tksao/frame/baseellipse.C')
| -rw-r--r-- | tksao/frame/baseellipse.C | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/tksao/frame/baseellipse.C b/tksao/frame/baseellipse.C index e99d120..6e5ce53 100644 --- a/tksao/frame/baseellipse.C +++ b/tksao/frame/baseellipse.C @@ -594,6 +594,8 @@ void BaseEllipse::renderMACOSXEllipse() a2 += M_TWOPI; for (int ii=0; ii<numAnnuli_; ii++) { + macosxNewPath(); + Vector r = annuli_[ii]; int s1 =0; @@ -611,10 +613,17 @@ void BaseEllipse::renderMACOSXEllipse() if (s1&&s2) s1=s2=0; + + renderMACOSXEllipseDraw(); } } } +void BaseEllipse::renderMACOSXEllipseDraw() +{ + macosxStroke(); +} + void BaseEllipse::renderMACOSXEllipsePrep(double a1, double a2, double b1, double b2, Vector& rr) @@ -659,12 +668,7 @@ void BaseEllipse::renderMACOSXEllipseArc(double a1, double a2, Vector& rr) Vector xx2 = fwdMap(x2*FlipY(),Coord::CANVAS); Vector tt1 = fwdMap(t1*FlipY(),Coord::CANVAS); - renderMACOSXEllipseArcDraw(tt0, xx1, xx2, tt1); -} - -void BaseEllipse::renderMACOSXEllipseArcDraw(Vector& tt0, Vector& xx1, Vector& xx2, Vector& tt1) -{ - macosxDrawCurve(tt0, xx1, xx2, tt1); + macosxCurve(tt0, xx1, xx2, tt1); } void BaseEllipse::renderMACOSXInclude() |