summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tksao/frame/frmarker.C2
-rw-r--r--tksao/frame/ruler.C14
-rw-r--r--tksao/frame/ruler.h4
3 files changed, 10 insertions, 10 deletions
diff --git a/tksao/frame/frmarker.C b/tksao/frame/frmarker.C
index d2e2ab1..bd71461 100644
--- a/tksao/frame/frmarker.C
+++ b/tksao/frame/frmarker.C
@@ -2156,7 +2156,7 @@ void Base::getMarkerRulerSystemCmd(int id)
Tcl_AppendResult(interp, " ", NULL);
printCoordSystem(((Ruler*)mm)->getDistSystem());
Tcl_AppendResult(interp, " ", NULL);
- printDistFormat(((Ruler*)mm)->getDistDist());
+ printDistFormat(((Ruler*)mm)->getDistFormat());
return;
}
mm=mm->next();
diff --git a/tksao/frame/ruler.C b/tksao/frame/ruler.C
index fc42870..f423118 100644
--- a/tksao/frame/ruler.C
+++ b/tksao/frame/ruler.C
@@ -14,7 +14,7 @@ Ruler::Ruler(const Ruler& a) : BaseLine(a)
skyFrame = a.skyFrame;
dist = a.dist;
distSystem = a.distSystem;
- distDist = a.distDist;
+ distFormat = a.distFormat;
strncpy(distSpec, a.distSpec, 32);
}
@@ -31,7 +31,7 @@ Ruler::Ruler(Base* p, const Vector& ptr1, const Vector& ptr2,
skyFrame = sky;
dist = 0;
distSystem = distsys;
- distDist = distformat;
+ distFormat = distformat;
// strncpy(distSpec, spec, 32);
distSpec[0] = '\0';
@@ -297,7 +297,7 @@ void Ruler::updateHandles()
Vector a = ptr->mapFromRef(p1,coordSystem,skyFrame);
Vector b = ptr->mapFromRef(p2,coordSystem,skyFrame);
p3 = ptr->mapToRef(Vector(b[0],a[1]),coordSystem,skyFrame);
- dist = ptr->mapDistFromRef(p2, p1, distSystem, distDist);
+ dist = ptr->mapDistFromRef(p2, p1, distSystem, distFormat);
// generate handles in canvas coords
handle[0] = parent->mapFromRef(p1,Coord::CANVAS);
@@ -431,7 +431,7 @@ void Ruler::setCoordSystem(Coord::CoordSystem sys, Coord::SkyFrame sky,
coordSystem = sys;
skyFrame = sky;
distSystem = dsys;
- distDist = dist;
+ distFormat = dist;
updateBBox();
}
@@ -460,7 +460,7 @@ void Ruler::distToStr(ostringstream& str)
break;
default:
if (parent->findFits()->hasWCSCel(distSystem))
- switch (distDist) {
+ switch (distFormat) {
case Coord::DEGREE:
str << " deg";
break;
@@ -521,7 +521,7 @@ void Ruler::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky,
str << " ruler=";
coord.listCoordSystem(str, coordSystem, skyFrame, ptr);
str << ' ';
- coord.listDistSystem(str, distSystem, distDist, ptr);
+ coord.listDistSystem(str, distSystem, distFormat, ptr);
listProperties(str, 0);
}
}
@@ -539,7 +539,7 @@ void Ruler::listXML(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky,
sysstr << ends;
ostringstream diststr;
- coord.listDistSystem(diststr, distSystem, distDist, ptr);
+ coord.listDistSystem(diststr, distSystem, distFormat, ptr);
diststr << ends;
XMLRowInit();
diff --git a/tksao/frame/ruler.h b/tksao/frame/ruler.h
index 3068c13..4b6c016 100644
--- a/tksao/frame/ruler.h
+++ b/tksao/frame/ruler.h
@@ -14,7 +14,7 @@ private:
Coord::SkyFrame skyFrame;
double dist;
Coord::CoordSystem distSystem;
- Coord::DistFormat distDist;
+ Coord::DistFormat distFormat;
char distSpec[32];
private:
@@ -65,7 +65,7 @@ public:
Coord::SkyFrame getSkyFrame() {return skyFrame;}
Coord::CoordSystem getDistSystem() {return distSystem;}
- Coord::DistFormat getDistDist() {return distDist;}
+ Coord::DistFormat getDistFormat() {return distFormat;}
void list(ostream&, Coord::CoordSystem, Coord::SkyFrame, Coord::SkyFormat, int, int);
void listXML(ostream&, Coord::CoordSystem, Coord::SkyFrame, Coord::SkyFormat);