summaryrefslogtreecommitdiffstats
path: root/ds9/parsers
diff options
context:
space:
mode:
authorWilliam Joye <wjoye@cfa.harvard.edu>2018-11-07 22:09:29 (GMT)
committerWilliam Joye <wjoye@cfa.harvard.edu>2018-11-07 22:09:29 (GMT)
commit31e0d69941f31e61e5c242cef79e0bd916fe4ace (patch)
tree1321c597d5f796d02b6226207ecc2d72ac5b4610 /ds9/parsers
parentd81a364b0f8e7e847dae9274ee89fe6cdcffaa0e (diff)
downloadblt-31e0d69941f31e61e5c242cef79e0bd916fe4ace.zip
blt-31e0d69941f31e61e5c242cef79e0bd916fe4ace.tar.gz
blt-31e0d69941f31e61e5c242cef79e0bd916fe4ace.tar.bz2
add mask range
Diffstat (limited to 'ds9/parsers')
-rw-r--r--ds9/parsers/masklex.fcl3
-rw-r--r--ds9/parsers/maskparser.tac9
-rw-r--r--ds9/parsers/masksendlex.fcl1
-rw-r--r--ds9/parsers/masksendparser.tac2
4 files changed, 15 insertions, 0 deletions
diff --git a/ds9/parsers/masklex.fcl b/ds9/parsers/masklex.fcl
index 45d633f..cafe4b6 100644
--- a/ds9/parsers/masklex.fcl
+++ b/ds9/parsers/masklex.fcl
@@ -11,9 +11,12 @@ close {return $CLOSE_}
clear {return $CLEAR_}
color {return $COLOR_}
mark {return $MARK_}
+nonzero {return $NONZERO_}
open {return $OPEN_}
+range {return $RANGE_}
system {return $SYSTEM_}
transparency {return $TRANSPARENCY_}
+zero {return $ZERO_}
#include coordsys.fin
#include wcssys.fin
diff --git a/ds9/parsers/maskparser.tac b/ds9/parsers/maskparser.tac
index 6462738..8831f46 100644
--- a/ds9/parsers/maskparser.tac
+++ b/ds9/parsers/maskparser.tac
@@ -13,9 +13,12 @@
%token CLOSE_
%token COLOR_
%token MARK_
+%token NONZERO_
%token OPEN_
+%token RANGE_
%token SYSTEM_
%token TRANSPARENCY_
+%token ZERO_
%%
@@ -33,10 +36,16 @@ mask : {global parse; set parse(result) mask}
| CLEAR_ {MaskClear}
| COLOR_ STRING_ {ProcessCmdSet mask color $2 MaskColor}
| MARK_ INT_ {ProcessCmdSet mask mark $2 MaskMark}
+ | MARK_ mark {ProcessCmdSet mask mark $2 MaskMark}
| SYSTEM_ system
| TRANSPARENCY_ numeric {ProcessCmdSet mask transparency $2 MaskTransparency}
;
+mark : ZERO_ {set _ zero}
+ | NONZERO_ {set _ nonzero}
+ | RANGE_ {set _ range}
+ ;
+
system : coordsys {ProcessCmdSet mask system $1 MaskSystem}
| wcssys {ProcessCmdSet mask system $1 MaskSystem}
;
diff --git a/ds9/parsers/masksendlex.fcl b/ds9/parsers/masksendlex.fcl
index 378af08..71d11c8 100644
--- a/ds9/parsers/masksendlex.fcl
+++ b/ds9/parsers/masksendlex.fcl
@@ -9,6 +9,7 @@
color {return $COLOR_}
mark {return $MARK_}
+range {return $RANGE_}
system {return $SYSTEM_}
transparency {return $TRANSPARENCY_}
diff --git a/ds9/parsers/masksendparser.tac b/ds9/parsers/masksendparser.tac
index 9fdb15d..94d9acd 100644
--- a/ds9/parsers/masksendparser.tac
+++ b/ds9/parsers/masksendparser.tac
@@ -6,6 +6,7 @@
%token COLOR_
%token MARK_
+%token RANGE_
%token SYSTEM_
%token TRANSPARENCY_
@@ -13,6 +14,7 @@
masksend : COLOR_ {ProcessSendCmdGet mask color}
| MARK_ {ProcessSendCmdGet mask mark}
+ | RANGE_ {ProcessSendCmdGet2 mask low high}
| SYSTEM_ {ProcessSendCmdGet mask system}
| TRANSPARENCY_ {ProcessSendCmdGet mask transparency}
;