From 9bd3fedf5223bca4560f4d7a3f3d76d58d944033 Mon Sep 17 00:00:00 2001 From: William Joye Date: Wed, 10 Jan 2018 17:17:38 -0500 Subject: clean up marker code --- tksao/frame/circle.C | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/tksao/frame/circle.C b/tksao/frame/circle.C index d9c3662..72cf71b 100644 --- a/tksao/frame/circle.C +++ b/tksao/frame/circle.C @@ -358,27 +358,20 @@ void Circle::listPros(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, break; default: if (ptr->hasWCSCel(sys)) { + listRADECPros(ptr,center,sys,sky,format); + coord.listProsCoordSystem(str,sys,sky); double rr = ptr->mapLenFromRef(annuli_[0][0],sys,Coord::ARCSEC); + str << "; " << type_ << ' '; switch (format) { case Coord::DEGREES: - { - Vector vv = ptr->mapFromRef(center,sys,sky); - coord.listProsCoordSystem(str,sys,sky); - str << "; " << type_ << ' ' - << setprecision(10) << setunit('d') << vv << ' ' - << setprecision(3) << fixed << rr << '"'; - str.unsetf(ios_base::floatfield); - } + str << ra << 'd' << ' ' << dec << 'd' << ' '; break; case Coord::SEXAGESIMAL: - listRADECPros(ptr,center,sys,sky,format); - coord.listProsCoordSystem(str,sys,sky); - str << "; " << type_ << ' ' - << ra << ' ' << dec << ' ' - << setprecision(3) << fixed << rr << '"'; - str.unsetf(ios_base::floatfield); + str << ra << ' ' << dec << ' '; break; } + str << setprecision(3) << fixed << rr << '"'; + str.unsetf(ios_base::floatfield); } } -- cgit v0.12