From 35d46c48df7f685650df576b5191ee5197cb91a1 Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Thu, 4 Jul 2019 14:50:29 -0400
Subject: PLOT3D: simplify code for generating plot3d cursor

---
 ds9/library/cube.tcl      | 28 ++++++++++++++++------------
 tksao/frame/basecommand.C |  6 +++++-
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/ds9/library/cube.tcl b/ds9/library/cube.tcl
index 188d4fb..f4b5df6 100644
--- a/ds9/library/cube.tcl
+++ b/ds9/library/cube.tcl
@@ -14,7 +14,7 @@ proc CubeDef {} {
 
     set cube(lock) none
     set cube(lock,axes) 0
-# axes cnt starts at 0
+    # axes cnt starts at 0
     set cube(system) wcs
     set cube(sky) fk5
     set cube(axes) 123
@@ -71,7 +71,7 @@ proc CubeSlice {ss} {
 
     set dcube(image) $ss
     set dcube(wcs) \
-	[$current(frame) get fits slice from image $cube(system) $cube(sky)]
+	[format $dcube(format) [$current(frame) get fits slice from image $cube(system) $cube(sky)]]
 
     UpdateCube
 }
@@ -266,7 +266,7 @@ proc CubeApply {} {
 
     set dcube(image) $ss
     set dcube(wcs) \
-	[$current(frame) get fits slice from image $cube(system) $cube(sky)]
+	[format $dcube(format) [$current(frame) get fits slice from image $cube(system) $cube(sky)]]
 
     UpdateCube
 }
@@ -299,7 +299,7 @@ proc CubeApplyWCS {} {
 
     set dcube(image) $ss
     set dcube(wcs) \
-	[$current(frame) get fits slice from image $cube(system) $cube(sky)]
+	[format $dcube(format) [$current(frame) get fits slice from image $cube(system) $cube(sky)]]
 
     UpdateCube
 }
@@ -398,14 +398,14 @@ proc CubeDialog {} {
     set dcube(taxis) [ttk::label $f.taxis -text [msgcat::mc {Axis}]]
     set dcube(twcs) \
 	[ttk::label $f.twcs -textvariable dcube(vcoord) -anchor center]
-    set dcube(wcsentry) [ttk::entry $f.slice -textvariable dcube(wcs) -width 10]
+    set dcube(wcsentry) [ttk::entry $f.slice -textvariable dcube(wcs) -width 12]
     bind $dcube(wcsentry) <Return> [list CubeApplyWCS]
     set dcube(slider) \
 	[slider $f.scale 0 100 {} dcube(image) [list CubeApply] 4 10]
 
-# Buttons
+    # Buttons
 
-set f [ttk::frame $w.buttons]
+    set f [ttk::frame $w.buttons]
     ttk::button $f.first -text [msgcat::mc {First}] -width -6 -command CubeFirst
     ttk::button $f.prev -text [msgcat::mc {Previous}] -width -6 \
 	-command CubePrev
@@ -421,6 +421,8 @@ set f [ttk::frame $w.buttons]
     pack $w.buttons $w.sep -side bottom -fill x
     pack $w.param -side top -fill both -expand true
 
+    set dcube(format) {%g}
+
     UpdateCubeDialog
 }
 
@@ -483,7 +485,7 @@ proc UpdateCubeDialog {} {
 	UpdateCubeDialogNoImage
 	return
     }
-	
+    
     # special case, no image
     if {![$current(frame) has fits]} {
 	UpdateCubeDialogNoImage
@@ -559,7 +561,8 @@ proc UpdateCubeDialog {} {
 
     # we must do this after the scale has been configured
     set dcube(image) [$current(frame) get fits slice]
-    set dcube(wcs) [$current(frame) get fits slice from image $cube(system) $cube(sky)]
+    set dcube(wcs) \
+	[format $dcube(format) [$current(frame) get fits slice from image $cube(system) $cube(sky)]]
 }
 
 proc UpdateCubeDialogNoImage {} {
@@ -671,7 +674,8 @@ proc UpdateCubeMotionDialog {} {
 
     # we must do this after the scale has been configured
     set dcube(image) [$current(frame) get fits slice]
-    set dcube(wcs) [$current(frame) get fits slice from image $cube(system) $cube(sky)]
+    set dcube(wcs) \
+	[format $dcube(format) [$current(frame) get fits slice from image $cube(system) $cube(sky)]]
 }
 
 proc CubeBackup {ch which} {
@@ -810,7 +814,7 @@ proc CubeCmd {ss} {
 
     set dcube(image) $ss
     set dcube(wcs) \
-	[$current(frame) get fits slice from image $cube(system) $cube(sky)]
+	[format $dcube(format) [$current(frame) get fits slice from image $cube(system) $cube(sky)]]
 
     UpdateCube
 }
@@ -839,7 +843,7 @@ proc CubeCmdCoord {ss sys sky} {
 
     set dcube(image) $ss
     set dcube(wcs) \
-	[$current(frame) get fits slice from image $cube(system) $cube(sky)]
+	[format $dcube(format) [$current(frame) get fits slice from image $cube(system) $cube(sky)]]
 
     UpdateCube
 }
diff --git a/tksao/frame/basecommand.C b/tksao/frame/basecommand.C
index e1d03b5..f91af32 100644
--- a/tksao/frame/basecommand.C
+++ b/tksao/frame/basecommand.C
@@ -1808,7 +1808,11 @@ void Base::getFitsSliceFromImageCmd(int ss, Coord::CoordSystem sys,
     FitsImage* ptr = currentContext->fits;
     Vector3d dd = Vector3d(ptr->center(),ss) * Translate3d(-.5,-.5,-.5);
     Vector3d out = ptr->mapFromRef(dd,sys,sky);
-    printDouble(out[2]);
+
+    // set precision high enough for plot in GHz freq
+    ostringstream str;
+    str << setprecision(18) << out[2] << ends;
+    Tcl_AppendResult(interp, str.str().c_str(), NULL);
   }
   else
     Tcl_AppendResult(interp, "1", NULL);
-- 
cgit v0.12