From e648fb57d3650612959e48eba7e9e068b50c262f Mon Sep 17 00:00:00 2001 From: William Joye Date: Wed, 10 Jan 2018 17:15:02 -0500 Subject: clean up marker code --- tksao/frame/circle.C | 41 ++++++++--------------------------------- 1 file changed, 8 insertions(+), 33 deletions(-) diff --git a/tksao/frame/circle.C b/tksao/frame/circle.C index afb483d..d9c3662 100644 --- a/tksao/frame/circle.C +++ b/tksao/frame/circle.C @@ -221,24 +221,11 @@ void Circle::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, break; default: if (ptr->hasWCSCel(sys)) { + listRADEC(ptr,center,sys,sky,format); double rr = ptr->mapLenFromRef(annuli_[0][0],sys,Coord::ARCSEC); - switch (format) { - case Coord::DEGREES: - { - Vector vv = ptr->mapFromRef(center,sys,sky); - str << type_ << '(' - << setprecision(10) << vv << ',' - << setprecision(3) << fixed << rr << '"' << ')'; - str.unsetf(ios_base::floatfield); - } - break; - case Coord::SEXAGESIMAL: - listRADEC(ptr,center,sys,sky,format); - str << type_ << '(' << ra << ',' << dec << ',' - << setprecision(3) << fixed << rr << '"' << ')'; - str.unsetf(ios_base::floatfield); - break; - } + str << type_ << '(' << ra << ',' << dec << ',' + << setprecision(3) << fixed << rr << '"' << ')'; + str.unsetf(ios_base::floatfield); } else listNonCel(ptr, str, sys); @@ -340,23 +327,11 @@ void Circle::listSAOtng(ostream& str, break; default: if (ptr->hasWCSCel(sys)) { + listRADEC(ptr,center,sys,sky,format); double rr = ptr->mapLenFromRef(annuli_[0][0],Coord::IMAGE); - switch (format) { - case Coord::DEGREES: - { - Vector vv = ptr->mapFromRef(center,sys,sky); - str << type_ << '(' - << setprecision(10) << vv << ',' - << setprecision(8) << rr << ')'; - } - break; - case Coord::SEXAGESIMAL: - listRADEC(ptr,center,sys,sky,format); - str << type_ << '(' - << ra << ',' << dec << ',' - << setprecision(8) << rr << ')'; - break; - } + str << type_ << '(' + << ra << ',' << dec << ',' + << setprecision(8) << rr << ')'; } } -- cgit v0.12