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 | |
parent | f689813804f73c179e5053b2fc9d4dd4cf621bb4 (diff) | |
download | blt-fac94d1e0c1313892a0b3578e875300139f52272.zip blt-fac94d1e0c1313892a0b3578e875300139f52272.tar.gz blt-fac94d1e0c1313892a0b3578e875300139f52272.tar.bz2 |
clean up macosx code supporting fill
-rw-r--r-- | tksao/frame/baseellipse.C | 16 | ||||
-rw-r--r-- | tksao/frame/baseellipse.h | 2 | ||||
-rw-r--r-- | tksao/frame/circle.C | 7 | ||||
-rw-r--r-- | tksao/frame/circle.h | 2 | ||||
-rw-r--r-- | tksao/frame/ellipse.C | 7 | ||||
-rw-r--r-- | tksao/frame/ellipse.h | 2 |
6 files changed, 19 insertions, 17 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() diff --git a/tksao/frame/baseellipse.h b/tksao/frame/baseellipse.h index ec97144..6d525f4 100644 --- a/tksao/frame/baseellipse.h +++ b/tksao/frame/baseellipse.h @@ -64,7 +64,7 @@ class BaseEllipse : public BaseMarker { #ifdef MAC_OSX_TK void renderMACOSX(); virtual void renderMACOSXCircleDraw(Vector&, double, float, float); - virtual void renderMACOSXEllipseArcDraw(Vector&, Vector&, Vector&, Vector&); + virtual void renderMACOSXEllipseDraw(); #endif #ifdef __WIN32 void renderWIN32(); diff --git a/tksao/frame/circle.C b/tksao/frame/circle.C index 4e111c1..02cfe40 100644 --- a/tksao/frame/circle.C +++ b/tksao/frame/circle.C @@ -103,13 +103,12 @@ void Circle::renderMACOSXCircleDraw(Vector& cc, double l, float a1, float a2) macosxDrawArc(cc, l, a1, a2); } -void Circle::renderMACOSXEllipseArcDraw(Vector& tt0, Vector& xx1, - Vector& xx2, Vector& tt1) +void Circle::renderMACOSXEllipseDraw() { if (fill_) - macosxFillCurve(tt0, xx1, xx2, tt1); + macosxFill(); else - macosxDrawCurve(tt0, xx1, xx2, tt1); + macosxStroke(); } #endif diff --git a/tksao/frame/circle.h b/tksao/frame/circle.h index 2ce4e2b..c6e6bb6 100644 --- a/tksao/frame/circle.h +++ b/tksao/frame/circle.h @@ -20,7 +20,7 @@ class Circle : public BaseEllipse { #ifdef MAC_OSX_TK void renderMACOSXCircleDraw(Vector&, double, float, float); - void renderMACOSXEllipseArcDraw(Vector&, Vector&, Vector&, Vector&); + void renderMACOSXEllipseDraw(); #endif #ifdef __WIN32 diff --git a/tksao/frame/ellipse.C b/tksao/frame/ellipse.C index 55bdc78..1c887fc 100644 --- a/tksao/frame/ellipse.C +++ b/tksao/frame/ellipse.C @@ -91,13 +91,12 @@ void Ellipse::renderMACOSXCircleDraw(Vector& cc, double l, float a1, float a2) macosxDrawArc(cc, l, a1, a2); } -void Ellipse::renderMACOSXEllipseArcDraw(Vector& tt0, Vector& xx1, - Vector& xx2, Vector& tt1) +void Ellipse::renderMACOSXEllipseDraw() { if (fill_) - macosxFillCurve(tt0, xx1, xx2, tt1); + macosxFill(); else - macosxDrawCurve(tt0, xx1, xx2, tt1); + macosxStroke(); } #endif diff --git a/tksao/frame/ellipse.h b/tksao/frame/ellipse.h index 3390e55..44cbdec 100644 --- a/tksao/frame/ellipse.h +++ b/tksao/frame/ellipse.h @@ -20,7 +20,7 @@ class Ellipse : public BaseEllipse { #ifdef MAC_OSX_TK void renderMACOSXCircleDraw(Vector&, double, float, float); - void renderMACOSXEllipseArcDraw(Vector&, Vector&, Vector&, Vector&); + void renderMACOSXEllipseDraw(); #endif #ifdef __WIN32 |