From 875f24c44180d9107146559ab37d0fb73298ffb0 Mon Sep 17 00:00:00 2001 From: William Joye Date: Wed, 16 May 2018 15:45:02 -0400 Subject: update ds9 parsers --- ds9/library/colorbar.tcl | 4 +--- ds9/parsers/cmapparser.tac | 2 ++ ds9/parsers/colorbarparser.tac | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ds9/library/colorbar.tcl b/ds9/library/colorbar.tcl index ecbde24..f23bdd5 100644 --- a/ds9/library/colorbar.tcl +++ b/ds9/library/colorbar.tcl @@ -1357,6 +1357,7 @@ proc ProcessSendCmapCmd {proc id param} { file {$proc $id "[$current(colorbar) get file name]\n"} invert {$proc $id [ToYesNo $colorbar(invert)]} value {$proc $id "[$current(colorbar) get contrast] [$current(colorbar) get bias]\n"} + # backward compatibility lock {$proc $id [ToYesNo $colorbar(lock)]} {} {$proc $id "[$current(colorbar) get name]\n"} } @@ -1381,11 +1382,9 @@ proc ProcessColorbarCmd {varname iname} { switch -- $item { match { - # backward compatibility MatchColorCurrent } lock { - # backward compatibility incr i if {!([string range [lindex $var $i] 0 0] == "-")} { set colorbar(lock) [FromYesNo [lindex $var $i]] @@ -1529,7 +1528,6 @@ proc ProcessSendColorbarCmd {proc id param} { switch -- [string tolower [lindex $param 0]] { lock { - #backward compatibility $proc $id [ToYesNo $colorbar(lock)] } orientation {$proc $id "$colorbar(orientation)\n"} diff --git a/ds9/parsers/cmapparser.tac b/ds9/parsers/cmapparser.tac index 4286f0e..b5b85a7 100644 --- a/ds9/parsers/cmapparser.tac +++ b/ds9/parsers/cmapparser.tac @@ -32,7 +32,9 @@ cmap : STRING_ {CmapCmd $1} | OPEN_ {ColormapDialog} | CLOSE_ {ColormapDestroyDialog} +# backward compatibility | MATCH_ {MatchColorCurrent} +# backward compatibility | LOCK_ yesno {ColorbarCmdSet lock $2 LockColorCurrent} | LOAD_ cmapLoad diff --git a/ds9/parsers/colorbarparser.tac b/ds9/parsers/colorbarparser.tac index be54253..632484c 100644 --- a/ds9/parsers/colorbarparser.tac +++ b/ds9/parsers/colorbarparser.tac @@ -31,7 +31,6 @@ command : colorbar ; colorbar : yesno {ViewCmdSet colorbar $1 UpdateView} -# backward compatibility | MATCH_ {MatchColorCurrent} | LOCK_ yesno {ColorbarCmdSet lock $2 LockColorCurrent} @@ -41,6 +40,7 @@ colorbar : yesno {ViewCmdSet colorbar $1 UpdateView} | FONTSIZE_ INT_ {ColorbarCmdSet font,size $2 UpdateView} | FONTWEIGHT_ fontWeight {ColorbarCmdSet font,weight $2 UpdateView} | FONTSLANT_ fontSlant {ColorbarCmdSet font,slant $2 UpdateView} +# backward compatibility | FONTSTYLE_ fontStyle {ColorbarCmdFontStyle $2 UpdateView} | orientation {ColorbarCmdSet orientation $1 UpdateView} -- cgit v0.12