summaryrefslogtreecommitdiffstats
path: root/ds9
diff options
context:
space:
mode:
authorWilliam Joye <wjoye@cfa.harvard.edu>2017-07-12 14:22:13 (GMT)
committerWilliam Joye <wjoye@cfa.harvard.edu>2017-07-12 14:22:13 (GMT)
commit8f4f4b0e74d073dcc2ee90ca0007271673199099 (patch)
tree7678b1f8ab314c1e5734b353307adf06a6505751 /ds9
parentc31ed60391ecafda1369e2c97605e87067958686 (diff)
downloadblt-8f4f4b0e74d073dcc2ee90ca0007271673199099.zip
blt-8f4f4b0e74d073dcc2ee90ca0007271673199099.tar.gz
blt-8f4f4b0e74d073dcc2ee90ca0007271673199099.tar.bz2
update parser
Diffstat (limited to 'ds9')
-rw-r--r--ds9/library/lex.fcl7
-rw-r--r--ds9/library/parser.tac20
2 files changed, 27 insertions, 0 deletions
diff --git a/ds9/library/lex.fcl b/ds9/library/lex.fcl
index 8dfb2ae..ce12760 100644
--- a/ds9/library/lex.fcl
+++ b/ds9/library/lex.fcl
@@ -21,11 +21,15 @@ E [Ee][+-]?{D}+
-3d {return $::3DCMD_}
-align {return $::ALIGNCMD_}
-asinh {return $::ASINHCMD_}
+-bg {return $::BGCMD_}
+-background {return $::BGCMD_}
-exit {return $::QUITCMD_}
-help {return $::HELPCMD_}
-histequ {return $::HISTEQUCMD_}
-linear {return $::LINEARCMD_}
-log {return $::LOGCMD_}
+-nan {return $::NANCMD_}
+-orient {return $::ORIENTCMD_}
-private {return $::PRIVATECMD_}
-pow {return $::POWCMD_}
-quit {return $::QUITCMD_}
@@ -97,6 +101,9 @@ update {return $::UPDATE_}
user {return $::USER_}
view {return $::VIEW_}
vp {return $::VIEW_}
+x {return $::X_}
+xy {return $::XY_}
+y {return $::Y_}
yes {return $::YES_}
zscale {return $::ZSCALE_}
zmax {return $::ZMAX_}
diff --git a/ds9/library/parser.tac b/ds9/library/parser.tac
index 8d95f81..60ed62b 100644
--- a/ds9/library/parser.tac
+++ b/ds9/library/parser.tac
@@ -18,10 +18,13 @@ set file(load) 0
%token 3DCMD_
%token ALIGNCMD_
%token ASINHCMD_
+%token BGCMD_
%token HELPCMD_
%token HISTEQUCMD_
%token LINEARCMD_
%token LOGCMD_
+%token NANCMD_
+%token ORIENTCMD_
%token PRIVATECMD_
%token POWCMD_
%token QUITCMD_
@@ -89,6 +92,9 @@ set file(load) 0
%token UPDATE_
%token USER_
%token VIEW_
+%token X_
+%token XY_
+%token Y_
%token YES_
%token ZSCALE_
%token ZMAX_
@@ -103,10 +109,13 @@ command : 2MASSCMD_ {2MASSDialog} 2mass
| 3DCMD_ {3DDialog} 3d
| ALIGNCMD_ align
| ASINHCMD_ {global scale; set scale(type) asinh; ChangeScale}
+ | BGCMD_ STRING_ {global pds9; set pds9(bg) $2; PrefsBgColor}
| HELPCMD_ {HelpCommand}
| HISTEQUCMD_ {global scale; set scale(type) histequ; ChangeScale}
| LINEARCMD_ {global scale; set scale(type) linear; ChangeScale}
| LOGCMD_ {global scale; set scale(type) log; ChangeScale}
+ | NANCMD_ STRING_ {global pds9; set pds9(nan) $2; PrefsNanColor}
+ | ORIENTCMD_ orient
| PRIVATECMD_ {
# backword compatibility
}
@@ -240,6 +249,17 @@ align : {global current; set current(align) 1; AlignWCSFrame}
| yesno {global current; set current(align) $1; AlignWCSFrame}
;
+orient : orientation {global current; set current(orient) $1; ChangeOrient}
+ | OPEN_ {PanZoomDialog}
+ | CLOSE_ {PanZoomDestroyDialog}
+ ;
+
+orientation : NONE_ {set _ none}
+ | X_ {set _ x}
+ | Y_ {set _ y}
+ | XY_ {set _ xy}
+ ;
+
scale : scaleScales {global scale; set scale(type) $1; ChangeScale}
| LOG_ scaleLog
| DATASEC_ yesno