"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "ds9/library/marker.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.

marker.tcl  (ds9.8.2):marker.tcl  (ds9.8.2.1)
skipping to change at line 32 skipping to change at line 32
set imarker(prefix,panda) {mkrpanda} set imarker(prefix,panda) {mkrpanda}
set imarker(prefix,histogram) {mkrhist} set imarker(prefix,histogram) {mkrhist}
set marker(show) 1 set marker(show) 1
set marker(show,text) 1 set marker(show,text) 1
set marker(centroid,auto) 0 set marker(centroid,auto) 0
set marker(centroid,iteration) 30 set marker(centroid,iteration) 30
set marker(centroid,radius) 10 set marker(centroid,radius) 10
set marker(shape) circle set marker(shape) circle
set marker(color) green set marker(color) green
set marker(color,default) 0
set marker(dashlist) {8 3} set marker(dashlist) {8 3}
set marker(width) 1 set marker(width) 1
set marker(dash) 0 set marker(dash) 0
set marker(fixed) 0 set marker(fixed) 0
set marker(edit) 1 set marker(edit) 1
set marker(move) 1 set marker(move) 1
set marker(rotate) 1 set marker(rotate) 1
set marker(delete) 1 set marker(delete) 1
set marker(include) 1 set marker(include) 1
set marker(source) 1 set marker(source) 1
set marker(font) helvetica set marker(font) helvetica
set marker(font,size) 10 set marker(font,size) 10
set marker(font,weight) normal set marker(font,weight) normal
set marker(font,slant) roman set marker(font,slant) roman
set marker(preserve) 0 set marker(preserve) 0
set marker(default,use) 0
set marker(default,color) green
set marker(plot2d) 0 set marker(plot2d) 0
set marker(plot3d) 0 set marker(plot3d) 0
set marker(stats) 0 set marker(stats) 0
set marker(format) ds9 set marker(format) ds9
# these are only used for save/load/list and # these are only used for save/load/list and
# are set from current wcs values # are set from current wcs values
array set pmarker [array get marker] array set pmarker [array get marker]
skipping to change at line 1173 skipping to change at line 1171
return -code error return -code error
} }
set ll [read $fd 9] set ll [read $fd 9]
close $fd close $fd
# is it a fits file? # is it a fits file?
if {$ll == "SIMPLE ="} { if {$ll == "SIMPLE ="} {
# ok, its fits # ok, its fits
# try filename first # try filename first
if {[catch {$which marker load fits "\{$filename\}" $marker(default,color )}]} { if {[catch {$which marker load fits "\{$filename\}" $marker(color)}]} {
# reset errorInfo # reset errorInfo
set errorInfo {} set errorInfo {}
# see if we need to add an extension # see if we need to add an extension
# try [REGION] extension # try [REGION] extension
if {$ext == {}} { if {$ext == {}} {
set regfilename "$base\[REGION\]" set regfilename "$base\[REGION\]"
if {[catch {$which marker load fits "\{$regfilename\}" $marker(de fault,color)}]} { if {[catch {$which marker load fits "\{$regfilename\}" $marker(co lor)}]} {
# reset errorInfo # reset errorInfo
set errorInfo {} set errorInfo {}
# ok now try the first extension # ok now try the first extension
set regfilename "$base\[1\]" set regfilename "$base\[1\]"
if {[catch {$which marker load fits "\{$regfilename\}" $marke r(default,color)}]} { if {[catch {$which marker load fits "\{$regfilename\}" $marke r(color)}]} {
Error "[msgcat::mc {Unable to load region file}] $filenam e" Error "[msgcat::mc {Unable to load region file}] $filenam e"
return -code error return -code error
} }
} }
} else { } else {
Error "[msgcat::mc {Unable to load region file}] $filename" Error "[msgcat::mc {Unable to load region file}] $filename"
return -code error return -code error
} }
} }
} else { } else {
# no, its ascii # no, its ascii
if {[catch {$which marker load $format "\{$filename\}" $marker(default,us e) $marker(default,color) $sys $sky}]} { if {[catch {$which marker load $format "\{$filename\}" $marker(color,defa ult) $marker(color) $sys $sky}]} {
Error "[msgcat::mc {Unable to load region file}] $filename" Error "[msgcat::mc {Unable to load region file}] $filename"
return -code error return -code error
} }
} }
if {$app != {}} { if {$app != {}} {
file delete -force $filename file delete -force $filename
} }
FileLast markerfbox $filename FileLast markerfbox $filename
UpdateGroupDialog UpdateGroupDialog
skipping to change at line 1467 skipping to change at line 1465
return return
} }
if {![$current(frame) has fits]} { if {![$current(frame) has fits]} {
return return
} }
if {$parse(sock) != {}} { if {$parse(sock) != {}} {
# xpa path # xpa path
# fits regions files not supported # fits regions files not supported
$current(frame) marker load $marker(load,format) \ $current(frame) marker load $marker(load,format) \
$parse(sock) $marker(default,use) $marker(default,color) \ $parse(sock) $marker(color,default) $marker(color) \
$marker(load,system) $marker(load,sky) $marker(load,system) $marker(load,sky)
UpdateGroupDialog UpdateGroupDialog
} elseif {$parse(fn) != {}} { } elseif {$parse(fn) != {}} {
# samp path # samp path
MarkerLoadFrames $parse(fn) $current(frame) \ MarkerLoadFrames $parse(fn) $current(frame) \
$marker(load,format) $marker(load,system) $marker(load,sky) $marker(load,format) $marker(load,system) $marker(load,sky)
} }
} }
proc RegionCmdLoadFn {fn {all {0}}} { proc RegionCmdLoadFn {fn {all {0}}} {
 End of changes. 7 change blocks. 
8 lines changed or deleted 6 lines changed or added

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