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/dssstsciparser.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/dssstsciparser.tac')
| -rw-r--r-- | ds9/parsers/dssstsciparser.tac | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/ds9/parsers/dssstsciparser.tac b/ds9/parsers/dssstsciparser.tac index 649b2f3..96ae566 100644 --- a/ds9/parsers/dssstsciparser.tac +++ b/ds9/parsers/dssstsciparser.tac @@ -27,25 +27,25 @@ command : dssstsci | dssstsci {yyclearin; YYACCEPT} CMD_ ; -dssstsci : {IMGSVRApply dstscii 1} +dssstsci : {IMGSVRApply dstsci 1} | OPEN_ {} - | CLOSE_ {ARDestroy dstscii} - | STRING_ {global dstscii; set dstscii(name) $1; IMGSVRApply dstscii 1} - | numeric numeric coordOpt {global dstscii; set dstscii(x) $1; set dstscii(y) $2; set dstscii(skyformat) degrees; set dstscii(skyformat,msg) degrees; IMGSVRApply dstscii 1} - | SEXSTR_ SEXSTR_ coordOpt {global dstscii; set dstscii(x) $1; set dstscii(y) $2; set dstscii(skyformat) sexagesimal; set dstscii(skyformat,msg) sexagesimal; IMGSVRApply dstscii 1} - | SIZE_ numeric numeric sizeOpt {global dstscii; set dstscii(width) $2; set dstscii(height) $3; set dstscii(rformat) $4; set dstscii(rformat,msg) $4} - | SAVE_ yesno {global dstscii; set dstscii(save) $2} - | FRAME_ frame {global dstscii; set dstscii(mode) $2} + | CLOSE_ {ARDestroy dstsci} + | STRING_ {IMGSVRCmdName dstsci $1} + | numeric numeric coordOpt {IMGSVRCmdCoord dstsci $1 $2 degrees} + | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord dstsci $1 $2 sexagesimal} + | SIZE_ numeric numeric sizeOpt {IMGSVRCmdSize dstsci $2 $3 $4} + | SAVE_ yesno {IMGSVRCmdSave dstsci $2} + | FRAME_ frame {IMGSVRCmdMode dstsci $2} + | SURVEY_ survey {IMGSVRCmdSurvey dstsci $2} | UPDATE_ update - | SURVEY_ survey {global dstscii; set dstscii(survey) $2} - | COORD_ numeric numeric deg {global dstscii; set dstscii(x) $2; set dstscii(y) $3; set dstscii(skyformat) $4; set dstscii(skyformat,msg) $4; IMGSVRApply dstscii 1} - | COORD_ SEXSTR_ SEXSTR_ sex {global dstscii; set dstscii(x) $2; set dstscii(y) $3; set dstscii(skyformat) $4; set dstscii(skyformat,msg) $4; IMGSVRApply dstscii 1} - | NAME_ STRING_ {global dstscii; set dstscii(name) $2; IMGSVRApply dstscii 1} + | COORD_ numeric numeric deg {IMGSVRCmdCoord dstsci $2 $3 $4} + | COORD_ SEXSTR_ SEXSTR_ sex {IMGSVRCmdCoord dstsci $2 $3 $4} + | NAME_ STRING_ {IMGSVRCmdName dstsci $2} ; -update : FRAME_ {IMGSVRUpdate dstscii; IMGSVRApply dstscii 1} - | CROSSHAIR_ {IMGSVRCrosshair dstscii; IMGSVRApply dstscii 1} +update : FRAME_ {IMGSVRCmdUpdateFrame dstsci} + | CROSSHAIR_ {IMGSVRCmdUpdateCrosshair dstsci} ; survey : POSS2RED_ {set _ poss2ukstu_red} |