diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2018-08-14 17:55:23 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2018-08-14 17:55:23 (GMT) |
| commit | 9029c7aab922217baddcd613fd04a559539418e5 (patch) | |
| tree | 97762613db9e65734ab3f51d5b7bf3a194f55e08 /tksao/frame | |
| parent | c5509c8928cd2e909e706e8989ef647c08c69f10 (diff) | |
| download | blt-9029c7aab922217baddcd613fd04a559539418e5.zip blt-9029c7aab922217baddcd613fd04a559539418e5.tar.gz blt-9029c7aab922217baddcd613fd04a559539418e5.tar.bz2 | |
simplify marker code
Diffstat (limited to 'tksao/frame')
| -rw-r--r-- | tksao/frame/box.C | 11 | ||||
| -rw-r--r-- | tksao/frame/circle.C | 6 | ||||
| -rw-r--r-- | tksao/frame/ellipse.C | 11 |
3 files changed, 17 insertions, 11 deletions
diff --git a/tksao/frame/box.C b/tksao/frame/box.C index a67777b..208c671 100644 --- a/tksao/frame/box.C +++ b/tksao/frame/box.C @@ -271,9 +271,11 @@ void Box::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, case Coord::PHYSICAL: case Coord::DETECTOR: case Coord::AMPLIFIER: - str << setprecision(parent->precLinear_) << ptr->mapFromRef(center,sys) - << ',' - << setprecision(parent->precLenLinear_) << rr << ','; + ptr->listFromRef(str,center,sys); + str << ','; + ptr->listLenFromRef(str,annuli_[0],sys); + str << ','; + parent->listAngleFromRef(str,angle,sys,sky); break; default: listWCS(ptr,center,sys,sky,format); @@ -286,8 +288,9 @@ void Box::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, } else str << setprecision(parent->precLenLinear_) << rr << ',' ; + str << setprecision(parent->precAngle_) << radToDeg(aa); } - str << setprecision(parent->precAngle_) << radToDeg(aa) << ')'; + str << ')'; listPost(str, conj, strip); } diff --git a/tksao/frame/circle.C b/tksao/frame/circle.C index a08acbe..fa1e2e6 100644 --- a/tksao/frame/circle.C +++ b/tksao/frame/circle.C @@ -223,9 +223,9 @@ void Circle::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, case Coord::PHYSICAL: case Coord::DETECTOR: case Coord::AMPLIFIER: - str << setprecision(parent->precLinear_) << ptr->mapFromRef(center,sys) - << ',' - << setprecision(parent->precLenLinear_) << rr; + ptr->listFromRef(str,center,sys); + str << ','; + ptr->listLenFromRef(str,annuli_[0][0],sys); break; default: listWCS(ptr,center,sys,sky,format); diff --git a/tksao/frame/ellipse.C b/tksao/frame/ellipse.C index a5c868a..bfb08f8 100644 --- a/tksao/frame/ellipse.C +++ b/tksao/frame/ellipse.C @@ -245,9 +245,11 @@ void Ellipse::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, case Coord::PHYSICAL: case Coord::DETECTOR: case Coord::AMPLIFIER: - str << setprecision(parent->precLinear_) << ptr->mapFromRef(center,sys) - << ',' - << setprecision(parent->precLenLinear_) << rr << ','; + ptr->listFromRef(str,center,sys); + str << ','; + ptr->listLenFromRef(str,annuli_[0],sys); + str << ','; + parent->listAngleFromRef(str,angle,sys,sky); break; default: listWCS(ptr,center,sys,sky,format); @@ -260,8 +262,9 @@ void Ellipse::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, } else str << setprecision(parent->precLenLinear_) << rr << ',' ; + str << setprecision(parent->precAngle_) << radToDeg(aa); } - str << setprecision(parent->precAngle_) << radToDeg(aa) << ')'; + str << ')'; listPost(str, conj, strip); } |