summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tksao/frame/baseline.C8
-rw-r--r--tksao/frame/baseline.h2
-rw-r--r--tksao/frame/ruler.C21
3 files changed, 11 insertions, 20 deletions
diff --git a/tksao/frame/baseline.C b/tksao/frame/baseline.C
index 81785da..a1c5598 100644
--- a/tksao/frame/baseline.C
+++ b/tksao/frame/baseline.C
@@ -106,14 +106,6 @@ void BaseLine::setPoints(const Vector& v1, const Vector& v2)
doCallBack(CallBack::EDITCB);
}
-void BaseLine::listNonCel(FitsImage* ptr, ostream& str, Coord::CoordSystem sys)
-{
- Vector v1 = ptr->mapFromRef(p1,sys);
- Vector v2 = ptr->mapFromRef(p2,sys);
- str << type_ << '(' << setprecision(parent->precLinear_)
- << v1 << ',' << v2 << ')';
-}
-
// special composite funtionallity
void BaseLine::setComposite(const Matrix& mx, double aa)
diff --git a/tksao/frame/baseline.h b/tksao/frame/baseline.h
index d53550b..e282782 100644
--- a/tksao/frame/baseline.h
+++ b/tksao/frame/baseline.h
@@ -26,8 +26,6 @@ protected:
void updateHandles() {}
- virtual void listNonCel(FitsImage*, ostream&, Coord::CoordSystem);
-
public:
BaseLine(Base* p, const Vector& ptr1, const Vector& ptr2);
BaseLine(Base* p, const Vector& ptr1, const Vector& ptr2,
diff --git a/tksao/frame/ruler.C b/tksao/frame/ruler.C
index 5900e09..5de7ca3 100644
--- a/tksao/frame/ruler.C
+++ b/tksao/frame/ruler.C
@@ -495,18 +495,19 @@ void Ruler::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky,
case Coord::PHYSICAL:
case Coord::DETECTOR:
case Coord::AMPLIFIER:
- listNonCel(ptr, str, sys);
+ {
+ Vector v1 = ptr->mapFromRef(p1,sys);
+ Vector v2 = ptr->mapFromRef(p2,sys);
+ str << type_ << '(' << setprecision(parent->precLinear_)
+ << v1 << ',' << v2 << ')';
+ }
break;
default:
- if (ptr->hasWCSCel(sys)) {
- str << type_ << '(';
- listWCS(ptr,p1,sys,sky,format);
- str << ra << ',' << dec << ',';
- listWCS(ptr,p2,sys,sky,format);
- str << ra << ',' << dec << ')';
- }
- else
- listNonCel(ptr, str, sys);
+ str << type_ << '(';
+ listWCS(ptr,p1,sys,sky,format);
+ str << ra << ',' << dec << ',';
+ listWCS(ptr,p2,sys,sky,format);
+ str << ra << ',' << dec << ')';
}
if (conj)