diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2019-06-04 20:12:21 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2019-06-04 20:12:21 (GMT) |
| commit | cb10f506b6c9872bfe637b13dca457eaafa5b01f (patch) | |
| tree | a63c8270cb5f83b686653c75c97aa16857b11efc /ds9 | |
| parent | 48087bac804f248e0fe9faaf89d5457ded47ed4c (diff) | |
| parent | 66cab23c3c5e896c429702901481517079b925e5 (diff) | |
| download | blt-cb10f506b6c9872bfe637b13dca457eaafa5b01f.zip blt-cb10f506b6c9872bfe637b13dca457eaafa5b01f.tar.gz blt-cb10f506b6c9872bfe637b13dca457eaafa5b01f.tar.bz2 | |
Merge branch 'master' into devel
Diffstat (limited to 'ds9')
| -rw-r--r-- | ds9/doc/release/r8.1.html | 1 | ||||
| -rw-r--r-- | ds9/library/colorbar.tcl | 8 |
2 files changed, 9 insertions, 0 deletions
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]\}" } } |