From 1ff01ce4a0a9b54886da20b801ac0d9d3640c1f4 Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Wed, 19 Sep 2018 14:59:30 -0400
Subject: WCS: fix a problem starting in crosshair mode set in prefs and
 infobox update with 2D frame.

---
 ds9/doc/release/r8.0.html | 1 +
 tksao/frame/framebase.C   | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ds9/doc/release/r8.0.html b/ds9/doc/release/r8.0.html
index 8979058..2fe5bb6 100644
--- a/ds9/doc/release/r8.0.html
+++ b/ds9/doc/release/r8.0.html
@@ -76,6 +76,7 @@ incorrectly calculating an index into the data cube.</tt></li>
 <li><tt><b>09.04.2018 RELEASE version 8.0rc2</b></tt></li>
 <li><tt>09.19.2018 WCS: fix a memory ref with short axes symbols (aka 'b')</tt></li>
 <li><tt>09.19.2018 AST: fix a buffer overflow issue in fitschan.c.</tt></li>
+<li><tt>09.19.2018 WCS: fix a problem starting in crosshair mode set in prefs and infobox update with 2D frame.</tt></li>
 <li><tt><b>10.xx.2018 RELEASE version 8.0rc3</b></tt></li>
 </ol>
 </div>
diff --git a/tksao/frame/framebase.C b/tksao/frame/framebase.C
index 6acfdb8..3ee699a 100644
--- a/tksao/frame/framebase.C
+++ b/tksao/frame/framebase.C
@@ -146,6 +146,7 @@ void FrameBase::getInfoWCS(char* var, Vector& rr, FitsImage* sptr)
 
       Tcl_SetVar2(interp,var,varcat(buf,(char*)"wcs",ww,(char*)",x"),out[0],0);
       Tcl_SetVar2(interp,var,varcat(buf,(char*)"wcs",ww,(char*)",y"),out[1],0);
+      Tcl_SetVar2(interp,var,varcat(buf,(char*)"wcs",ww,(char*)",z"),"",0);
       
       char* xsym = (char*)sptr->getWCSAxisSymbol(www,0);
       if (xsym)
@@ -157,7 +158,8 @@ void FrameBase::getInfoWCS(char* var, Vector& rr, FitsImage* sptr)
 	Tcl_SetVar2(interp,var,varcat(buf,(char*)"wcs",ww,(char*)",y,sys"),ysym,0);
       else
 	Tcl_SetVar2(interp,var,varcat(buf,(char*)"wcs",ww,(char*)",y,sys"),"y",0);
-	
+      Tcl_SetVar2(interp,var,varcat(buf,(char*)"wcs",ww,(char*)",z,sys"),"",0);
+
       char* system = (char*)sptr->getWCSSystem(www);
       char* domain = (char*)sptr->getWCSDomain(www);
       if (system) {
@@ -174,8 +176,10 @@ void FrameBase::getInfoWCS(char* var, Vector& rr, FitsImage* sptr)
     else {
       Tcl_SetVar2(interp,var,varcat(buf,(char*)"wcs",ww,(char*)",x"),"",0);
       Tcl_SetVar2(interp,var,varcat(buf,(char*)"wcs",ww,(char*)",y"),"",0);
+      Tcl_SetVar2(interp,var,varcat(buf,(char*)"wcs",ww,(char*)",z"),"",0);
       Tcl_SetVar2(interp,var,varcat(buf,(char*)"wcs",ww,(char*)",x,sys"),"",0);
       Tcl_SetVar2(interp,var,varcat(buf,(char*)"wcs",ww,(char*)",y,sys"),"",0);
+      Tcl_SetVar2(interp,var,varcat(buf,(char*)"wcs",ww,(char*)",z,sys"),"",0);
       Tcl_SetVar2(interp,var,varcat(buf,(char*)"wcs",ww,(char*)",sys"),"",0);
     }
   }
-- 
cgit v0.12