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/skyviewparser.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/skyviewparser.tac')
| -rw-r--r-- | ds9/parsers/skyviewparser.tac | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/ds9/parsers/skyviewparser.tac b/ds9/parsers/skyviewparser.tac index 9384969..75fc09f 100644 --- a/ds9/parsers/skyviewparser.tac +++ b/ds9/parsers/skyviewparser.tac @@ -22,23 +22,23 @@ command : skyview skyview : {IMGSVRApply dskyview 1} | OPEN_ {} | CLOSE_ {ARDestroy dskyview} - | STRING_ {global dskyview; set dskyview(name) $1; IMGSVRApply dskyview 1} - | numeric numeric coordOpt {global dskyview; set dskyview(x) $1; set dskyview(y) $2; set dskyview(skyformat) degrees; set dskyview(skyformat,msg) degrees; IMGSVRApply dskyview 1} - | SEXSTR_ SEXSTR_ coordOpt {global dskyview; set dskyview(x) $1; set dskyview(y) $2; set dskyview(skyformat) sexagesimal; set dskyview(skyformat,msg) sexagesimal; IMGSVRApply dskyview 1} - | SIZE_ numeric numeric sizeOpt {global dskyview; set dskyview(width) $2; set dskyview(height) $3; set dskyview(rformat) $4; set dskyview(rformat,msg) $4} - | PIXELS_ numeric numeric {global dskyview; set dskyview(width,pixels) $2; set dskyview(height,pixels) $3} - | SAVE_ yesno {global dskyview; set dskyview(save) $2} - | FRAME_ frame {global dskyview; set dskyview(mode) $2} + | STRING_ {IMGSVRCmdName dskyview $1} + | numeric numeric coordOpt {IMGSVRCmdCoord dskyview $1 $2 degrees} + | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord dskyview $1 $2 sexagesimal} + | SIZE_ numeric numeric sizeOpt {IMGSVRCmdSize dskyview $2 $3 $4} + | PIXELS_ numeric numeric {IMGSVRCmdPixels dskyview $2 $3} + | SAVE_ yesno {IMGSVRCmdSave dskyview $2} + | FRAME_ frame {IMGSVRCmdMode dskyview $2} + | SURVEY_ STRING_ {IMGSVRCmdSurvey dskyview $2} | UPDATE_ update - | SURVEY_ STRING_ {global dskyview; set dskyview(survey) $2} - | COORD_ numeric numeric deg {global dskyview; set dskyview(x) $2; set dskyview(y) $3; set dskyview(skyformat) $4; set dskyview(skyformat,msg) $4; IMGSVRApply dskyview 1} - | COORD_ SEXSTR_ SEXSTR_ sex {global dskyview; set dskyview(x) $2; set dskyview(y) $3; set dskyview(skyformat) $4; set dskyview(skyformat,msg) $4; IMGSVRApply dskyview 1} - | NAME_ STRING_ {global dskyview; set dskyview(name) $2; IMGSVRApply dskyview 1} + | COORD_ numeric numeric deg {IMGSVRCmdCoord dskyview $2 $3 $4} + | COORD_ SEXSTR_ SEXSTR_ sex {IMGSVRCmdCoord dskyview $2 $3 $4} + | NAME_ STRING_ {IMGSVRCmdName dskyview $2} ; -update : FRAME_ {IMGSVRUpdate dskyview; IMGSVRApply dskyview 1} - | CROSSHAIR_ {IMGSVRCrosshair dskyview; IMGSVRApply dskyview 1} +update : FRAME_ {IMGSVRCmdUpdateFrame dskyview} + | CROSSHAIR_ {IMGSVRCmdUpdateCrosshair dskyview} ; %% |