simplify marker code

4 files changed, 34 insertions, 81 deletions

diff --git a/tksao/frame/circle.C b/tksao/frame/circle.C
index 1595fe1..110ee97 100644
--- a/tksao/frame/circle.C
+++ b/tksao/frame/circle.C
@@ -216,22 +216,11 @@ void Circle::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky,
   listPre(str, sys, sky, ptr, strip, 0);
   
   str << type_ << '(';
-  switch (sys) {
-  case Coord::IMAGE:
-  case Coord::PHYSICAL:
-  case Coord::DETECTOR:
-  case Coord::AMPLIFIER:
-    ptr->listFromRef(str,center,sys);
-    str << ',';
-    ptr->listLenFromRef(str,annuli_[0][0],sys);
-    break;
-  default:
-    ptr->listFromRef(str,center,sys,sky,format);
-    str << ',';
-    ptr->listLenFromRef(str,annuli_[0][0],sys,Coord::ARCSEC);
-    if (ptr->hasWCSCel(sys))
-      str << '"';
-  }
+  ptr->listFromRef(str,center,sys,sky,format);
+  str << ',';
+  ptr->listLenFromRef(str,annuli_[0][0],sys,Coord::ARCSEC);
+  if (ptr->hasWCSCel(sys))
+    str << '"';
   str << ')';
 
   listPost(str, conj, strip);
@@ -324,6 +313,7 @@ void Circle::listPros(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky,
     str << ' ';
     ptr->listLenFromRef(str,annuli_[0][0],sys,Coord::ARCSEC);
     str << '"';
+    break;
   }
 
   listProsPost(str, strip);
diff --git a/tksao/frame/projection.C b/tksao/frame/projection.C
index eac6ad7..998ee0f 100644
--- a/tksao/frame/projection.C
+++ b/tksao/frame/projection.C
@@ -338,42 +338,26 @@ void Projection::analysisPlot2d(char* xname, char* yname,
 void Projection::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky,
 		      Coord::SkyFormat format, int conj, int strip)
 {
-  if (!strip) {
-    FitsImage* ptr = parent->findFits(sys,center);
-    listPre(str, sys, sky, ptr, strip, 1);
-
-    double rr = ptr->mapLenFromRef(width,sys,Coord::ARCSEC);
-
-    str << type_ << '(';
-    switch (sys) {
-    case Coord::IMAGE:
-    case Coord::PHYSICAL:
-    case Coord::DETECTOR:
-    case Coord::AMPLIFIER:
-      str << setprecision(parent->precLinear_)
-	  << ptr->mapFromRef(p1,sys) << ',' << ptr->mapFromRef(p2,sys) << ',' 
-	  << setprecision(parent->precLenLinear_) << rr;
-      break;
-    default:
-      listWCS(ptr,p1,sys,sky,format);
-      str << ra << ',' << dec << ',';
-      listWCS(ptr,p2,sys,sky,format);
-      str << ra << ',' << dec << ',';
-
-      if (ptr->hasWCSCel(sys)) {
-	str << setprecision(parent->precArcsec_) << fixed << rr << '"';
-	str.unsetf(ios_base::floatfield);
-      }
-      else
-	str << setprecision(parent->precLenLinear_) << rr;
-    }
-    str  << ')';
-
-    if (conj)
-      str << " ||";
-
-    listProperties(str, 0);
-  }
+  if (strip)
+    return;
+  
+  FitsImage* ptr = parent->findFits(sys,center);
+  listPre(str, sys, sky, ptr, strip, 1);
+
+  str << type_ << '(';
+  ptr->listFromRef(str,p1,sys,sky,format);
+  str << ',';
+  ptr->listFromRef(str,p2,sys,sky,format);
+  str << ',';
+  ptr->listLenFromRef(str,width,sys,Coord::ARCSEC);
+  if (ptr->hasWCSCel(sys))
+    str << '"';
+  str  << ')';
+
+  if (conj)
+    str << " ||";
+
+  listProperties(str, 0);
 }
 
 void Projection::listXML(ostream& str, Coord::CoordSystem sys,
diff --git a/tksao/frame/ruler.C b/tksao/frame/ruler.C
index d2e60a0..f45bf7d 100644
--- a/tksao/frame/ruler.C
+++ b/tksao/frame/ruler.C
@@ -491,20 +491,9 @@ void Ruler::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky,
     listPre(str, sys, sky, ptr, strip, 1);
 
     str << type_ << '(';
-    switch (sys) {
-    case Coord::IMAGE:
-    case Coord::PHYSICAL:
-    case Coord::DETECTOR:
-    case Coord::AMPLIFIER:
-      str << setprecision(parent->precLinear_)
-	  << ptr->mapFromRef(p1,sys) << ',' << ptr->mapFromRef(p2,sys);
-      break;
-    default:
-      listWCS(ptr,p1,sys,sky,format);
-      str << ra << ',' << dec << ',';
-      listWCS(ptr,p2,sys,sky,format);
-      str << ra << ',' << dec;
-    }
+    ptr->listFromRef(str,p1,sys,sky,format);
+    str << ',';
+    ptr->listFromRef(str,p2,sys,sky,format);
     str  << ')';
 
     if (conj)
diff --git a/tksao/frame/text.C b/tksao/frame/text.C
index 98cf86c..bffb1fa 100644
--- a/tksao/frame/text.C
+++ b/tksao/frame/text.C
@@ -218,17 +218,7 @@ void Text::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky,
     listPre(str, sys, sky, ptr, strip, 1);
 
     str << type_ << '(';
-    switch (sys) {
-    case Coord::IMAGE:
-    case Coord::PHYSICAL:
-    case Coord::DETECTOR:
-    case Coord::AMPLIFIER:
-      str << setprecision(parent->precLinear_) << ptr->mapFromRef(center,sys);
-      break;
-    default:
-      listWCS(ptr,center,sys,sky,format);
-      str << ra << ',' << dec;
-    }
+    ptr->listFromRef(str,center,sys,sky,format);
     str  << ')';
     
     if (conj)
@@ -278,13 +268,13 @@ void Text::listSAOtng(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky,
   case Coord::PHYSICAL:
   case Coord::DETECTOR:
   case Coord::AMPLIFIER:
-    str << setprecision(parent->precLinear_)
-	<< ptr->mapFromRef(center,Coord::IMAGE) << ", \"" << text << "\"";
+    ptr->listFromRef(str,center,Coord::IMAGE);
     break;
   default:
-    listWCS(ptr,center,sys,sky,format);
-    str << ra << ',' << dec << ", \"" << text << "\"";
+    ptr->listFromRef(str,center,sys,sky,format);
+    break;
   }
+  str << ", \"" << text << "\"";
   str << ')';
   
   listSAOtngPost(str, strip);