From 66cab23c3c5e896c429702901481517079b925e5 Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Tue, 4 Jun 2019 16:11:50 -0400
Subject: COLORBAR: fixed a number of issues with updating the screen with
 color tags active

---
 ds9/doc/release/r8.1.html | 1 +
 ds9/library/colorbar.tcl  | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/ds9/doc/release/r8.1.html b/ds9/doc/release/r8.1.html
index 4dd67ac..b58b6b8 100644
--- a/ds9/doc/release/r8.1.html
+++ b/ds9/doc/release/r8.1.html
@@ -80,6 +80,7 @@
 <li><tt>05.13.2019 OPENSSL: DS9 now links against its own version of openssl and no longer is dependent upon system libs.</tt></li>
 <li><tt><b>05.15.2019 RELEASE version 8.1b1</b></tt></li>
 <li><tt>05.28.2019 URL: more tolerant of mime types when downloading via http.</tt></li>
+<li><tt>06.04.2019 COLORBAR: fixed a number of issues with updating the screen with color tags active.</tt></li>
 <li><tt><b>xx.xx.2019 RELEASE version 8.1b2</b></tt></li>
 </ol>
 </div>
diff --git a/ds9/library/colorbar.tcl b/ds9/library/colorbar.tcl
index f774e63..f3a657f 100644
--- a/ds9/library/colorbar.tcl
+++ b/ds9/library/colorbar.tcl
@@ -288,6 +288,7 @@ proc ColorbarKey {K A xx yy} {
 		    $current(colorbar) tag delete $xx $yy
 		    if {$current(frame) != {}} {
 			$current(frame) colormap [$current(colorbar) get colormap]
+			$current(frame) colorbar tag "\{[$current(colorbar) get tag]\}"
 		    }
 		}
 	    }
@@ -358,6 +359,7 @@ proc ColorbarMotion1 {x y} {
 	    $current(colorbar) tag edit motion $x $y
 	    if {$current(frame) != {}} {
 		$current(frame) colormap [$current(colorbar) get colormap]
+		$current(frame) colorbar tag "\{[$current(colorbar) get tag]\}"
 	    }
 	}
     }
@@ -390,6 +392,7 @@ proc ColorbarRelease1 {x y} {
 	    $current(colorbar) tag edit end $x $y
 	    if {$current(frame) != {}} {
 		$current(frame) colormap [$current(colorbar) get colormap]
+		$current(frame) colorbar tag "\{[$current(colorbar) get tag]\}"
 	    }
 	}
     }
@@ -671,9 +674,12 @@ proc LoadColorTag {fn} {
     global current
 
     if {$fn != {}} {
+	# yes, we need this
+	UpdateColormapLevel
 	$current(colorbar) tag load "\{$fn\}"
 	if {$current(frame) != {}} {
 	    $current(frame) colormap [$current(colorbar) get colormap]
+	    $current(frame) colorbar tag "\{[$current(colorbar) get tag]\}"
 	}
     }
 }
@@ -693,6 +699,7 @@ proc DeleteColorTag {} {
     $current(colorbar) tag delete
     if {$current(frame) != {}} {
 	$current(frame) colormap [$current(colorbar) get colormap]
+	$current(frame) colorbar tag "\{[$current(colorbar) get tag]\}"
     }
 }
 
@@ -750,6 +757,7 @@ proc ColorTagDialog {x y} {
 	$current(colorbar) tag $ed2(id) $ed2(start) $ed2(stop) $ed2(color)
 	if {$current(frame) != {}} {
 	    $current(frame) colormap [$current(colorbar) get colormap]
+	    $current(frame) colorbar tag "\{[$current(colorbar) get tag]\}"
 	}
     }
 
-- 
cgit v0.12