diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2018-07-11 20:50:44 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2018-07-11 20:50:44 (GMT) |
| commit | 07854c67d41be66eac108100fdacddeede2b97da (patch) | |
| tree | c8212f88c37fc6f605ee8079bede407b5180f650 | |
| parent | 2081af23e67dd32c82a1ed95a57d7da5e6fd8dc5 (diff) | |
| download | blt-07854c67d41be66eac108100fdacddeede2b97da.zip blt-07854c67d41be66eac108100fdacddeede2b97da.tar.gz blt-07854c67d41be66eac108100fdacddeede2b97da.tar.bz2 | |
rm analysisMarker code
| -rw-r--r-- | ds9/library/marker.tcl | 9 | ||||
| -rw-r--r-- | ds9/library/xpa.tcl | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/ds9/library/marker.tcl b/ds9/library/marker.tcl index 519c937..2a9352f 100644 --- a/ds9/library/marker.tcl +++ b/ds9/library/marker.tcl @@ -1115,6 +1115,7 @@ proc MarkerLoadFrames {str frames format sys sky} { proc MarkerLoadFile {filename which format sys sky} { global current global marker + global errorInfo if {$filename == {}} { return @@ -1132,6 +1133,7 @@ proc MarkerLoadFile {filename which format sys sky} { .bz2 {set app bunzip2} .Z {set app uncompress} } + if {$app != {}} { set srcfilename $filename set filename [tmpnam [file ext [file rootname $filename]]] @@ -1163,6 +1165,9 @@ proc MarkerLoadFile {filename which format sys sky} { # try filename first if {[catch {$which marker load fits "\{$filename\}" $marker(color) $marker(dashlist) $marker(width) "\{$marker(font) $marker(font,size) $marker(font,weight) $marker(font,slant)\}"}]} { + # reset errorInfo + set errorInfo {} + # see if we need to add an extension # try [REGION] extension if {$ext == {}} { @@ -1170,6 +1175,9 @@ proc MarkerLoadFile {filename which format sys sky} { if {[catch {$which marker load fits "\{$regfilename\}" $marker(color) $marker(dashlist) $marker(width) "\{$marker(font) $marker(font,size) $marker(font,weight) $marker(font,slant)\}"}]} { + # reset errorInfo + set errorInfo {} + # ok now try the first extension set regfilename "$base\[1\]" if {[catch {$which marker load fits "\{$regfilename\}" $marker(color) $marker(dashlist) $marker(width) "\{$marker(font) $marker(font,size) $marker(font,weight) $marker(font,slant)\}"}]} { @@ -1218,6 +1226,7 @@ proc MarkerSave {} { $marker(format) $marker(system) $marker(sky) \ $marker(skyformat) $marker(strip) } + puts "z $errorInfo" } proc MarkerInfo {} { diff --git a/ds9/library/xpa.tcl b/ds9/library/xpa.tcl index 5dde6b5..a352282 100644 --- a/ds9/library/xpa.tcl +++ b/ds9/library/xpa.tcl @@ -2166,6 +2166,7 @@ proc XPACatchError {xpa} { global errorInfo if {$errorInfo != {} || $ds9(msg) != {}} { + xpaerror $xpa "$errorInfo" if {$ds9(msg) != {}} { xpaerror $xpa $ds9(msg) } else { |