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/nvssparser.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/nvssparser.tac')
| -rw-r--r-- | ds9/parsers/nvssparser.tac | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ds9/parsers/nvssparser.tac b/ds9/parsers/nvssparser.tac index 7efa349..af01121 100644 --- a/ds9/parsers/nvssparser.tac +++ b/ds9/parsers/nvssparser.tac @@ -20,21 +20,21 @@ command : nvss nvss : {IMGSVRApply dnvss 1} | OPEN_ {} | CLOSE_ {ARDestroy dnvss} - | STRING_ {global dnvss; set dnvss(name) $1; IMGSVRApply dnvss 1} - | numeric numeric coordOpt {global dnvss; set dnvss(x) $1; set dnvss(y) $2; set dnvss(skyformat) degrees; set dnvss(skyformat,msg) degrees; IMGSVRApply dnvss 1} - | SEXSTR_ SEXSTR_ coordOpt {global dnvss; set dnvss(x) $1; set dnvss(y) $2; set dnvss(skyformat) sexagesimal; set dnvss(skyformat,msg) sexagesimal; IMGSVRApply dnvss 1} - | SIZE_ numeric numeric sizeOpt {global dnvss; set dnvss(width) $2; set dnvss(height) $3; set dnvss(rformat) $4; set dnvss(rformat,msg) $4} - | SAVE_ yesno {global dnvss; set dnvss(save) $2} - | FRAME_ frame {global dnvss; set dnvss(mode) $2} + | STRING_ {IMGSVRCmdName dnvss $1} + | numeric numeric coordOpt {IMGSVRCmdCoord dnvss $1 $2 degrees} + | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord dnvss $1 $2 sexagesimal} + | SIZE_ numeric numeric sizeOpt {IMGSVRCmdSize dnvss $2 $3 $4} + | SAVE_ yesno {IMGSVRCmdSave dnvss $2} + | FRAME_ frame {IMGSVRCmdMode dnvss $2} | UPDATE_ update - | COORD_ numeric numeric deg {global dnvss; set dnvss(x) $2; set dnvss(y) $3; set dnvss(skyformat) $4; set dnvss(skyformat,msg) $4; IMGSVRApply dnvss 1} - | COORD_ SEXSTR_ SEXSTR_ sex {global dnvss; set dnvss(x) $2; set dnvss(y) $3; set dnvss(skyformat) $4; set dnvss(skyformat,msg) $4; IMGSVRApply dnvss 1} - | NAME_ STRING_ {global dnvss; set dnvss(name) $2; IMGSVRApply dnvss 1} + | COORD_ numeric numeric deg {IMGSVRCmdCoord dnvss $2 $3 $4} + | COORD_ SEXSTR_ SEXSTR_ sex {IMGSVRCmdCoord dnvss $2 $3 $4} + | NAME_ STRING_ {IMGSVRCmdName dnvss $2} ; -update : FRAME_ {IMGSVRUpdate dnvss; IMGSVRApply dnvss 1} - | CROSSHAIR_ {IMGSVRCrosshair dnvss; IMGSVRApply dnvss 1} +update : FRAME_ {IMGSVRCmdUpdateFrame dnvss} + | CROSSHAIR_ {IMGSVRCmdUpdateCrosshair dnvss} ; %% |