diff options
Diffstat (limited to 'ds9/parsers/regionparser.tac')
-rw-r--r-- | ds9/parsers/regionparser.tac | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/ds9/parsers/regionparser.tac b/ds9/parsers/regionparser.tac index dd9c61c..5142ea4 100644 --- a/ds9/parsers/regionparser.tac +++ b/ds9/parsers/regionparser.tac @@ -125,12 +125,12 @@ region : {RegionCmdLoad} | FILE_ loadall STRING_ {RegionCmdLoadFn $3 $2} | SAVE_ STRING_ {RegionCmdSave $2} | LIST_ list - | EPSILON_ INT_ {PmarkerCmdSet epsilon $2 MarkerEpsilon} - | SHOW_ yesno {MarkerCmdSet show $2 MarkerShow} - | SHOWTEXT_ yesno {MarkerCmdSet show,text $2 MarkerShowText} + | EPSILON_ INT_ {ProcessCmdSet pmarker epsilon $2 MarkerEpsilon} + | SHOW_ yesno {ProcessCmdSet marker show $2 MarkerShow} + | SHOWTEXT_ yesno {ProcessCmdSet marker show,text $2 MarkerShowText} | CENTROID_ centroid # backward compatibility - | AUTOCENTROID_ yesno {MarkerCmdSet centroid,auto $2 MarkerCentroidAuto} + | AUTOCENTROID_ yesno {ProcessCmdSet marker centroid,auto $2 MarkerCentroidAuto} | GETINFO_ {MarkerInfo} | MOVE_ move # backward compatibility @@ -145,35 +145,35 @@ region : {RegionCmdLoad} | DELETE_ delete # backward compatibility | DELETEALL_ {MarkerDeleteAll} - | FORMAT_ format {MarkerCmdSet format $2} - | SYSTEM_ coordsys {MarkerCmdSet system $2} - | SYSTEM_ wcssys {MarkerCmdSet system $2} + | FORMAT_ format {ProcessCmdSet marker format $2} + | SYSTEM_ coordsys {ProcessCmdSet marker system $2} + | SYSTEM_ wcssys {ProcessCmdSet marker system $2} # backward compatibility - | SYSTEM_ skyframe {MarkerCmdSet system wcs; MarkerCmdSet sky $2} - | SKY_ skyframe {MarkerCmdSet sky $2} - | SKYFORMAT_ skyformat {MarkerCmdSet skyformat $2} - | STRIP_ yesno {MarkerCmdSet strip $2} - | DELIM_ delim {MarkerCmdSet strip $2} - | SHAPE_ shape {MarkerCmdSet shape $2} - | COLOR_ STRING_ {MarkerCmdSet color $2 MarkerColor} - | WIDTH_ INT_ {MarkerCmdSet width $2 MarkerWidth} - | FIXED_ yesno {MarkerCmdSet fixed $2 [list MarkerProp fixed]} - | EDIT_ yesno {MarkerCmdSet edit $2 [list MarkerProp edit]} - | ROTATE_ yesno {MarkerCmdSet rotate $2 [list MarkerProp rotate]} - | DELETE_ yesno {MarkerCmdSet delete $2 [list MarkerProp delete]} - | INCLUDE_ {MarkerCmdSet include 1 [list MarkerProp include]} - | EXCLUDE_ {MarkerCmdSet include 0 [list MarkerProp include]} - | SOURCE_ {MarkerCmdSet source 1 [list MarkerProp source]} - | BACKGROUND_ {MarkerCmdSet source 0 [list MarkerProp source]} + | SYSTEM_ skyframe {ProcessCmdSet marker system wcs; ProcessCmdSet marker sky $2} + | SKY_ skyframe {ProcessCmdSet marker sky $2} + | SKYFORMAT_ skyformat {ProcessCmdSet marker skyformat $2} + | STRIP_ yesno {ProcessCmdSet marker strip $2} + | DELIM_ delim {ProcessCmdSet marker strip $2} + | SHAPE_ shape {ProcessCmdSet marker shape $2} + | COLOR_ STRING_ {ProcessCmdSet marker color $2 MarkerColor} + | WIDTH_ INT_ {ProcessCmdSet marker width $2 MarkerWidth} + | FIXED_ yesno {ProcessCmdSet marker fixed $2 [list MarkerProp fixed]} + | EDIT_ yesno {ProcessCmdSet marker edit $2 [list MarkerProp edit]} + | ROTATE_ yesno {ProcessCmdSet marker rotate $2 [list MarkerProp rotate]} + | DELETE_ yesno {ProcessCmdSet marker delete $2 [list MarkerProp delete]} + | INCLUDE_ {ProcessCmdSet marker include 1 [list MarkerProp include]} + | EXCLUDE_ {ProcessCmdSet marker include 0 [list MarkerProp include]} + | SOURCE_ {ProcessCmdSet marker source 1 [list MarkerProp source]} + | BACKGROUND_ {ProcessCmdSet marker source 0 [list MarkerProp source]} | GROUPS_ group | GROUP_ group | COPY_ {MarkerCopy} | CUT_ {MarkerCut} - | PASTE_ {MarkerCmdSet paste,system wcs MarkerPaste} - | PASTE_ coordsys {MarkerCmdSet paste,system $2 MarkerPaste} - | PASTE_ wcssys {MarkerCmdSet paste,system $2 MarkerPaste} + | PASTE_ {ProcessCmdSet marker paste,system wcs MarkerPaste} + | PASTE_ coordsys {ProcessCmdSet marker paste,system $2 MarkerPaste} + | PASTE_ wcssys {ProcessCmdSet marker paste,system $2 MarkerPaste} # backward compatibility - | PASTE_ skyframe {MarkerCmdSet paste,system wcs MarkerPaste} + | PASTE_ skyframe {ProcessCmdSet marker paste,system wcs MarkerPaste} | UNDO_ {MarkerUndo} | COMPOSITE_ {CompositeCreate} | DISSOLVE_ {CompositeDelete} @@ -186,12 +186,12 @@ props : props prop | prop ; -prop : -FORMAT_ format {MarkerCmdSet load,format $2} - | -SYSTEM_ coordsys {MarkerCmdSet load,system $2} - | -SYSTEM_ wcssys {MarkerCmdSet load,system $2} +prop : -FORMAT_ format {ProcessCmdSet marker load,format $2} + | -SYSTEM_ coordsys {ProcessCmdSet marker load,system $2} + | -SYSTEM_ wcssys {ProcessCmdSet marker load,system $2} # backward compatibility - | -SYSTEM_ skyframe {MarkerCmdSet load,system wcs; MarkerCmdSet load,sky $2} - | -SKY_ skyframe {MarkerCmdSet load,sky $2} + | -SYSTEM_ skyframe {ProcessCmdSet marker load,system wcs; ProcessCmdSet marker load,sky $2} + | -SKY_ skyframe {ProcessCmdSet marker load,sky $2} ; loadall : {set _ 0} @@ -203,9 +203,9 @@ list : {RegionCmdList} ; centroid : {MarkerCentroid} - | AUTO_ yesno {MarkerCmdSet centroid,auto $2 MarkerCentroidAuto} - | RADIUS_ numeric {MarkerCmdSet centroid,radius $2 MarkerCentroidRadius} - | ITERATION_ INT_ {MarkerCmdSet centroid,iteration $2 MarkerCentroidIteration} + | AUTO_ yesno {ProcessCmdSet marker centroid,auto $2 MarkerCentroidAuto} + | RADIUS_ numeric {ProcessCmdSet marker centroid,radius $2 MarkerCentroidRadius} + | ITERATION_ INT_ {ProcessCmdSet marker centroid,iteration $2 MarkerCentroidIteration} ; move : FRONT_ {MarkerFront} |