summaryrefslogtreecommitdiffstats
path: root/ds9/parsers
diff options
context:
space:
mode:
authorWilliam Joye <wjoye@cfa.harvard.edu>2018-03-16 22:13:26 (GMT)
committerWilliam Joye <wjoye@cfa.harvard.edu>2018-03-16 22:13:26 (GMT)
commit4b906e8fc8b90fef6800ed700fbf4d6c9ea0dd7c (patch)
treeee8c1433f6f3b7baf0a94af6a65a8d24596c35b8 /ds9/parsers
parentf6362e12a6c080c84c2f102ad5dc44e2fb63357a (diff)
downloadblt-4b906e8fc8b90fef6800ed700fbf4d6c9ea0dd7c.zip
blt-4b906e8fc8b90fef6800ed700fbf4d6c9ea0dd7c.tar.gz
blt-4b906e8fc8b90fef6800ed700fbf4d6c9ea0dd7c.tar.bz2
update ds9 contour parser
Diffstat (limited to 'ds9/parsers')
-rw-r--r--ds9/parsers/contourparser.tac24
1 files changed, 18 insertions, 6 deletions
diff --git a/ds9/parsers/contourparser.tac b/ds9/parsers/contourparser.tac
index 23c6df4..55519b9 100644
--- a/ds9/parsers/contourparser.tac
+++ b/ds9/parsers/contourparser.tac
@@ -62,8 +62,8 @@ contour : yesno {global contour; set contour(view) $1; UpdateContour}
| OPEN_ {ContourDialog}
| CLOSE_ {ContourDestroyDialog}
| CLEAR_ {ContourOffDialog}
- | LOAD_
- | SAVE_
+ | LOAD_ load
+ | SAVE_ save
| CONVERT_ {Contour2Polygons}
| LOADLEVELS_
| SAVELEVELS_
@@ -84,10 +84,22 @@ contour : yesno {global contour; set contour(view) $1; UpdateContour}
| GENERATE_ {ContourCmdGenerate}
;
-paste : coordsys STRING_ INT_ yesno
- | wcssys STRING_ INT_ yesno
- | skyframe STRING_ INT_ yesno
- | wcssys skyframe STRING_ INT_ yesno
+load : STRING_ {ContourCmdLoad $1}
+ | STRING_ STRING_ INT_ yesno {ContourCmdLoadOpt $1 $2 $3 $4}
+ | STRING_ coordsys STRING_ INT_ yesno {ContourCmdLoadOrg $1 $2 fk5 $3 $4 $5}
+ | STRING_ wcssys STRING_ INT_ yesno {ContourCmdLoadOrg $1 $2 fk5 $3 $4 $5}
+ | STRING_ skyframe STRING_ INT_ yesno {ContourCmdLoadOrg $1 wcs $2 $3 $4 $5}
+ | STRING_ wcssys skyframe STRING_ INT_ yesno {ContourCmdLoadOrg $1 $2 $3 $4 $5 $6}
+ ;
+
+save : STRING_
+ ;
+
+paste : {ContourCmdPaste}
+ | coordsys STRING_ INT_ yesno {ContourCmdPasteOrg $1 fk5 $2 $3 $4}
+ | wcssys STRING_ INT_ yesno {ContourCmdPasteOrg $1 fk5 $2 $3 $4}
+ | skyframe STRING_ INT_ yesno {ContourCmdPasteOrg wcs $1 $2 $3 $4}
+ | wcssys skyframe STRING_ INT_ yesno {ContourCmdPasteOrg $1 $2 $3 $4 $5}
;
method : BLOCK_ {set _ block}