diff options
author | William Joye <wjoye@cfa.harvard.edu> | 2018-06-13 17:19:10 (GMT) |
---|---|---|
committer | William Joye <wjoye@cfa.harvard.edu> | 2018-06-13 17:19:10 (GMT) |
commit | 4ea9be66298b2f33f90fee95f078a1c9eb49a0f3 (patch) | |
tree | 4af6881e88c390a4c5ae341f5a55fd42515fff90 /ds9/parsers | |
parent | 3f1ae1680574d28ef25414c21cde23d1ec78e4a3 (diff) | |
download | blt-4ea9be66298b2f33f90fee95f078a1c9eb49a0f3.zip blt-4ea9be66298b2f33f90fee95f078a1c9eb49a0f3.tar.gz blt-4ea9be66298b2f33f90fee95f078a1c9eb49a0f3.tar.bz2 |
update ds9 parsers
Diffstat (limited to 'ds9/parsers')
-rw-r--r-- | ds9/parsers/catparser.tac | 16 | ||||
-rw-r--r-- | ds9/parsers/plotparser.tac | 6 | ||||
-rw-r--r-- | ds9/parsers/siaparser.tac | 12 | ||||
-rw-r--r-- | ds9/parsers/webparser.tac | 12 |
4 files changed, 23 insertions, 23 deletions
diff --git a/ds9/parsers/catparser.tac b/ds9/parsers/catparser.tac index fdbddd3..18af4bf 100644 --- a/ds9/parsers/catparser.tac +++ b/ds9/parsers/catparser.tac @@ -137,16 +137,16 @@ catalog : NEW_ {CATTool} catCmd : coordinate | ALLCOLS_ yesno {ProcessCmdCVAR allcols $2} | ALLROWS_ yesno {ProcessCmdCVAR allrows $2} - | CANCEL_ {global cvarname; ARCancel $cvarname} - | CLEAR_ {global cvarname; CATOff $cvarname} - | CLOSE_ {global cvarname; CATDestroy $cvarname} + | CANCEL_ {ProcessCmdCVAR0 ARCancel} + | CLEAR_ {ProcessCmdCVAR0 CATOff} + | CLOSE_ {ProcessCmdCVAR0 CATDestroy} # backward compatibilty | COORDINATE_ coordinate - | CROSSHAIR_ {global cvarname; CATCrosshair $cvarname} + | CROSSHAIR_ {ProcessCmdCVAR0 CATCrosshair} | EDIT_ yesno {ProcessCmdCVAR edit $2 CATEdit} | EXPORT_ writer STRING_ {CatalogCmdSave $3 $2} | FILTER_ filter - | HEADER_ {global cvarname; CATHeader $cvarname} + | HEADER_ {ProcessCmdCVAR0 CATHeader} # backward compatibilty | HIDE_ {ProcessCmdCVAR show 0 CATGenerate} | LOCATION_ INT_ {ProcessCmdCVAR loc $2 CATGenerate} @@ -155,10 +155,10 @@ catCmd : coordinate | NAME_ STRING_ {ProcessCmdCVAR name $2} | PANTO_ yesno {ProcessCmdCVAR panto $2} | PLOT_ STRING_ STRING_ STRING_ STRING_ {ProcessCmdCVAR4 plot,x $2 plot,y $3 plot,xerr $4 plot,yerr $5 CATPlotGenerate} - | PRINT_ {global cvarname; CATPrint $cvarname} + | PRINT_ {ProcessCmdCVAR0 CATPrint} | PSKY_ skyframe {ProcessCmdCVAR psky $2 CATGenerate} | PSYSTEM_ wcssys {ProcessCmdCVAR psystem $2 CATGenerate} - | REGIONS_ {global cvarname; CATGenerateRegions $cvarname} + | REGIONS_ {ProcessCmdCVAR0 CATGenerateRegions} | RETRIEVE_ {global cvarname; CATApply $cvarname 1} | SAMP_ samp | SAVE_ STRING_ {CatalogCmdSave $2 VOTWrite} @@ -173,7 +173,7 @@ catCmd : coordinate | SYMBOL_ {ProcessCmdCVAR row 1} symbol | SYMBOL_ INT_ {CagtalogCmdCat row $2} symbol | SYSTEM_ wcssys {CatalogCmdSystem $2} - | UPDATE_ {global cvarname; CATUpdate $cvarname} + | UPDATE_ {ProcessCmdCVAR0 CATUpdate} | 'x' STRING_ {ProcessCmdCVAR colx $2 CATGenerate} | RA_ STRING_ {ProcessCmdCVAR colx $2 CATGenerate} | 'y' STRING_ {ProcessCmdCVAR coly $2 CATGenerate} diff --git a/ds9/parsers/plotparser.tac b/ds9/parsers/plotparser.tac index 7a9b523..2181a29 100644 --- a/ds9/parsers/plotparser.tac +++ b/ds9/parsers/plotparser.tac @@ -217,7 +217,7 @@ plotCmd : LOAD_ load | SAVE_ STRING_ {PlotCmdSave $2} # xpa/samp only | DATA_ dim {PlotCmdData $2} - | CLEAR_ {global cvarname; PlotClearData $cvarname} + | CLEAR_ {ProcessCmdCVAR0 PlotClearData} | DUPLICATE_ duplicate # backward compatibility | DUP_ duplicate @@ -231,7 +231,7 @@ plotCmd : LOAD_ load # backward compatibility | PAGE_ pagesetup | PRINT_ print - | CLOSE_ {global cvarname; PlotDestroy $cvarname} + | CLOSE_ {ProcessCmdCVAR0 PlotDestroy} | MODE_ mode {ProcessCmdCVAR mode $2 PlotChangeMode} @@ -290,7 +290,7 @@ pageSize : LETTER_ {set _ letter} | A4_ {set _ a4} ; -print : {global cvarname; PlotPostScript $cvarname} +print : {ProcessCmdCVAR0 PlotPostScript} | DESTINATION_ printDest {ProcessCmdSet ps dest $2} | COMMAND_ STRING_ {ProcessCmdSet ps cmd $2} | FILENAME_ STRING_ {ProcessCmdSet ps filename $2} diff --git a/ds9/parsers/siaparser.tac b/ds9/parsers/siaparser.tac index d0e75a4..248dbd0 100644 --- a/ds9/parsers/siaparser.tac +++ b/ds9/parsers/siaparser.tac @@ -60,15 +60,15 @@ sia : {if {![SIACmdCheck]} {sia::YYABORT}} siaCmd | site {SIACmdRef $1} siaCmd ; -siaCmd : CANCEL_ {global cvarname; ARCancel $cvarname} - | CLOSE_ {global cvarname; SIADestroy $cvarname} - | CLEAR_ {global cvarname; SIAOff $cvarname} +siaCmd : CANCEL_ {ProcessCmdCVAR0 ARCancel} + | CLOSE_ {ProcessCmdCVAR0 SIADestroy} + | CLEAR_ {ProcessCmdCVAR0 SIAOff} | COORDINATE_ coordinate - | CROSSHAIR_ {global cvarname; IMGSVRCrosshair $cvarname} + | CROSSHAIR_ {ProcessCmdCVAR0 IMGSVRCrosshair} | EXPORT_ writer STRING_ {SIACmdSave $3 $2} | SAVE_ STRING_ {SIACmdSave $2 VOTWrite} | NAME_ STRING_ {ProcessCmdCVAR name $2} - | PRINT_ {global cvarname; CATPrint $cvarname} + | PRINT_ {ProcessCmdCVAR0 CATPrint} | RETRIEVE_ {global cvarname; SIAApply $cvarname 1} | RADIUS_ numeric rformat {SIACmdSize $2 $3} # backward compatibily @@ -76,7 +76,7 @@ siaCmd : CANCEL_ {global cvarname; ARCancel $cvarname} | SKY_ skyframe {SIACmdSkyframe $2} | SKYFORMAT_ skyformat {ProcessCmdCVAR skyformat $2} | SYSTEM_ wcssys {SIACmdSystem $2} - | UPDATE_ {global cvarname; IMGSVRUpdate $cvarname} + | UPDATE_ {ProcessCVAR0 IMGSVRUpdate} ; coordinate : numeric numeric {SIACmdCoord $1 $2 fk5} diff --git a/ds9/parsers/webparser.tac b/ds9/parsers/webparser.tac index de5693b..297f24a 100644 --- a/ds9/parsers/webparser.tac +++ b/ds9/parsers/webparser.tac @@ -30,14 +30,14 @@ web : {WebCmdNew {}} ; webCmd : CLICK_ click - | CLEAR_ {global cvarname; HVClearCmd $cvarname} - | CLOSE_ {global cvarname; HVDestroy $cvarname} + | CLEAR_ {ProcessCmdCVAR0 HVClearCmd} + | CLOSE_ {ProcessCmdCVAR0 HVDestroy} ; -click : BACK_ {global cvarname; HVBackCmd $cvarname} - | FORWARD_ {global cvarname; HVForwardCmd $cvarname} - | STOP_ {global cvarname; HVStopCmd $cvarname} - | RELOAD_ {global cvarname; HVReloadCmd $cvarname} +click : BACK_ {ProcessCmdCVAR0 HVBackCmd} + | FORWARD_ {ProcessCmdCVAR0 HVForwardCmd} + | STOP_ {ProcessCmdCVAR0 HVStopCmd} + | RELOAD_ {ProcessCmdCVAR0 HVReloadCmd} | INT_ {WebCmdClick $1} ; |