update marker precision

8 files changed, 56 insertions, 32 deletions

diff --git a/tksao/frame/annulus.C b/tksao/frame/annulus.C
index ce83c92..4992e53 100644
--- a/tksao/frame/annulus.C
+++ b/tksao/frame/annulus.C
@@ -344,12 +344,12 @@ void Annulus::listSAOimage(ostream& str, int strip)
   FitsImage* ptr = parent->findFits();
   listSAOimagePre(str);
 
-  Vector vv = ptr->mapFromRef(center,Coord::IMAGE);
-  str << type_ << '(' << setprecision(parent->precLinear_) << vv;
-  for (int ii=0; ii<numAnnuli_; ii++) {
-    double rr = ptr->mapLenFromRef(annuli_[ii][0],Coord::IMAGE);
-    str << ',' << rr;
-  }
+  str << type_ << '('
+      << setprecision(parent->precLinear_)
+      << ptr->mapFromRef(center,Coord::IMAGE);
+  str << setprecision(parent->precLenLinear_);
+  for (int ii=0; ii<numAnnuli_; ii++)
+    str << ',' << ptr->mapLenFromRef(annuli_[ii][0],Coord::IMAGE);
   str << ')';
 
   listSAOimagePost(str, strip);
diff --git a/tksao/frame/box.C b/tksao/frame/box.C
index ee9a084..3dee52f 100644
--- a/tksao/frame/box.C
+++ b/tksao/frame/box.C
@@ -441,9 +441,12 @@ void Box::listSAOimage(ostream& str, int strip)
   FitsImage* ptr = parent->findFits();
   listSAOimagePre(str);
 
-  Vector vv = ptr->mapFromRef(center,Coord::IMAGE);
-  str << type_ << '(' << setprecision(parent->precLinear_) << vv << ','
+  str << type_ << '('
+      << setprecision(parent->precLinear_)
+      << ptr->mapFromRef(center,Coord::IMAGE) << ','
+      << setprecision(parent->precLenLinear_)
       << annuli_[0] << ','
+      << setprecision(parent->precAngle_)
       << radToDeg(angle) << ')';
 
   listSAOimagePost(str, strip);
diff --git a/tksao/frame/boxannulus.C b/tksao/frame/boxannulus.C
index 07c5c9e..884681e 100644
--- a/tksao/frame/boxannulus.C
+++ b/tksao/frame/boxannulus.C
@@ -412,13 +412,22 @@ void BoxAnnulus::listSAOimage(ostream& str, int strip)
   listSAOimagePre(str);
 
   for (int ii=0; ii<numAnnuli_; ii++) {
-    Vector vv = ptr->mapFromRef(center,Coord::IMAGE);
-    str << "box(" << setprecision(parent->precLinear_) << vv << ','
-        << annuli_[ii] << ',' << radToDeg(angle) << ')';
+    str << "box("
+	<< setprecision(parent->precLinear_)
+	<< ptr->mapFromRef(center,Coord::IMAGE) << ','
+	<< setprecision(parent->precLenLinear_)
+        << annuli_[ii] << ','
+	<< setprecision(parent->precAngle_)
+	<< radToDeg(angle) << ')';
 
     if (ii!=0)
-      str << " & !box(" << setprecision(parent->precLinear_) << vv << ','
-          << annuli_[ii-1] << ',' << radToDeg(angle) << ')';
+      str << " & !box("
+	  << setprecision(parent->precLinear_)
+	  << ptr->mapFromRef(center,Coord::IMAGE) << ','
+	  << setprecision(parent->precLenLinear_)
+          << annuli_[ii-1] << ','
+	  << setprecision(parent->precAngle_)
+	  << radToDeg(angle) << ')';
 
     listSAOimagePost(str, strip);
   }
diff --git a/tksao/frame/circle.C b/tksao/frame/circle.C
index f28b02b..46df25e 100644
--- a/tksao/frame/circle.C
+++ b/tksao/frame/circle.C
@@ -387,9 +387,11 @@ void Circle::listSAOimage(ostream& str, int strip)
   FitsImage* ptr = parent->findFits();
   listSAOimagePre(str);
 
-  Vector vv = ptr->mapFromRef(center,Coord::IMAGE);
-  str << type_ << '(' << setprecision(parent->precLinear_) << vv << ','
-      << setprecision(parent->precLenLinear_) << annuli_[0][0] << ')';
+  str << type_ << '('
+      << setprecision(parent->precLinear_)
+      << ptr->mapFromRef(center,Coord::IMAGE) << ','
+      << setprecision(parent->precLenLinear_)
+      << annuli_[0][0] << ')';
 
   listSAOimagePost(str, strip);
 }
