From 6dc29e2c5fe4ef4ecefb098e81db9ea0f21e9712 Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Mon, 16 Oct 2017 16:17:59 -0400
Subject: Catalog: cat plot line command incorrectly finds 'Xerr' and 'Yerr'
 columns

---
 ds9/doc/release/r7.6.html |  1 +
 ds9/library/cat.tcl       | 20 ++++++++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/ds9/doc/release/r7.6.html b/ds9/doc/release/r7.6.html
index 6a36944..0352b46 100644
--- a/ds9/doc/release/r7.6.html
+++ b/ds9/doc/release/r7.6.html
@@ -147,6 +147,7 @@
         <li><tt><b>10.01.2017 RELEASE version 7.6b6</b></tt></li>
         <li><tt>10.04.2017 FITSY++: FITS compresssion- fixed a problem with ZNAXIS3=0 keyword issue.</tt></li>
         <li><tt>10.16.2017 PREFS: Add preferences for default dislay size at startup.</tt></li>
+        <li><tt>10.16.2017 CATALOG: cat plot line command incorrectly finds 'Xerr' and 'Yerr' columns.</tt></li>
         <li><tt><b>xx.xx.2017 RELEASE version 7.6b7</b></tt></li>
       </ol>
     </ol>
diff --git a/ds9/library/cat.tcl b/ds9/library/cat.tcl
index f373f69..e4704b9 100644
--- a/ds9/library/cat.tcl
+++ b/ds9/library/cat.tcl
@@ -1638,10 +1638,22 @@ proc ProcessCatalog {varname iname cvarname} {
 	    set cvar(plot,x) [lindex $var $i]
 	    incr i
 	    set cvar(plot,y) [lindex $var $i]
-	    incr i
-	    set cvar(plot,xerr) [lindex $var $i]
-	    incr i
-	    set cvar(plot,yerr) [lindex $var $i]
+	    set cvar(plot,xerr) {}
+	    set cvar(plot,yerr) {}
+	    set xerr [lindex $var [expr $i+1]]
+	    set yerr [lindex $var [expr $i+2]]
+	    if {$xerr != {}} {
+		if {[string range $xerr 0 0 ] != {-}} {
+		    incr i
+		    set cvar(plot,xerr) $xerr
+		    if {$yerr != {}} {
+			if {[string range $yerr 0 0 ] != {-}} {
+			    incr i
+			    set cvar(plot,yerr) $yerr
+			}
+		    }
+		}
+	    }
 	    CATPlotGenerate $cvarname
 	}
 	print {CATPrint $cvarname}
-- 
cgit v0.12