diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2018-03-08 22:25:47 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2018-03-08 22:25:47 (GMT) |
| commit | dc1c107ac6d51fab16940a4c197438c46ca68f2e (patch) | |
| tree | 6f8e9dc47bc0b7bf5ed3c3ce77f2da23ba2d75ae /ds9/parsers/vlaparser.tac | |
| parent | ef8770fc12152ddee602f1145f87dcfb540a8bf8 (diff) | |
| download | blt-dc1c107ac6d51fab16940a4c197438c46ca68f2e.zip blt-dc1c107ac6d51fab16940a4c197438c46ca68f2e.tar.gz blt-dc1c107ac6d51fab16940a4c197438c46ca68f2e.tar.bz2 | |
simplify ds9 imgsvr parsers
Diffstat (limited to 'ds9/parsers/vlaparser.tac')
| -rw-r--r-- | ds9/parsers/vlaparser.tac | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/ds9/parsers/vlaparser.tac b/ds9/parsers/vlaparser.tac index 9a8369f..bcb5a51 100644 --- a/ds9/parsers/vlaparser.tac +++ b/ds9/parsers/vlaparser.tac @@ -23,22 +23,22 @@ command : vla vla : {IMGSVRApply dvla 1} | OPEN_ {} | CLOSE_ {ARDestroy dvla} - | STRING_ {global dvla; set dvla(name) $1; IMGSVRApply dvla 1} - | numeric numeric coordOpt {global dvla; set dvla(x) $1; set dvla(y) $2; set dvla(skyformat) degrees; set dvla(skyformat,msg) degrees; IMGSVRApply dvla 1} - | SEXSTR_ SEXSTR_ coordOpt {global dvla; set dvla(x) $1; set dvla(y) $2; set dvla(skyformat) sexagesimal; set dvla(skyformat,msg) sexagesimal; IMGSVRApply dvla 1} - | SIZE_ numeric numeric sizeOpt {global dvla; set dvla(width) $2; set dvla(height) $3; set dvla(rformat) $4; set dvla(rformat,msg) $4} - | SAVE_ yesno {global dvla; set dvla(save) $2} - | FRAME_ frame {global dvla; set dvla(mode) $2} + | STRING_ {IMGSVRCmdName dvla $1} + | numeric numeric coordOpt {IMGSVRCmdCoord dvla $1 $2 degrees} + | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord dvla $1 $2 sexagesimal} + | SIZE_ numeric numeric sizeOpt {IMGSVRCmdSize dvla $2 $3 $4} + | SAVE_ yesno {IMGSVRCmdSave dvla $2} + | FRAME_ frame {IMGSVRCmdMode dvla $2} + | SURVEY_ survey {IMGSVRCmdSurvey dvla $2} | UPDATE_ update - | SURVEY_ survey {global dvla; set dvla(survey) $2} - | COORD_ numeric numeric deg {global dvla; set dvla(x) $2; set dvla(y) $3; set dvla(skyformat) $4; set dvla(skyformat,msg) $4; IMGSVRApply dvla 1} - | COORD_ SEXSTR_ SEXSTR_ sex {global dvla; set dvla(x) $2; set dvla(y) $3; set dvla(skyformat) $4; set dvla(skyformat,msg) $4; IMGSVRApply dvla 1} - | NAME_ STRING_ {global dvla; set dvla(name) $2; IMGSVRApply dvla 1} + | COORD_ numeric numeric deg {IMGSVRCmdCoord dvla $2 $3 $4} + | COORD_ SEXSTR_ SEXSTR_ sex {IMGSVRCmdCoord dvla $2 $3 $4} + | NAME_ STRING_ {IMGSVRCmdName dvla $2} ; -update : FRAME_ {IMGSVRUpdate dvla; IMGSVRApply dvla 1} - | CROSSHAIR_ {IMGSVRCrosshair dvla; IMGSVRApply dvla 1} +update : FRAME_ {IMGSVRCmdUpdateFrame dvla} + | CROSSHAIR_ {IMGSVRCmdUpdateCrosshair dvla} ; survey : STRIPE82_ {set _ stripe82} |