summaryrefslogtreecommitdiffstats
path: root/tksao/frame/box.C
diff options
context:
space:
mode:
authorWilliam Joye <wjoye@cfa.harvard.edu>2018-01-10 22:20:33 (GMT)
committerWilliam Joye <wjoye@cfa.harvard.edu>2018-01-10 22:20:33 (GMT)
commita71e7f68956e5c1ed8e0a62ae683e3fcacc47851 (patch)
tree3d36bc38afa976c5391abc52ddd5c1412fb2f7a8 /tksao/frame/box.C
parent9bd3fedf5223bca4560f4d7a3f3d76d58d944033 (diff)
downloadblt-a71e7f68956e5c1ed8e0a62ae683e3fcacc47851.zip
blt-a71e7f68956e5c1ed8e0a62ae683e3fcacc47851.tar.gz
blt-a71e7f68956e5c1ed8e0a62ae683e3fcacc47851.tar.bz2
clean up marker code
Diffstat (limited to 'tksao/frame/box.C')
-rw-r--r--tksao/frame/box.C45
1 files changed, 9 insertions, 36 deletions
diff --git a/tksao/frame/box.C b/tksao/frame/box.C
index a314d11..e2d8f87 100644
--- a/tksao/frame/box.C
+++ b/tksao/frame/box.C
@@ -268,27 +268,13 @@ void Box::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky,
break;
default:
if (ptr->hasWCSCel(sys)) {
+ listRADEC(ptr,center,sys,sky,format);
Vector rr = ptr->mapLenFromRef(annuli_[0],sys,Coord::ARCSEC);
double aa = parent->mapAngleFromRef(angle,sys,sky);
- switch (format) {
- case Coord::DEGREES:
- {
- Vector vv = ptr->mapFromRef(center,sys,sky);
- str << type_ << '('
- << setprecision(10) << vv << ','
- << setprecision(3) << fixed << setunit('"') << rr << ',';
- str.unsetf(ios_base::floatfield);
- str << setprecision(8) << radToDeg(aa) << ')';
- }
- break;
- case Coord::SEXAGESIMAL:
- listRADEC(ptr,center,sys,sky,format);
- str << type_ << '(' << ra << ',' << dec << ','
- << setprecision(3) << fixed << setunit('"') << rr << ',';
- str.unsetf(ios_base::floatfield);
- str << setprecision(8) << radToDeg(aa) << ')';
- break;
- }
+ str << type_ << '(' << ra << ',' << dec << ','
+ << setprecision(3) << fixed << setunit('"') << rr << ',';
+ str.unsetf(ios_base::floatfield);
+ str << setprecision(8) << radToDeg(aa) << ')';
}
else
listNonCel(ptr, str, sys);
@@ -397,24 +383,11 @@ void Box::listSAOtng(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky,
break;
default:
if (ptr->hasWCSCel(sys)) {
+ listRADEC(ptr,center,sys,sky,format);
Vector rr = ptr->mapLenFromRef(annuli_[0],Coord::IMAGE);
- switch (format) {
- case Coord::DEGREES:
- {
- Vector vv = ptr->mapFromRef(center,sys,sky);
- str << type_ << '('
- << setprecision(10) << vv << ','
- << setprecision(8) << rr << ','
- << setprecision(8) << radToDeg(angle) << ')';
- }
- break;
- case Coord::SEXAGESIMAL:
- listRADEC(ptr,center,sys,sky,format);
- str << type_ << '(' << ra << ',' << dec << ','
- << setprecision(8) << rr << ','
- << setprecision(8) << radToDeg(angle) << ')';
- break;
- }
+ str << type_ << '(' << ra << ',' << dec << ','
+ << setprecision(8) << rr << ','
+ << setprecision(8) << radToDeg(angle) << ')';
}
}