diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2018-05-30 16:14:52 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2018-05-30 16:14:52 (GMT) |
| commit | 6c48a0325ac2743355ca31e65f0f4fb20afcf5ee (patch) | |
| tree | f83be9f352036b6019bbf5f1ad8849490d69942b /ds9/library | |
| parent | 610507887cbc040d7a6679171f2410fb8ad58e71 (diff) | |
| download | blt-6c48a0325ac2743355ca31e65f0f4fb20afcf5ee.zip blt-6c48a0325ac2743355ca31e65f0f4fb20afcf5ee.tar.gz blt-6c48a0325ac2743355ca31e65f0f4fb20afcf5ee.tar.bz2 | |
update ds9 parsers
Diffstat (limited to 'ds9/library')
| -rw-r--r-- | ds9/library/cat.tcl | 7 | ||||
| -rw-r--r-- | ds9/library/hv.tcl | 13 | ||||
| -rw-r--r-- | ds9/library/plotprocess.tcl | 15 | ||||
| -rw-r--r-- | ds9/library/sia.tcl | 7 |
4 files changed, 18 insertions, 24 deletions
diff --git a/ds9/library/cat.tcl b/ds9/library/cat.tcl index 0d30632..81da9ad 100644 --- a/ds9/library/cat.tcl +++ b/ds9/library/cat.tcl @@ -1260,14 +1260,13 @@ proc CatalogCmdCheck {} { if {![info exists cvar(top)]} { Error "[msgcat::mc {Unable to find catalog window}] $cvarname" - cat::YYABORT - return + return 0 } if {![winfo exists $cvar(top)]} { Error "[msgcat:: mc {Unable to find catalog window}] $cvarname" - cat::YYABORT - return + return 0 } + return 1 } proc CatalogCmdRef {ref} { diff --git a/ds9/library/hv.tcl b/ds9/library/hv.tcl index a7defb7..c167a5d 100644 --- a/ds9/library/hv.tcl +++ b/ds9/library/hv.tcl @@ -841,14 +841,13 @@ proc WebCmdCheck {} { if {![info exists cvar(top)]} { Error "[msgcat::mc {Unable to find web window}] $cvarname" - cat::YYABORT - return + return 0 } if {![winfo exists $cvar(top)]} { Error "[msgcat:: mc {Unable to find web window}] $cvarname" - cat::YYABORT - return + return 0 } + return 1 } proc WebCmdRef {ref} { @@ -858,11 +857,11 @@ proc WebCmdRef {ref} { # look for reference in current list if {[lsearch $ihv(windows) $ref] < 0} { Error "[msgcat::mc {Unable to find web window}] $ref" - plot::YYABORT - return + return 0 } + set cvarname $ref - WebCmdCheck + return [WebCmdCheck] } proc WebCmdNew {url {ww {hvweb}}} { diff --git a/ds9/library/plotprocess.tcl b/ds9/library/plotprocess.tcl index 410520a..42d9c4d 100644 --- a/ds9/library/plotprocess.tcl +++ b/ds9/library/plotprocess.tcl @@ -124,14 +124,13 @@ proc PlotCmdCheck {} { if {![info exists cvar(top)]} { Error "[msgcat::mc {Unable to find plot window}] $cvarname" - plot::YYABORT - return + return 0 } if {![winfo exists $cvar(top)]} { Error "[msgcat::mc {Unable to find plot window}] $cvarname" - plot::YYABORT - return + return 0 } + return 1 } proc PlotCmdRef {ref} { @@ -141,11 +140,11 @@ proc PlotCmdRef {ref} { # look for reference in current list if {[lsearch $iap(windows) $ref] < 0} { Error "[msgcat::mc {Unable to find plot window}] $ref" - plot::YYABORT - return + return 0 } + set cvarname $ref - PlotCmdCheck + return [PlotCmdCheck] } proc PlotCmdNew {name} { @@ -203,8 +202,6 @@ proc PlotCmdData {dim} { } if {$parse(buf) == {}} { Error "[msgcat::mc {Unable to load plot data}] $fn" - plot::YYABORT - return } } diff --git a/ds9/library/sia.tcl b/ds9/library/sia.tcl index 0b577ad..5f0c8de 100644 --- a/ds9/library/sia.tcl +++ b/ds9/library/sia.tcl @@ -472,14 +472,13 @@ proc SIACmdCheck {} { if {![info exists cvar(top)]} { Error "[msgcat::mc {Unable to find SIAP window}] $cvarname" - cat::YYABORT - return + return 0 } if {![winfo exists $cvar(top)]} { Error "[msgcat:: mc {Unable to find SIAP window}] $cvarname" - cat::YYABORT - return + return 0 } + return 1 } proc SIACmdRef {ref} { |