summaryrefslogtreecommitdiffstats
path: root/ds9/library/prefs.tcl
diff options
context:
space:
mode:
authorWilliam Joye <wjoye@cfa.harvard.edu>2017-05-04 21:05:16 (GMT)
committerWilliam Joye <wjoye@cfa.harvard.edu>2017-05-04 21:05:16 (GMT)
commitab326b7898fe5230ac7f7fb8196e40fe5751090c (patch)
tree5a5461266dbda216fe74aafa4033f43dc57d4523 /ds9/library/prefs.tcl
parent61fde44b8f538e0085bf6a1627f02e0cfd98200b (diff)
downloadblt-ab326b7898fe5230ac7f7fb8196e40fe5751090c.zip
blt-ab326b7898fe5230ac7f7fb8196e40fe5751090c.tar.gz
blt-ab326b7898fe5230ac7f7fb8196e40fe5751090c.tar.bz2
fix minor https issue
Diffstat (limited to 'ds9/library/prefs.tcl')
-rw-r--r--ds9/library/prefs.tcl24
1 files changed, 18 insertions, 6 deletions
diff --git a/ds9/library/prefs.tcl b/ds9/library/prefs.tcl
index 71a5529..7229720 100644
--- a/ds9/library/prefs.tcl
+++ b/ds9/library/prefs.tcl
@@ -394,6 +394,18 @@ proc FixVar {varname ovarname} {
}
}
+proc FixVarSet {varname ovarname} {
+ global aa bb
+ set aa $varname
+ set bb $ovarname
+
+ uplevel #0 {
+ if {[info exists $bb]} {
+ set $aa [expr $$bb]
+ }
+ }
+}
+
proc FixVarRm {ovarname} {
global aa
set aa $ovarname
@@ -758,12 +770,12 @@ proc FixPrefs6.0to6.1 {} {
FixVar pnres(server) nres(server)
# graph
- FixVar pgraph(horz,grid) graph(horz,grid)
- FixVar pgraph(horz,log) graph(horz,log)
- FixVar pgraph(vert,grid) graph(vert,grid)
- FixVar pgraph(vert,log) graph(vert,log)
- global graph
- catch {unset graph}
+ FixVarSet pgraph(horz,grid) graph(horz,grid)
+ FixVarSet pgraph(horz,log) graph(horz,log)
+ FixVarSet pgraph(vert,grid) graph(vert,grid)
+ FixVarSet pgraph(vert,log) graph(vert,log)
+# global graph
+# catch {unset graph}
# cat
FixVar pcat(server) cat(server)