"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "ds9/library/markerdialog.tcl" between
ds9.8.2.tar.gz and ds9.8.2.1.tar.gz

About: SAOImage DS9 is an astronomical imaging and data visualization application that supports FITS images and binary tables, multiple frame buffers, region manipulation, and many scale algorithms and colormaps.

markerdialog.tcl  (ds9.8.2):markerdialog.tcl  (ds9.8.2.1)
skipping to change at line 18 skipping to change at line 18
global marker global marker
global ed global ed
global current global current
global wcs global wcs
set w {.mkd} set w {.mkd}
set ed(ok) 0 set ed(ok) 0
set ed(format) $marker(format) set ed(format) $marker(format)
set ed(load) $marker(load) set ed(load) $marker(load)
set ed(default,use) $marker(default,use) set ed(color) $marker(color)
set ed(default,color) $marker(default,color) set ed(color,default) $marker(color,default)
set ed(frame) $current(frame) set ed(frame) $current(frame)
set ed(system) $wcs(system) set ed(system) $wcs(system)
set ed(sky) $wcs(sky) set ed(sky) $wcs(sky)
set ed(skyformat) $wcs(skyformat) set ed(skyformat) $wcs(skyformat)
AdjustCoordSystem ed system AdjustCoordSystem ed system
DialogCreate $w [msgcat::mc {Open Regions}] ed(ok) DialogCreate $w [msgcat::mc {Open Regions}] ed(ok)
# Format # Format
skipping to change at line 69 skipping to change at line 69
-variable ed(load) -value current -variable ed(load) -value current
ttk::radiobutton $f.all -text [msgcat::mc {Load into All}] \ ttk::radiobutton $f.all -text [msgcat::mc {Load into All}] \
-variable ed(load) -value all -variable ed(load) -value all
grid $f.current - -padx 2 -pady 2 -sticky w grid $f.current - -padx 2 -pady 2 -sticky w
grid $f.all - -padx 2 -pady 2 -sticky w grid $f.all - -padx 2 -pady 2 -sticky w
# Color # Color
set f [ttk::labelframe $w.color -text [msgcat::mc {Color}]] set f [ttk::labelframe $w.color -text [msgcat::mc {Color}]]
ttk::checkbutton $f.default -text [msgcat::mc {Use Color}] \ set ed(color,chk) \
-variable ed(default,use) [ttk::checkbutton $f.default -text [msgcat::mc {Override Color}] \
ColorMenuButton $f.color ed default,color {} -variable ed(color,default) \
]
ColorMenuButton $f.color ed color {}
set ed(color,mb) $f.color
grid $f.default $f.color -padx 2 -pady 2 -sticky w grid $f.default $f.color -padx 2 -pady 2 -sticky w
# Button # Button
set f [ttk::frame $w.buttons] set f [ttk::frame $w.buttons]
ttk::button $f.ok -text [msgcat::mc {OK}] -command {set ed(ok) 1} \ ttk::button $f.ok -text [msgcat::mc {OK}] -command {set ed(ok) 1} \
-default active -default active
ttk::button $f.cancel -text [msgcat::mc {Cancel}] -command {set ed(ok) 0} ttk::button $f.cancel -text [msgcat::mc {Cancel}] -command {set ed(ok) 0}
pack $f.ok $f.cancel -side left -expand true -padx 2 -pady 4 pack $f.ok $f.cancel -side left -expand true -padx 2 -pady 4
skipping to change at line 101 skipping to change at line 104
DialogWait $w ed(ok) DialogWait $w ed(ok)
destroy $w destroy $w
if {$ed(ok)} { if {$ed(ok)} {
set marker(format) $ed(format) set marker(format) $ed(format)
set marker(system) $ed(system) set marker(system) $ed(system)
set marker(sky) $ed(sky) set marker(sky) $ed(sky)
set marker(skyformat) $ed(skyformat) set marker(skyformat) $ed(skyformat)
set marker(load) $ed(load) set marker(load) $ed(load)
set marker(default,use) $ed(default,use) set marker(color) $ed(color)
set marker(default,color) $ed(default,color) set marker(color,default) $ed(color,default)
} }
set rr $ed(ok) set rr $ed(ok)
unset ed unset ed
return $rr return $rr
} }
proc UpdateMarkerLoadDialog {} { proc UpdateMarkerLoadDialog {} {
global ed global ed
global current global current
set mm $ed(cb).menu set mm $ed(cb).menu
set ed(frame) $current(frame) set ed(frame) $current(frame)
CoordMenuEnable $mm ed system sky skyformat CoordMenuEnable $mm ed system sky skyformat
switch -- $ed(format) { switch -- $ed(format) {
xy {$ed(cb) configure -state normal} ds9 {
default {$ed(cb) configure -state disabled} $ed(color,chk) configure -state normal
$ed(color,mb) configure -state normal
$ed(cb) configure -state disabled
}
xml {
$ed(color,chk) configure -state disabled
$ed(color,mb) configure -state normal
$ed(cb) configure -state disabled
}
ciao {
$ed(color,chk) configure -state disabled
$ed(color,mb) configure -state normal
$ed(cb) configure -state disabled
}
saotng {
$ed(color,chk) configure -state normal
$ed(color,mb) configure -state normal
$ed(cb) configure -state disabled
}
saoimage {
$ed(color,chk) configure -state disabled
$ed(color,mb) configure -state normal
$ed(cb) configure -state disabled
}
pros {
$ed(color,chk) configure -state disabled
$ed(color,mb) configure -state normal
$ed(cb) configure -state disabled
}
xy {
$ed(color,chk) configure -state disabled
$ed(color,mb) configure -state normal
$ed(cb) configure -state normal
}
} }
AdjustCoordSystem ed system AdjustCoordSystem ed system
CoordMenuButtonCmd ed system sky {} CoordMenuButtonCmd ed system sky {}
} }
proc MarkerSaveDialog {title} { proc MarkerSaveDialog {title} {
global marker global marker
global ed global ed
global current global current
 End of changes. 4 change blocks. 
9 lines changed or deleted 45 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)