diff --git a/tksao/frame/ellipse.C b/tksao/frame/ellipse.C
index 5e8f9e7..29a2f08 100644
--- a/tksao/frame/ellipse.C
+++ b/tksao/frame/ellipse.C
@@ -418,11 +418,13 @@ void Ellipse::listSAOimage(ostream& str, int strip)
   FitsImage* ptr = parent->findFits();
   listSAOimagePre(str);
 
-  Vector vv = ptr->mapFromRef(center,Coord::IMAGE);
   str << type_ << '('
-      << setprecision(parent->precLinear_) << vv << ','
-      << setprecision(parent->precLinear_) << annuli_[0] << ','
-      << setprecision(parent->precAngle_) << radToDeg(angle) << ')';
+      << setprecision(parent->precLinear_)
+      << ptr->mapFromRef(center,Coord::IMAGE) << ','
+      << setprecision(parent->precLenLinear_)
+      << annuli_[0] << ','
+      << setprecision(parent->precAngle_)
+      << radToDeg(angle) << ')';
 
   listSAOimagePost(str, strip);
 }
diff --git a/tksao/frame/ellipseannulus.C b/tksao/frame/ellipseannulus.C
index d0f7a03..df7cb63 100644
--- a/tksao/frame/ellipseannulus.C
+++ b/tksao/frame/ellipseannulus.C
@@ -382,13 +382,22 @@ void EllipseAnnulus::listSAOimage(ostream& str, int strip)
   listSAOimagePre(str);
 
   for (int ii=0; ii<numAnnuli_; ii++) {
-    Vector vv = ptr->mapFromRef(center,Coord::IMAGE);
-    str << "ellipse(" << setprecision(parent->precLinear_) << vv << ','
-        << annuli_[ii] << ',' << radToDeg(angle) << ')';
+    str << "ellipse("
+	<< setprecision(parent->precLinear_)
+	<< ptr->mapFromRef(center,Coord::IMAGE) << ','
+	<< setprecision(parent->precLenLinear_)
+        << annuli_[ii] << ','
+	<< setprecision(parent->precAngle_)
+	<< radToDeg(angle) << ')';
 
     if (ii!=0)
-      str << " & !ellipse(" << setprecision(parent->precLinear_) << vv << ','
-          << annuli_[ii-1] << ',' << radToDeg(angle) << ')';
+      str << " & !ellipse("
+	  << setprecision(parent->precLinear_)
+	  << ptr->mapFromRef(center,Coord::IMAGE) << ','
+	  << setprecision(parent->precLenLinear_)
+          << annuli_[ii-1] << ','
+	  << setprecision(parent->precAngle_)
+	  << radToDeg(angle) << ')';
 
     listSAOimagePost(str, strip);
   }
diff --git a/tksao/frame/point.C b/tksao/frame/point.C
index f5e88f9..430acfd 100644
--- a/tksao/frame/point.C
+++ b/tksao/frame/point.C
@@ -903,10 +903,9 @@ void Point::listSAOimage(ostream& str, int strip)
   FitsImage* ptr = parent->findFits();
   listSAOimagePre(str);
 
-  // all coords are in image coords
-
-  Vector vv = ptr->mapFromRef(center,Coord::IMAGE);
-  str << type_ << '(' << setprecision(parent->precLinear_) << vv << ')';
+  str << type_ << '('
+      << setprecision(parent->precLinear_)
+      << ptr->mapFromRef(center,Coord::IMAGE) << ')';
 
   listSAOimagePost(str, strip);
 }
diff --git a/tksao/frame/polygon.C b/tksao/frame/polygon.C
index c2d63ec..e09a454 100644
--- a/tksao/frame/polygon.C
+++ b/tksao/frame/polygon.C
@@ -565,12 +565,12 @@ void Polygon::listSAOimage(ostream& str, int strip)
       str << ',';
     first=0;
 
-    Vector vv = ptr->mapFromRef(vertex.current()->vector*mm,Coord::IMAGE);
-    str << setprecision(parent->precLinear_) << vv;
+    str << setprecision(parent->precLinear_)
+	<< ptr->mapFromRef(vertex.current()->vector*mm,Coord::IMAGE);
   }
   while (vertex.next());
-
   str << ')';
+
   listSAOimagePost(str, strip);
 }