summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Joye <wjoye@cfa.harvard.edu>2017-03-13 17:00:41 (GMT)
committerWilliam Joye <wjoye@cfa.harvard.edu>2017-03-13 17:00:41 (GMT)
commitadb53d5de6f34f5a84bc24a850f5e9f25a6f28b1 (patch)
tree8abd47beaf49a6cf07f5faf07138a3e148f67780
parent233845c07587f8f078cc167831b94f2d4692dfcf (diff)
downloadblt-adb53d5de6f34f5a84bc24a850f5e9f25a6f28b1.zip
blt-adb53d5de6f34f5a84bc24a850f5e9f25a6f28b1.tar.gz
blt-adb53d5de6f34f5a84bc24a850f5e9f25a6f28b1.tar.bz2
simplify code
-rw-r--r--tksao/frame/baseellipse.C7
-rw-r--r--tksao/frame/baseellipse.h2
2 files changed, 4 insertions, 5 deletions
diff --git a/tksao/frame/baseellipse.C b/tksao/frame/baseellipse.C
index 3d1897d..6b84669 100644
--- a/tksao/frame/baseellipse.C
+++ b/tksao/frame/baseellipse.C
@@ -44,7 +44,7 @@ void BaseEllipse::renderX(Drawable drawable, Coord::InternalSystem sys,
if (isRound && isScale && isOrient && parent->isAzElZero())
renderXCircle(drawable, sys, ang, mode);
else
- renderXEllipseCurve(drawable, sys, mode);
+ renderXEllipse(drawable, sys, mode);
}
void BaseEllipse::renderXCircle(Drawable drawable, Coord::InternalSystem sys,
@@ -88,9 +88,8 @@ void BaseEllipse::renderXCircleDraw(Drawable drawable, GC lgc, Vector& st,
XDrawArc(display, drawable, lgc, st[0], st[1], size[0], size[1], a1, aa);
}
-void BaseEllipse::renderXEllipseCurve(Drawable drawable,
- Coord::InternalSystem sys,
- RenderMode mode)
+void BaseEllipse::renderXEllipse(Drawable drawable, Coord::InternalSystem sys,
+ RenderMode mode)
{
double a1 = startAng_;
double a2 = stopAng_;
diff --git a/tksao/frame/baseellipse.h b/tksao/frame/baseellipse.h
index 990b3aa..834b584 100644
--- a/tksao/frame/baseellipse.h
+++ b/tksao/frame/baseellipse.h
@@ -13,7 +13,7 @@ class BaseEllipse : public BaseMarker {
void XDrawCurve(Drawable, RenderMode, Vector&, Vector&, Vector&, Vector&);
void renderXCircle(Drawable, Coord::InternalSystem, double, RenderMode);
- void renderXEllipseCurve(Drawable, Coord::InternalSystem, RenderMode);
+ void renderXEllipse(Drawable, Coord::InternalSystem, RenderMode);
void renderXEllipsePrep(Drawable, Coord::InternalSystem, RenderMode,
double, double, double, double, Vector&);
void renderXEllipseArc(Drawable, Coord::InternalSystem, RenderMode,