diff options
-rw-r--r-- | ds9/doc/release/r7.6.html | 1 | ||||
-rw-r--r-- | ds9/library/layout.tcl | 6 | ||||
-rw-r--r-- | ds9/library/prefs.tcl | 7 | ||||
-rw-r--r-- | ds9/library/prefsdialog.tcl | 23 |
4 files changed, 1 insertions, 36 deletions
diff --git a/ds9/doc/release/r7.6.html b/ds9/doc/release/r7.6.html index ae2eafa..a30045b 100644 --- a/ds9/doc/release/r7.6.html +++ b/ds9/doc/release/r7.6.html @@ -146,7 +146,6 @@ <li><tt>09.29.2017 WCS: fixed a problem with use of PC keywords, with CDELT = 1.</tt></li> <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>10.16.2017 CATALOG: match sometimes failed to find proper catalogs.</tt></li> <li><tt>10.17.2017 TCL/TK: updated to version core_8_6_branch.</tt></li> diff --git a/ds9/library/layout.tcl b/ds9/library/layout.tcl index 99408f1..d6689c3 100644 --- a/ds9/library/layout.tcl +++ b/ds9/library/layout.tcl @@ -7,7 +7,6 @@ package provide DS9 1.0 proc CanvasDef {} { global canvas global icanvas - global pcanvas global ds9 # also adjust info.tcl LayoutInfoPanelHorz @@ -37,11 +36,6 @@ proc CanvasDef {} { aqua {set canvas(gap,bottom) 14} win32 {set canvas(gap,bottom) 0} } - - set pcanvas(horz,width) $icanvas(horz,width) - set pcanvas(horz,height) $icanvas(horz,height) - set pcanvas(vert,width) $icanvas(vert,width) - set pcanvas(vert,height) $icanvas(vert,height) } proc BlinkDef {} { diff --git a/ds9/library/prefs.tcl b/ds9/library/prefs.tcl index 45658b3..e86da69 100644 --- a/ds9/library/prefs.tcl +++ b/ds9/library/prefs.tcl @@ -159,13 +159,6 @@ proc SavePrefs {} { puts $ch "array set pcurrent \{ [array get pcurrent] \}" puts $ch {array set current [array get pcurrent]} - global canvas - global pcanvas - puts $ch "global icanvas" - puts $ch "global pcanvas" - puts $ch "array set pcanvas \{ [array get pcanvas] \}" - puts $ch {array set icanvas [array get pcanvas]} - global view global pview puts $ch "global view" diff --git a/ds9/library/prefsdialog.tcl b/ds9/library/prefsdialog.tcl index 75061ac..cdc02e7 100644 --- a/ds9/library/prefsdialog.tcl +++ b/ds9/library/prefsdialog.tcl @@ -313,26 +313,5 @@ proc PrefsDialogStartup {} { grid $f.xpa -padx 2 -pady 2 -sticky w grid $f.samp -padx 2 -pady 2 -sticky w - set f [ttk::labelframe $w.startup.horz -text \ - [msgcat::mc {Horizontal Display Size}]] - ttk::label $f.twidth -text [msgcat::mc {Width}] - ttk::entry $f.width -textvariable pcanvas(horz,width) -width 8 - ttk::label $f.theight -text [msgcat::mc {Height}] - ttk::entry $f.height -textvariable pcanvas(horz,height) -width 8 - - grid $f.twidth $f.width -padx 2 -pady 2 -sticky w - grid $f.theight $f.height -padx 2 -pady 2 -sticky w - - set f [ttk::labelframe $w.startup.vert -text \ - [msgcat::mc {Vertical Display Size}]] - ttk::label $f.twidth -text [msgcat::mc {Width}] - ttk::entry $f.width -textvariable pcanvas(vert,width) -width 8 - ttk::label $f.theight -text [msgcat::mc {Height}] - ttk::entry $f.height -textvariable pcanvas(vert,height) -width 8 - - grid $f.twidth $f.width -padx 2 -pady 2 -sticky w - grid $f.theight $f.height -padx 2 -pady 2 -sticky w - - pack $w.startup.params $w.startup.horz $w.startup.vert \ - -side top -fill both -expand true + pack $w.startup.params -side top -fill both -expand true } |