From 8e62e66228010ae69109692ecf8ddeba4bfc979f Mon Sep 17 00:00:00 2001 From: William Joye Date: Wed, 6 Jun 2018 14:07:24 -0400 Subject: update ds9 parsers --- ds9/doc/ref/command.html | 141 ++++++++++++++++++++++++---------- ds9/doc/ref/samp.html | 170 +++++++++++++++++++++++++++++++---------- ds9/doc/ref/xpa.html | 168 +++++++++++++++++++++++++++++----------- ds9/library/imgsvr.tcl | 35 --------- ds9/library/util.tcl | 33 ++++++++ ds9/parsers/dssesoparser.tac | 23 +++--- ds9/parsers/dsssaoparser.tac | 21 ++--- ds9/parsers/dssstsciparser.tac | 23 +++--- ds9/parsers/imgsvr.fin | 1 + ds9/parsers/imgsvr.tin | 1 + ds9/parsers/nvssparser.tac | 21 ++--- ds9/parsers/skyviewparser.tac | 25 +++--- ds9/parsers/twomassparser.tac | 23 +++--- ds9/parsers/vlaparser.tac | 23 +++--- ds9/parsers/vlssparser.tac | 21 ++--- 15 files changed, 493 insertions(+), 236 deletions(-) diff --git a/ds9/doc/ref/command.html b/ds9/doc/ref/command.html index fbf230d..dde52f1 100644 --- a/ds9/doc/ref/command.html +++ b/ds9/doc/ref/command.html @@ -154,9 +154,9 @@ Syntax:
-2mass []
       [<object>]
-        [name <object>]
-        [coord <ra> - <dec> degrees|sexagesimal] # in wcs fk5
+        [name <object>|clear]
+        [<ra> <dec>] # + in wcs fk5
       [size <width> <height> degrees|arcmin|arcsec]
       [save yes|no]
@@ -168,8 +168,9 @@ Example:
$ds9 -2mass
$ds9 -2mass m31
- $ds9 -2mass name m31
- $ds9 -2mass coord 00:42:44.404 +41:16:08.78 sexagesimal
+ $ds9 -2mass name m31
+ $ds9 -2mass name clear
+ $ds9 -2mass 00:42:44.404 +41:16:08.78
$ds9 -2mass size 60 60 arcmin
$ds9 -2mass save yes
$ds9 -2mass frame current
@@ -524,6 +525,7 @@ + [crosshair]
        [<ref>] [dec <col>]
@@ -640,6 +642,7 @@ + [match error <value> degrees|arcmin|arcsec]
        [<ref>] @@ -738,6 +741,7 @@ + [match function 1and2|1not2|2not1]
        [<ref>] @@ -836,6 +840,7 @@ + [match return 1and2|1only|2only]
        [<ref>] @@ -934,6 +939,7 @@ + [match unique yes|no]
        [<ref>] [maxrows <number>]
@@ -987,14 +993,17 @@ + [symbol shape circle + point|box point|diamond point|cross + point|x point|arrow point|boxcircle point]
         [<ref>] [symbol add| [#] remove]
@@ -1099,6 +1108,7 @@ + [update]
        [<ref>] [x <col>]
@@ -1230,6 +1240,7 @@ + [match]
          [lock [yes|no]]
@@ -1496,6 +1507,7 @@ + [match <coordsys>]
           [lock <coordsys>|none]
@@ -1553,9 +1565,10 @@ Syntax:
-dsssao []
        [<object>]
-         [name <object>]
-         [coord <ra> - <dec> degrees|sexagesimal] # in wcs fk5
+         [name + <object>|clear]
+         [<ra> + <dec>] # in wcs fk5
        [size <width> <height> degrees|arcmin|arcsec]
        [save yes|no]
@@ -1567,8 +1580,9 @@ Example:
$ds9 -dsssao
$ds9 -dsssao m31
- $ds9 -dsssao name m31
- $ds9 -dsssao coord 00:42:44.404 +41:16:08.78 sexagesimal
+ $ds9 -dsssao name m31
+ $ds9 -dsssao name clear
+ $ds9 -dsssao 00:42:44.404 +41:16:08.78
$ds9 -dsssao size 60 60 arcmin
$ds9 -dsssao save yes
$ds9 -dsssao frame current
@@ -1581,9 +1595,10 @@ Syntax:
-dsseso []
        [<object>]
-         [name <object>]
-         [coord <ra> - <dec> degrees|sexagesimal] # in wcs fk5
+         [name + <object>|clear]
+         [<ra> + <dec>] # in wcs fk5
        [size <width> <height> degrees|arcmin|arcsec]
        [save yes|no]
@@ -1597,8 +1612,9 @@ Example:
$ds9 -dsseso
$ds9 -dsseso m31
- $ds9 -dsseso name m31
- $ds9 -dsseso coord 00:42:44.404 +41:16:08.78 sexagesimal
+ $ds9 -dsseso name m31
+ $ds9 -dsseso name clear
+ $ds9 -dsseso 00:42:44.404 +41:16:08.78
$ds9 -dsseso size 60 60 arcmin
$ds9 -dsseso save yes
$ds9 -dsseso frame current
@@ -1612,9 +1628,9 @@ -dssstsci []
          [<object>]
          [name - <object>]
-           [coord - <ra> <dec> degrees|sexagesimal] # in wcs fk5
+ <object>|clear]
+           + [<ra> <dec>] # in wcs fk5
          [size <width> <height> degrees|arcmin|arcsec]
          [save @@ -1634,8 +1650,9 @@ Example:
$ds9 -dssstsci
$ds9 -dssstsci m31
- $ds9 -dssstsci name m31
- $ds9 -dssstsci coord 00:42:44.404 +41:16:08.78 sexagesimal
+ $ds9 -dssstsci name m31
+ $ds9 -dssstsci name clear
+ $ds9 -dssstsci 00:42:44.404 +41:16:08.78
$ds9 -dssstsci size 60 60 arcmin
$ds9 -dssstsci save yes
$ds9 -dssstsci frame current
@@ -1656,6 +1673,7 @@ + -envi foo.hdr foo.bsq

exit
@@ -2404,6 +2422,7 @@ + [pan]
            @@ -2545,6 +2564,7 @@ + [crosshair]
            @@ -2686,6 +2706,7 @@ + [open|close]
 
Example:
@@ -2720,9 +2741,9 @@ Syntax:
-nvss []
      [<object>]
-       [name <object>]
-       [coord <ra> <dec> - degrees|sexagesimal] # in wcs fk5
+       [name <object>|clear]
+       [<ra> <dec>] # in wcs + fk5
      [size <width> <height> degrees|arcmin|arcsec]
      [save yes|no]
@@ -2733,8 +2754,9 @@ Example:
$ds9 -nvss
$ds9 -nvss m31
- $ds9 -nvss name m31
- $ds9 -nvss coord 00:42:44.404 +41:16:08.78 sexagesimal
+ $ds9 -nvss name m31
+ $ds9 -nvss name clear
+ $ds9 -nvss 00:42:44.404 +41:16:08.78
$ds9 -nvss size 60 60 arcmin
$ds9 -nvss save yes
$ds9 -nvss frame current
@@ -2930,6 +2952,7 @@ + [yes|open]
            [no|close]
@@ -3034,10 +3057,12 @@ + duplicate [#]]
   +    [[<plotname>] stats yes|no]
      [[<plotname>] @@ -3111,6 +3136,7 @@ + list yes|no]
      [[<plotname>] @@ -3183,6 +3209,7 @@ + loadconfig <filename>]
      [[<plotname>] saveconfig <filename>]
@@ -3287,6 +3314,7 @@ + legend yes|no]
      [[<plotname>] legend position right|left|top|bottom]
@@ -3370,6 +3398,7 @@ + barmode normal|stacked|aligned|overlap]

# configure current dataset
@@ -3445,6 +3474,7 @@ + shape circle|square|diamond|plus|splus|scross|triangle|arrow]
      [[<plotname>] @@ -3518,6 +3548,7 @@ + shape fill yes|no]
      [[<plotname>] shape @@ -3525,6 +3556,7 @@       + [[<plotname>] @@ -3596,11 +3628,13 @@ + smooth step|linear|cubic|quadratic|catrom]
      + [[<plotname>] @@ -3672,11 +3706,13 @@ + color <value>]
      + [[<plotname>] @@ -3748,6 +3784,7 @@ + width <value>]
      @@ -3821,6 +3858,7 @@ + [[<plotname>] @@ -3892,6 +3930,7 @@ + dash yes|no]
      @@ -3965,6 +4004,7 @@ + [[<plotname>] @@ -4036,6 +4076,7 @@ + error yes|no]
      @@ -4109,6 +4150,7 @@ + [[<plotname>] @@ -4180,6 +4222,7 @@ + error color <value>]
      @@ -4254,6 +4297,7 @@ + [[<plotname>] @@ -4325,6 +4369,7 @@ + color <value>]
      @@ -4399,6 +4444,7 @@ + [[<plotname>] @@ -4470,6 +4516,7 @@ + error width <value>]
      @@ -4544,6 +4591,7 @@ + [[<plotname>] @@ -4615,6 +4663,7 @@ + name <string>]

@@ -4667,6 +4716,7 @@ $ds9 + -plot title 'This is a Title'
$ds9 -plot title x 'X Axis'
$ds9 -plot title y 'Y Axis'
@@ -4736,6 +4786,7 @@ + <dms> <arcmin> <arcsec>

@@ -5137,6 +5188,7 @@ + <filename> [image|table|slice]
 
Example:
@@ -5300,9 +5352,9 @@ -skyview []
         [<object>]
         [name - <object>]
-          [coord - <ra> <dec> degrees|sexagesimal] # in wcs fk5
+ <object>|clear]
+          [<ra> + <dec>] # in wcs fk5
         [size <width> <height> degrees|arcmin|arcsec]
         [pixels @@ -5318,8 +5370,9 @@ Example:
$ds9 -skyview
$ds9 -skyview m31
- $ds9 -skyview name m31
- $ds9 -skyview coord 00:42:44.404 +41:16:08.78 sexagesimal
+ $ds9 -skyview name m31
+ $ds9 -skyview name clear
+ $ds9 -skyview 00:42:44.404 +41:16:08.78
$ds9 -skyview size 60 60 arcmin
$ds9 -skyview pixels 600 600
$ds9 -skyview save yes
@@ -5382,6 +5435,7 @@ + [sigma <value>]
        @@ -5395,6 +5449,7 @@ + [sigmaminor <value>]
        @@ -5408,6 +5463,7 @@ + [angle <value>]
        @@ -5421,6 +5477,7 @@ + [match]
        [lock [yes|no]]
        @@ -5444,6 +5501,7 @@ + -smooth sigmaminor 2.0
$ds9 @@ -5457,6 +5515,7 @@ + -smooth angle 45
$ds9 -smooth match
@@ -5656,9 +5715,9 @@ Syntax:
-vla []
       [<object>]
-        [name <object>]
-        [coord <ra> - <dec> degrees|sexagesimal] # in wcs fk5
+        [name <object>|clear]
+        [<ra> <dec>] # + in wcs fk5
       [size <width> <height> degrees|arcmin|arcsec]
       [save yes|no]
@@ -5670,8 +5729,9 @@ Example:
$ds9 -vla
$ds9 -vla m31
- $ds9 -vla name m31
- $ds9 -vla coord 00:42:44.404 +41:16:08.78 sexagesimal
+ $ds9 -vla name m31
+ $ds9 -vla name clear
+ $ds9 -vla 00:42:44.404 +41:16:08.78
$ds9 -vla size 60 60 arcmin
$ds9 -vla save yes
$ds9 -vla frame current
@@ -5684,9 +5744,9 @@ Syntax:
-vlss []
      [<object>]
-       [name <object>]
-       [coord <ra> <dec> - degrees|sexagesimal] # in wcs fk5
+       [name <object>|clear]
+       [<ra> <dec>] # in wcs + fk5
      [size <width> <height> degrees|arcmin|arcsec]
      [save yes|no]
@@ -5697,8 +5757,9 @@ Example:
$ds9 -vlss
$ds9 -vlss m31
- $ds9 -vlss name m31
- $ds9 -vlss coord 00:42:44.404 +41:16:08.78 sexagesimal
+ $ds9 -vlss name m31
+ $ds9 -vlss name clear
+ $ds9 -vlss 00:42:44.404 +41:16:08.78
$ds9 -vlss size 60 60 arcmin
$ds9 -vlss save yes
$ds9 -vlss frame current
diff --git a/ds9/doc/ref/samp.html b/ds9/doc/ref/samp.html index 3554c5e..2673bb8 100644 --- a/ds9/doc/ref/samp.html +++ b/ds9/doc/ref/samp.html @@ -157,9 +157,9 @@ Syntax:
2mass []
      [<object>]
-       [name <object>]
-       [coord <ra> <dec> - degrees|sexagesimal] # in wcs fk5
+       [name <object>|clear]
+       [<ra> <dec>] # in wcs + fk5
      [size <width> <height> degrees|arcmin|arcsec]
      [save yes|no]
@@ -179,8 +179,9 @@ ds9.set(string cmd)
2mass
2mass m31
- 2mass name m31
- 2mass coord 00:42:44.404 +41:16:08.78 sexagesimal
+ 2mass name m31
+ 2mass name clear
+ 2mass 00:42:44.404 +41:16:08.78
2mass size 60 60 arcmin
2mass save yes
2mass frame current
@@ -577,6 +578,7 @@ + [crosshair]
        [<ref>] [dec <col>]
@@ -691,6 +693,7 @@ + [match error <value> degrees|arcmin|arcsec]
        [<ref>] @@ -787,6 +790,7 @@ + [match function 1and2|1not2|2not1]
        [<ref>] @@ -883,6 +887,7 @@ + [match return 1and2|1only|2only]
        [<ref>] @@ -979,6 +984,7 @@ + [match unique yes|no]
        [<ref>] [maxrows <number>]
@@ -1031,14 +1037,17 @@ + [symbol shape circle + point|box point|diamond point|cross + point|x point|arrow point|boxcircle point]
        [<ref>] [symbol add| [#] remove]
@@ -1141,6 +1150,7 @@ + [update]
        [<ref>] [x <col>]
@@ -1534,9 +1544,9 @@ Syntax:
dsssao []
       [<object>]
-        [name <object>]
-        [coord <ra> - <dec> degrees|sexagesimal] # in wcs fk5
+        [name <object>|clear]
+        [<ra> <dec>] # + in wcs fk5
       [size <width> <height> degrees|arcmin|arcsec]
       [save yes|no]
@@ -1554,8 +1564,9 @@ ds9.set(string cmd)
dsssao
dsssao m31
- dsssao name m31
- dsssao coord 00:42:44.404 +41:16:08.78 sexagesimal
+ dsssao name m31
+ dsssao name clear
+ dsssao 00:42:44.404 +41:16:08.78
dsssao size 60 60 arcmin
dsssao save yes
dsssao frame current
@@ -1568,9 +1579,9 @@ Syntax:
dsseso []
       [<object>]
-        [name <object>]
-        [coord <ra> - <dec> degrees|sexagesimal] # in wcs fk5
+        [name <object>|clear]
+        [<ra> <dec>] # + in wcs fk5
       [size <width> <height> degrees|arcmin|arcsec]
       [save yes|no]
@@ -1591,8 +1602,9 @@ ds9.set(string cmd)
dsseso
dsseso m31
- dsseso name m31
- dsseso coord 00:42:44.404 +41:16:08.78 sexagesimal
+ dsseso name m31
+ dsseso name clear
+ dsseso 00:42:44.404 +41:16:08.78
dsseso size 60 60 arcmin
dsseso save yes
dsseso frame current
@@ -1606,9 +1618,9 @@ Syntax:
dssstsci []
         [<object>]
-          [name <object>]
-          [coord - <ra> <dec> degrees|sexagesimal] # in wcs fk5
+          [name <object>|clear]
+          [<ra> + <dec>] # in wcs fk5
         [size <width> <height> degrees|arcmin|arcsec]
         [save yes|no]
@@ -1635,8 +1647,9 @@ ds9.set(string cmd)
dssstsci
dssstsci m31
- dssstsci name m31
- dssstsci coord 00:42:44.404 +41:16:08.78 sexagesimal
+ dssstsci name m31
+ dssstsci name clear
+ dssstsci 00:42:44.404 +41:16:08.78
dssstsci size 60 60 arcmin
dssstsci save yes
dssstsci frame current
@@ -2204,6 +2217,7 @@ + Macros for more information.

Syntax:
iexam []
@@ -2325,6 +2339,7 @@ + quality (1-100)

Syntax:
jpeg [new|slice] [<filename>] [1-100]
@@ -2646,9 +2661,8 @@ Syntax:
nvss []
     [<object>]
-      [name <object>]
-      [coord <ra> <dec> - degrees|sexagesimal] # in wcs fk5
+      [name <object>|clear]
+      [<ra> <dec>] # in wcs fk5
     [size <width> <height> degrees|arcmin|arcsec]
     [save yes|no]
@@ -2666,8 +2680,9 @@ ds9.set(string cmd)
nvss
nvss m31
- nvss name m31
- nvss coord 00:42:44.404 +41:16:08.78 sexagesimal
+ nvss name m31
+ nvss name clear
+ nvss 00:42:44.404 +41:16:08.78
nvss size 60 60 arcmin
nvss save yes
nvss frame current
@@ -2770,6 +2785,7 @@      + [new name <plotname> line|bar|scatter]

# load data into existing plot from @@ -2853,6 +2869,7 @@ + duplicate [#]]
     @@ -2926,6 +2943,7 @@ + [[<plotname>] stats yes|no]
     [[<plotname>] @@ -2998,6 +3016,7 @@ + list yes|no]
     [[<plotname>] @@ -3070,6 +3089,7 @@ + loadconfig <filename>]
     [[<plotname>] saveconfig <filename>]
@@ -3144,6 +3164,7 @@ + [[<plotname>] pagesetup orient portrait|landscape]
     [[<plotname>] pagesetup size letter|legal|tabloid|poster|a4]
@@ -3218,6 +3239,7 @@ + [[<plotname>] print]
     [[<plotname>] print destination printer|file]
@@ -3314,6 +3336,7 @@ + legend yes|no]
     [[<plotname>] legend position right|left|top|bottom]
@@ -3397,6 +3420,7 @@ + barmode normal|stacked|aligned|overlap]

 # configure current dataset
@@ -3472,6 +3496,7 @@ + shape circle|square|diamond|plus|splus|scross|triangle|arrow]
     [[<plotname>] @@ -3545,6 +3570,7 @@ + shape fill yes|no]
     [[<plotname>] @@ -3621,6 +3647,7 @@ + [[<plotname>] @@ -3692,6 +3719,7 @@ + smooth step|linear|cubic|quadratic|catrom]
     @@ -3766,6 +3794,7 @@ + [[<plotname>] @@ -3837,6 +3866,7 @@ + color <value>]
     @@ -3911,6 +3941,7 @@ + [[<plotname>] @@ -3982,6 +4013,7 @@ + width <value>]
     @@ -4056,6 +4088,7 @@ + [[<plotname>] @@ -4127,6 +4160,7 @@ + dash yes|no]
     @@ -4200,6 +4234,7 @@ + [[<plotname>] @@ -4271,6 +4306,7 @@ + error yes|no]
     @@ -4344,6 +4380,7 @@ + [[<plotname>] @@ -4415,6 +4452,7 @@ + error color <value>]
     @@ -4489,6 +4527,7 @@ + [[<plotname>] @@ -4560,6 +4599,7 @@ + color <value>]
     @@ -4634,6 +4674,7 @@ + [[<plotname>] @@ -4705,6 +4746,7 @@ + error width <value>]
     @@ -4779,6 +4821,7 @@ + [[<plotname>] @@ -4850,6 +4893,7 @@ + name <string>]

@@ -4941,6 +4985,7 @@ + value = ds9.get(string cmd)
plot stats
@@ -5040,6 +5085,7 @@ + axis x auto
plot @@ -5107,6 +5153,7 @@ + axis x min
plot @@ -5174,6 +5221,7 @@ + axis x max
plot @@ -5241,6 +5289,7 @@ + axis x format
plot @@ -5308,6 +5357,7 @@ + legend
plot legend position
@@ -5383,6 +5433,7 @@ + font numbers size
plot @@ -5454,6 +5505,7 @@ + font numbers weight
plot @@ -5525,6 +5577,7 @@ + font numbers slant
plot @@ -5596,6 +5649,7 @@ + title
plot @@ -5667,6 +5721,7 @@ + title x
plot barmode
 @@ -5688,6 +5743,7 @@ ds9.set(string + cmd)
plot legend yes
plot legend position left
@@ -5695,24 +5751,29 @@ string + value = ds9.get(string cmd)
plot font numbers font
plot + font numbers size
plot + font numbers weight
plot + font numbers slant
ds9.set(string + cmd)
plot font numbers font times
plot font numbers size 12
@@ -5722,23 +5783,28 @@ string + value = ds9.get(string cmd)
plot + title
plot + title xaxis
plot + title yaxis
ds9.set(string + cmd)
plot title "This is a Title"
plot title x "X Axis"
@@ -5748,17 +5814,20 @@ string + value = ds9.get(string cmd)
plot + barmode
 ds9.set(string + cmd)
plot barmode aligned

@@ -5843,6 +5912,7 @@ + dash
plot @@ -5914,6 +5984,7 @@ + error
plot @@ -5985,6 +6056,7 @@ + error color
plot @@ -6056,6 +6128,7 @@ + error width
plot @@ -6127,6 +6200,7 @@ + name
ds9.set(string @@ -6198,6 +6272,7 @@ + cmd)
plot show yes
plot shape circle
@@ -6244,6 +6319,7 @@ + <dms> <arcmin> <arcsec>

@@ -6861,6 +6937,7 @@ + [crosshair]
        [<ref>] [export sb|tsv <filename>]
@@ -6974,6 +7051,7 @@ + [update]
 
Example:
@@ -7015,9 +7093,10 @@ Syntax:
skyview []
        [<object>]
-         [name <object>]
-         [coord <ra> - <dec> degrees|sexagesimal] # in wcs fk5
+         [name + <object>|clear]
+         [<ra> + <dec>] # in wcs fk5
        [size <width> <height> degrees|arcmin|arcsec]
        [pixels <width> @@ -7041,8 +7120,9 @@ ds9.set(string cmd)
skyview
skyview m31
- skyview name m31
- skyview coord 00:42:44.404 +41:16:08.78 sexagesimal
+ skyview name m31
+ skyview name clear
+ skyview 00:42:44.404 +41:16:08.78
skyview size 60 60 arcmin
skyview pixels 600 600
skyview save yes
@@ -7091,6 +7171,7 @@ + [sigma <value>]
       @@ -7103,6 +7184,7 @@ + [sigmaminor <value>]
       @@ -7116,6 +7198,7 @@ + [angle <value>]
       @@ -7129,6 +7212,7 @@ + [match]
       [lock [yes|no]]
       [open|close]
@@ -7161,6 +7245,7 @@ + sigma 2.0
smooth @@ -7174,6 +7259,7 @@ + sigmaminor 2.0
smooth @@ -7187,6 +7273,7 @@ + angle 45
smooth @@ -7200,6 +7287,7 @@ + open
smooth close
smooth match
@@ -7322,6 +7410,7 @@ + compression method.

Syntax:
tiff [new|slice] [<filename>] [none|jpeg|packbits|deflate]
@@ -7477,9 +7566,9 @@ Syntax:
vla []
      [<object>]
-       [name <object>]
-       [coord <ra> <dec> - degrees|sexagesimal] # in wcs fk5
+       [name <object>|clear]
+       [<ra> <dec>] # in wcs + fk5
      [size <width> <height> degrees|arcmin|arcsec]
      [save yes|no]
@@ -7499,8 +7588,9 @@ ds9.set(string cmd)
vla
vla m31
- vla name m31
- vla coord 00:42:44.404 +41:16:08.78 sexagesimal
+ vla name m31
+ vla name clear
+ vla 00:42:44.404 +41:16:08.78
vla size 60 60 arcmin
vla save yes
vla frame current
@@ -7514,9 +7604,8 @@ Syntax:
vlss []
     [<object>]
-      [name <object>]
-      [coord <ra> <dec> - degrees|sexagesimal] # in wcs fk5
+      [name <object>|clear]
+      [<ra> <dec>] # in wcs fk5
     [size <width> <height> degrees|arcmin|arcsec]
     [save yes|no]
@@ -7534,8 +7623,9 @@ ds9.set(string cmd)
vlss
vlss m31
- vlss name m31
- vlss coord 00:42:44.404 +41:16:08.78 sexagesimal
+ vlss name m31
+ vlss name clear
+ vlss 00:42:44.404 +41:16:08.78
vlss size 60 60 arcmin
vlss save yes
vlss frame current
diff --git a/ds9/doc/ref/xpa.html b/ds9/doc/ref/xpa.html index 7fc293a..0d8d4e7 100644 --- a/ds9/doc/ref/xpa.html +++ b/ds9/doc/ref/xpa.html @@ -126,9 +126,9 @@ Syntax:
2mass []
      [<object>]
-       [name <object>]
-       [coord <ra> <dec> - degrees|sexagesimal] # in wcs fk5
+       [name <object>|clear]
+       [<ra> <dec>] # in wcs + fk5
      [size <width> <height> degrees|arcmin|arcsec]
      [save yes|no]
@@ -146,8 +146,9 @@ $xpaget ds9 2mass survey
$xpaset -p ds9 2mass
$xpaset -p ds9 2mass m31
- $xpaset -p ds9 2mass name m31
- $xpaset -p ds9 2mass coord 00:42:44.404 +41:16:08.78 sexagesimal
+ $xpaset -p ds9 2mass name m31
+ $xpaset -p ds9 2mass name clear
+ $xpaset -p ds9 2mass 00:42:44.404 +41:16:08.78
$xpaset -p ds9 2mass size 60 60 arcmin
$xpaset -p ds9 2mass save yes
$xpaset -p ds9 2mass frame current
@@ -214,6 +215,7 @@ + -p ds9 3d match
$xpaset -p ds9 3d lock yes
@@ -228,6 +230,7 @@ + -p ds9 3d open
$xpaset -p ds9 3d close
 @@ -562,6 +565,7 @@ + [crosshair]
        [<ref>] [dec <col>]
@@ -681,6 +685,7 @@ + [match error <value> degrees|arcmin|arcsec]
        [<ref>] @@ -782,6 +787,7 @@ + [match function 1and2|1not2|2not1]
        [<ref>] @@ -883,6 +889,7 @@ + [match return 1and2|1only|2only]
        [<ref>] @@ -984,6 +991,7 @@ + [match unique yes|no]
        [<ref>] [maxrows <number>]
@@ -1035,6 +1043,7 @@ + [symbol shape circle point|box point|diamond point|cross point|x point|arrow point|boxcircle point]
@@ -1144,6 +1153,7 @@ + [update]
        [<ref>] [x <col>]
@@ -1520,9 +1530,9 @@ Syntax:
dsssao []
       [<object>]
-        [name <object>]
-        [coord <ra> - <dec> degrees|sexagesimal] # in wcs fk5
+        [name <object>|clear]
+        [<ra> <dec>] # + in wcs fk5
       [size <width> <height> degrees|arcmin|arcsec]
       [save yes|no]
@@ -1538,9 +1548,9 @@ $xpaget ds9 dsssao frame
$xpaset -p ds9 dsssao
$xpaset -p ds9 dsssao m31
- $xpaset -p ds9 dsssao name m31
- $xpaset -p ds9 dsssao coord 00:42:44.404 +41:16:08.78 - sexagesimal
+ $xpaset -p ds9 dsssao name m31
+ $xpaset -p ds9 dsssao name clear
+ $xpaset -p ds9 dsssao 00:42:44.404 +41:16:08.78
$xpaset -p ds9 dsssao size 60 60 arcmin
$xpaset -p ds9 dsssao save yes
$xpaset -p ds9 dsssao frame current
@@ -1552,9 +1562,9 @@ Syntax:
dsseso []
       [<object>]
-        [name <object>]
-        [coord <ra> - <dec> degrees|sexagesimal] # in wcs fk5
+        [name <object>|clear]
+        [<ra> <dec>] # + in wcs fk5
       [size <width> <height> degrees|arcmin|arcsec]
       [save yes|no]
@@ -1573,9 +1583,9 @@ $xpaget ds9 dsseso survey
$xpaset -p ds9 dsseso
$xpaset -p ds9 dsseso m31
- $xpaset -p ds9 dsseso name m31
- $xpaset -p ds9 dsseso coord 00:42:44.404 +41:16:08.78 - sexagesimal
+ $xpaset -p ds9 dsseso name m31
+ $xpaset -p ds9 dsseso name clear
+ $xpaset -p ds9 dsseso 00:42:44.404 +41:16:08.78
$xpaset -p ds9 dsseso size 60 60 arcmin
$xpaset -p ds9 dsseso save yes
$xpaset -p ds9 dsseso frame current
@@ -1589,9 +1599,9 @@ dssstsci []
         [<object>]
-          [name <object>]
-          [coord - <ra> <dec> degrees|sexagesimal] # in wcs fk5
+          [name <object>|clear]
+          [<ra> + <dec>] # in wcs fk5
         [size <width> <height> degrees|arcmin|arcsec]
         [save yes|no]
@@ -1616,9 +1626,9 @@ $xpaget ds9 dssstsci survey
$xpaset -p ds9 dssstsci
$xpaset -p ds9 dssstsci m31
- $xpaset -p ds9 dssstsci name m31
- $xpaset -p ds9 dssstsci coord 00:42:44.404 +41:16:08.78 - sexagesimal
+ $xpaset -p ds9 dssstsci name m31
+ $xpaset -p ds9 dssstsci name clear
+ $xpaset -p ds9 dssstsci 00:42:44.404 +41:16:08.78
$xpaset -p ds9 dssstsci size 60 60 arcmin
$xpaset -p ds9 dssstsci save yes
$xpaset -p ds9 dssstsci frame current
@@ -1734,6 +1744,7 @@ + -p ds9 export envi foo.hdr foo.bsq little
$xpaset -p ds9 export tiff foo.tiff jpeg
@@ -2270,6 +2281,7 @@ + quality (1-100)

Syntax:
jpeg [new|slice] [<filename>] [1-100]
@@ -2574,9 +2586,8 @@ Syntax:
nvss []
     [<object>]
-      [name <object>]
-      [coord <ra> <dec> - degrees|sexagesimal] # in wcs fk5
+      [name <object>|clear]
+      [<ra> <dec>] # in wcs fk5
     [size <width> <height> degrees|arcmin|arcsec]
     [save yes|no]
@@ -2592,8 +2603,9 @@ $xpaget ds9 nvss frame
$xpaset -p ds9 nvss
$xpaset -p ds9 nvss m31
- $xpaset -p ds9 nvss name m31
- $xpaset -p ds9 nvss coord 00:42:44.404 +41:16:08.78 sexagesimal
+ $xpaset -p ds9 nvss name m31
+ $xpaset -p ds9 nvss name clear
+ $xpaset -p ds9 nvss 00:42:44.404 +41:16:08.78
$xpaset -p ds9 nvss size 60 60 arcmin
$xpaset -p ds9 nvss save yes
$xpaset -p ds9 nvss frame current
@@ -2690,6 +2702,7 @@ + [new name <plotname> line|bar|scatter]

# create new plot with data from stdin
@@ -2697,6 +2710,7 @@ + [new <title> <xaxis label> <yaxis label> xy|xyex|xyey|xyexey]
@@ -2709,23 +2723,28 @@ + [new name + <plotname> <title> + <xaxis label> <yaxis label> xy|xyex|xyey|xyexey]
     [new name + <plotname> line|bar|scatter + <title> <xaxis label> <yaxis label> xy|xyex|xyey|xyexey]

@@ -2737,16 +2756,19 @@ + [line|bar|scatter] + stdin]
     + [new name <plotname> stdin]
     @@ -2754,6 +2776,7 @@ + stdin]

# load data into existing plot from @@ -2838,6 +2861,7 @@ + duplicate [#]]
     @@ -2912,6 +2936,7 @@ + [[<plotname>] stats yes|no]
     [[<plotname>] @@ -2985,6 +3010,7 @@ + list yes|no]
     [[<plotname>] @@ -3058,6 +3084,7 @@ + loadconfig <filename>]
     [[<plotname>] saveconfig <filename>]
@@ -3133,6 +3160,7 @@ + [[<plotname>] pagesetup orient portrait|landscape]
     [[<plotname>] pagesetup size letter|legal|tabloid|poster|a4]
@@ -3208,6 +3236,7 @@ + [[<plotname>] print]
     [[<plotname>] print destination printer|file]
@@ -3305,6 +3334,7 @@ + legend yes|no]
     [[<plotname>] legend position right|left|top|bottom]
@@ -3389,6 +3419,7 @@ + barmode normal|stacked|aligned|overlap]

 # configure current dataset
@@ -3465,6 +3496,7 @@ + shape circle|square|diamond|plus|splus|scross|triangle|arrow]
     [[<plotname>] @@ -3539,6 +3571,7 @@ + shape fill yes|no]
     [[<plotname>] @@ -3616,6 +3649,7 @@ + [[<plotname>] @@ -3688,6 +3722,7 @@ + smooth step|linear|cubic|quadratic|catrom]
     @@ -3763,6 +3798,7 @@ + [[<plotname>] @@ -3835,6 +3871,7 @@ + color <value>]
     @@ -3910,6 +3947,7 @@ + [[<plotname>] @@ -3982,6 +4020,7 @@ + width <value>]
     @@ -4057,6 +4096,7 @@ + [[<plotname>] @@ -4129,6 +4169,7 @@ + dash yes|no]
     @@ -4203,6 +4244,7 @@ + [[<plotname>] @@ -4275,6 +4317,7 @@ + error yes|no]
     @@ -4349,6 +4392,7 @@ + [[<plotname>] @@ -4421,6 +4465,7 @@ + error color <value>]
     @@ -4496,6 +4541,7 @@ + [[<plotname>] @@ -4568,6 +4614,7 @@ + color <value>]
     @@ -4643,6 +4690,7 @@ + [[<plotname>] @@ -4715,6 +4763,7 @@ + error width <value>]
     @@ -4790,6 +4839,7 @@ + [[<plotname>] @@ -4862,6 +4912,7 @@ + name <string>]

@@ -4904,6 +4955,7 @@ + data into existing plot from stdin
$cat xy.dat | xpaset ds9 plot data xy
$cat xy.dat | xpaset ds9 plot foo data xy
@@ -5010,6 +5062,7 @@ + ds9 plot axis x min
$xpaget @@ -5083,12 +5136,14 @@ + ds9 plot axis x max
$xpaget ds9 plot axis x format
$xpaset + -p ds9 plot axis x grid yes
$xpaset -p ds9 plot axis x log yes
$xpaset -p ds9 plot axis x flip yes
@@ -5177,6 +5232,7 @@ + ds9 plot font numbers size
$xpaget @@ -5250,6 +5306,7 @@ + ds9 plot font numbers weight
$xpaget @@ -5323,11 +5380,13 @@ + ds9 plot font numbers slant
$xpaset + -p ds9 plot font numbers font times
$xpaset -p ds9 plot font numbers size 12
$xpaset -p ds9 plot font numbers weight bold
@@ -5406,6 +5465,7 @@ + ds9 plot title xaxis
$xpaget @@ -5479,11 +5539,13 @@ + ds9 plot title yaxis
$xpaset + -p ds9 plot title {This is a Title}
$xpaset -p ds9 plot title x {X Axis}
$xpaset -p ds9 plot title y {Y Axis}
@@ -5576,6 +5638,7 @@ + ds9 plot dash
$xpaget @@ -5649,6 +5712,7 @@ + ds9 plot error
$xpaget @@ -5722,6 +5786,7 @@ + ds9 plot error color
$xpaget @@ -5796,6 +5861,7 @@ + ds9 plot error width
$xpaget @@ -5870,6 +5936,7 @@ + ds9 plot name
$xpaset @@ -5943,6 +6010,7 @@ + -p ds9 plot show yes
$xpaset -p ds9 plot shape circle
$xpaset -p ds9 plot shape fill no
@@ -5987,6 +6055,7 @@ + <dms> <arcmin> <arcsec>

@@ -6481,6 +6550,7 @@ + method.

Syntax:
saveimage [fits|eps|gif|tiff|jpeg|png] <filename>
@@ -6634,9 +6704,10 @@ Syntax:
skyview []
        [<object>]
-         [name <object>]
-         [coord <ra> - <dec> degrees|sexagesimal] # in wcs fk5
+         [name + <object>|clear]
+         [<ra> + <dec>] # in wcs fk5
        [size <width> <height> degrees|arcmin|arcsec]
        [pixels <width> @@ -6658,9 +6729,9 @@ $xpaget ds9 skyview survey
$xpaset -p ds9 skyview
$xpaset -p ds9 skyview m31
- $xpaset -p ds9 skyview name m31
- $xpaset -p ds9 skyview coord 00:42:44.404 +41:16:08.78 - sexagesimal
+ $xpaset -p ds9 skyview name m31
+ $xpaset -p ds9 skyview name clear
+ $xpaset -p ds9 skyview 00:42:44.404 +41:16:08.78
$xpaset -p ds9 skyview size 60 60 arcmin
$xpaset -p ds9 skyview pixels 600 600
$xpaset -p ds9 skyview save yes
@@ -6710,6 +6781,7 @@ + [sigma <value>]
       @@ -6724,6 +6796,7 @@ + [sigmaminor <value>]
       @@ -6738,6 +6811,7 @@ + [angle <value>]
    @@ -6752,6 +6826,7 @@ +    [match]
       [lock [yes|no]]
       [open|close]
@@ -6774,6 +6849,7 @@ + ds9 smooth sigmaminor
$xpaget ds9 smooth lock
@@ -6796,6 +6872,7 @@ + -p ds9 smooth sigma 2.0
$xpaset @@ -6810,6 +6887,7 @@ + -p ds9 smooth sigmaminor 2.0
$xpaset @@ -6824,6 +6902,7 @@ + -p ds9 smooth angle 45
$xpaset @@ -6838,6 +6917,7 @@ + -p ds9 smooth match
$xpaset -p ds9 smooth lock yes
$xpaset -p ds9 smooth open
@@ -6960,6 +7040,7 @@ + compression method.

Syntax:
tiff [new|slice] [<filename>] [none|jpeg|packbits|deflate]
@@ -7111,9 +7192,9 @@ Syntax:
vla []
      [<object>]
-       [name <object>]
-       [coord <ra> <dec> - degrees|sexagesimal] # in wcs fk5
+       [name <object>|clear]
+       [<ra> <dec>] # in wcs + fk5
      [size <width> <height> degrees|arcmin|arcsec]
      [save yes|no]
@@ -7131,8 +7212,9 @@ $xpaget ds9 vla survey
$xpaset -p ds9 vla
$xpaset -p ds9 vla m31
- $xpaset -p ds9 vla name m31
- $xpaset -p ds9 vla coord 00:42:44.404 +41:16:08.78 sexagesimal
+ $xpaset -p ds9 vla name m31
+ $xpaset -p ds9 vla name clear
+ $xpaset -p ds9 vla 00:42:44.404 +41:16:08.78
$xpaset -p ds9 vla size 60 60 arcmin
$xpaset -p ds9 vla save yes
$xpaset -p ds9 vla frame current
@@ -7147,8 +7229,7 @@ vlss []
     [<object>]
     [name <object>]
-      [coord <ra> <dec> - degrees|sexagesimal] # in wcs fk5
+      [<ra> <dec>] # in wcs fk5
     [size <width> <height> degrees|arcmin|arcsec]
     [save yes|no]
@@ -7164,8 +7245,9 @@ $xpaget ds9 vlss frame
$xpaset -p ds9 vlss
$xpaset -p ds9 vlss m31
- $xpaset -p ds9 vlss name m31
- $xpaset -p ds9 vlss coord 00:42:44.404 +41:16:08.78 sexagesimal
+ $xpaset -p ds9 vlss name m31
+ $xpaset -p ds9 vlss name clear
+ $xpaset -p ds9 vlss 00:42:44.404 +41:16:08.78
$xpaset -p ds9 vlss size 60 60 arcmin
$xpaset -p ds9 vlss save yes
$xpaset -p ds9 vlss frame current
diff --git a/ds9/library/imgsvr.tcl b/ds9/library/imgsvr.tcl index 6ebec9d..06290e7 100644 --- a/ds9/library/imgsvr.tcl +++ b/ds9/library/imgsvr.tcl @@ -483,23 +483,6 @@ proc IMGSVRProgress {varname token totalsize currentsize} { } } -proc IMGSVRCmd {varname which value} { - upvar #0 $varname var - global $varname - - set var($which) $value -} - -proc IMGSVRCmdName {varname value} { - upvar #0 $varname var - global $varname - - set var(name) $value - if {$var(name) != {}} { - IMGSVRApply $varname 1 - } -} - proc IMGSVRCmdCoord {varname xx yy skyformat} { upvar #0 $varname var global $varname @@ -511,24 +494,6 @@ proc IMGSVRCmdCoord {varname xx yy skyformat} { IMGSVRApply $varname 1 } -proc IMGSVRCmdSize {varname ww hh rformat} { - upvar #0 $varname var - global $varname - - set var(width) $ww - set var(height) $hh - set var(rformat) $rformat - set var(rformat,msg) $rformat -} - -proc IMGSVRCmdPixels {varname ww hh} { - upvar #0 $varname var - global $varname - - set var(width,pixels) $ww - set var(height,pixels) $hh -} - proc IMGSVRCmdUpdate {varname} { upvar #0 $varname var global $varname diff --git a/ds9/library/util.tcl b/ds9/library/util.tcl index b72eb2a..3bf1339 100644 --- a/ds9/library/util.tcl +++ b/ds9/library/util.tcl @@ -175,6 +175,39 @@ proc ProcessCmdSet {varname key value {cmd {}}} { } } +proc ProcessCmdSet2 {varname key value key2 value2 {cmd {}}} { + global $varname + + set ${varname}($key) $value + set ${varname}($key2) $value2 + if {$cmd != {}} { + eval $cmd + } +} + +proc ProcessCmdSet3 {varname key value key2 value2 key3 value3 {cmd {}}} { + global $varname + + set ${varname}($key) $value + set ${varname}($key2) $value2 + set ${varname}($key3) $value3 + if {$cmd != {}} { + eval $cmd + } +} + +proc ProcessCmdSet4 {varname key value key2 value2 key3 value3 key4 value4 {cmd {}}} { + global $varname + + set ${varname}($key) $value + set ${varname}($key2) $value2 + set ${varname}($key3) $value3 + set ${varname}($key4) $value4 + if {$cmd != {}} { + eval $cmd + } +} + proc ProcessCmdAppend {varname key value {cmd {}}} { global $varname diff --git a/ds9/parsers/dssesoparser.tac b/ds9/parsers/dssesoparser.tac index 9a830f1..810990f 100644 --- a/ds9/parsers/dssesoparser.tac +++ b/ds9/parsers/dssesoparser.tac @@ -28,18 +28,21 @@ command : dsseso dsseso : {IMGSVRApply deso 1} | OPEN_ {} | CLOSE_ {ARDestroy deso} - | STRING_ {IMGSVRCmdName deso $1} - | NAME_ STRING_ {IMGSVRCmdName deso $2} - | SIZE_ numeric numeric sizeOpt {IMGSVRCmdSize deso $2 $3 $4} - | SAVE_ yesno {IMGSVRCmd deso save $2} - | FRAME_ frame {IMGSVRCmd deso mode $2} - | SURVEY_ survey {IMGSVRCmd deso survey $2} + | STRING_ {ProcessCmdSet deso name $1 "IMGSVRApply deso 1"} + | NAME_ CLEAR_ {ProcessCmdSet deso name {}} + | NAME_ STRING_ {ProcessCmdSet deso name $2 "IMGSVRApply deso 1"} + | SIZE_ numeric numeric sizeOpt + {ProcessCmdSet4 deso width $2 height $3 rformat $4 rformat,msg $4} + | SAVE_ yesno {ProcessCmdSet deso save $2} + | FRAME_ frame {ProcessCmdSet deso mode $2} + | SURVEY_ survey {ProcessCmdSet deso survey $2} | UPDATE_ update - | numeric numeric coordOpt {IMGSVRCmdCoord deso $1 $2 degrees} - | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord deso $1 $2 sexagesimal} - | COORD_ numeric numeric deg {IMGSVRCmdCoord deso $2 $3 $4} - | COORD_ SEXSTR_ SEXSTR_ sex {IMGSVRCmdCoord deso $2 $3 $4} + | numeric numeric deg {ProcessCmdSet4 deso x $1 y $2 skyformat $3 skyformat,msg $3 "IMGSVRApply deso 1"} + | SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 deso x $1 y $2 skyformat $3 skyformat,msg $3 "IMGSVRApply deso 1"} + # backward compatibility + | COORD_ numeric numeric deg {ProcessCmdSet4 deso x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply deso 1"} + | COORD_ SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 deso x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply deso 1"} ; update : FRAME_ {IMGSVRCmdUpdate deso} diff --git a/ds9/parsers/dsssaoparser.tac b/ds9/parsers/dsssaoparser.tac index 5a60544..52bb769 100644 --- a/ds9/parsers/dsssaoparser.tac +++ b/ds9/parsers/dsssaoparser.tac @@ -23,17 +23,20 @@ command : dsssao dsssao : {IMGSVRApply dsao 1} | OPEN_ {} | CLOSE_ {ARDestroy dsao} - | STRING_ {IMGSVRCmdName dsao $1} - | NAME_ STRING_ {IMGSVRCmdName dsao $2} - | SIZE_ numeric numeric sizeOpt {IMGSVRCmdSize dsao $2 $3 $4} - | SAVE_ yesno {IMGSVRCmd dsao save $2} - | FRAME_ frame {IMGSVRCmd dsao mode $2} + | STRING_ {ProcessCmdSet dsao name $1 "IMGSVRApply dsao 1"} + | NAME_ CLEAR_ {ProcessCmdSet dsao name {}} + | NAME_ STRING_ {ProcessCmdSet dsao name $2 "IMGSVRApply dsao 1"} + | SIZE_ numeric numeric sizeOpt + {ProcessCmdSet4 dsao width $2 height $3 rformat $4 rformat,msg $4} + | SAVE_ yesno {ProcessCmdSet dsao save $2} + | FRAME_ frame {ProcessCmdSet dsao mode $2} | UPDATE_ update - | numeric numeric coordOpt {IMGSVRCmdCoord dsao $1 $2 degrees} - | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord dsao $1 $2 sexagesimal} - | COORD_ numeric numeric deg {IMGSVRCmdCoord dsao $2 $3 $4} - | COORD_ SEXSTR_ SEXSTR_ sex {IMGSVRCmdCoord dsao $2 $3 $4} + | numeric numeric deg {ProcessCmdSet4 dsao x $1 y $2 skyformat $3 skyformat,msg $3 "IMGSVRApply dsao 1"} + | SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dsao x $1 y $2 skyformat $3 skyformat,msg $3 "IMGSVRApply dsao 1"} + # backward compatibility + | COORD_ numeric numeric deg {ProcessCmdSet4 dsao x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dsao 1"} + | COORD_ SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dsao x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dsao 1"} ; update : FRAME_ {IMGSVRCmdUpdate dsao} diff --git a/ds9/parsers/dssstsciparser.tac b/ds9/parsers/dssstsciparser.tac index 6e8467f..53b853b 100644 --- a/ds9/parsers/dssstsciparser.tac +++ b/ds9/parsers/dssstsciparser.tac @@ -33,18 +33,21 @@ command : dssstsci dssstsci : {IMGSVRApply dstsci 1} | OPEN_ {} | CLOSE_ {ARDestroy dstsci} - | STRING_ {IMGSVRCmdName dstsci $1} - | NAME_ STRING_ {IMGSVRCmdName dstsci $2} - | SIZE_ numeric numeric sizeOpt {IMGSVRCmdSize dstsci $2 $3 $4} - | SAVE_ yesno {IMGSVRCmd dstsci save $2} - | FRAME_ frame {IMGSVRCmd dstsci mode $2} - | SURVEY_ survey {IMGSVRCmd dstsci survey $2} + | STRING_ {ProcessCmdSet dstsci name $1 "IMGSVRApply dstsci 1"} + | NAME_ CLEAR_ {ProcessCmdSet dstsci name {}} + | NAME_ STRING_ {ProcessCmdSet dstsci name $2 "IMGSVRApply dstsci 1"} + | SIZE_ numeric numeric sizeOpt + {ProcessCmdSet4 dstsci width $2 height $3 rformat $4 rformat,msg $4} + | SAVE_ yesno {ProcessCmdSet dstsci save $2} + | FRAME_ frame {ProcessCmdSet dstsci mode $2} + | SURVEY_ survey {ProcessCmdSet dstsci survey $2} | UPDATE_ update - | numeric numeric coordOpt {IMGSVRCmdCoord dstsci $1 $2 degrees} - | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord dstsci $1 $2 sexagesimal} - | COORD_ numeric numeric deg {IMGSVRCmdCoord dstsci $2 $3 $4} - | COORD_ SEXSTR_ SEXSTR_ sex {IMGSVRCmdCoord dstsci $2 $3 $4} + | numeric numeric deg {ProcessCmdSet4 dstsci x $1 y $2 skyformat $3 skyformat,msg $3 "IMGSVRApply dstsci 1"} + | SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dstsci x $1 y $2 skyformat $3 skyformat,msg $3 "IMGSVRApply dstsci 1"} + # backward compatibility + | COORD_ numeric numeric deg {ProcessCmdSet4 dstsci x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dstsci 1"} + | COORD_ SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dstsci x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dstsci 1"} ; update : FRAME_ {IMGSVRCmdUpdate dstsci} diff --git a/ds9/parsers/imgsvr.fin b/ds9/parsers/imgsvr.fin index 553edc5..4fc50c4 100644 --- a/ds9/parsers/imgsvr.fin +++ b/ds9/parsers/imgsvr.fin @@ -1,3 +1,4 @@ +clear {return $CLEAR_} close {return $CLOSE_} coord {return $COORD_} crosshair {return $CROSSHAIR_} diff --git a/ds9/parsers/imgsvr.tin b/ds9/parsers/imgsvr.tin index 5b8546d..030433d 100644 --- a/ds9/parsers/imgsvr.tin +++ b/ds9/parsers/imgsvr.tin @@ -1,3 +1,4 @@ +%token CLEAR_ %token CLOSE_ %token COORD_ %token CROSSHAIR_ diff --git a/ds9/parsers/nvssparser.tac b/ds9/parsers/nvssparser.tac index 7230380..a175acf 100644 --- a/ds9/parsers/nvssparser.tac +++ b/ds9/parsers/nvssparser.tac @@ -23,17 +23,20 @@ command : nvss nvss : {IMGSVRApply dnvss 1} | OPEN_ {} | CLOSE_ {ARDestroy dnvss} - | STRING_ {IMGSVRCmdName dnvss $1} - | NAME_ STRING_ {IMGSVRCmdName dnvss $2} - | SIZE_ numeric numeric sizeOpt {IMGSVRCmdSize dnvss $2 $3 $4} - | SAVE_ yesno {IMGSVRCmd dnvss save $2} - | FRAME_ frame {IMGSVRCmd dnvss mode $2} + | STRING_ {ProcessCmdSet dnvss name $1 "IMGSVRApply dnvss 1"} + | NAME_ CLEAR_ {ProcessCmdSet dnvss name {}} + | NAME_ STRING_ {ProcessCmdSet dnvss name $2 "IMGSVRApply dnvss 1"} + | SIZE_ numeric numeric sizeOpt + {ProcessCmdSet4 dnvss width $2 height $3 rformat $4 rformat,msg $4} + | SAVE_ yesno {ProcessCmdSet dnvss save $2} + | FRAME_ frame {ProcessCmdSet dnvss mode $2} | UPDATE_ update - | numeric numeric coordOpt {IMGSVRCmdCoord dnvss $1 $2 degrees} - | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord dnvss $1 $2 sexagesimal} - | COORD_ numeric numeric deg {IMGSVRCmdCoord dnvss $2 $3 $4} - | COORD_ SEXSTR_ SEXSTR_ sex {IMGSVRCmdCoord dnvss $2 $3 $4} + | numeric numeric deg {ProcessCmdSet4 dnvss x $1 y $2 skyformat $3 skyformat,msg $3 "IMGSVRApply dnvss 1"} + | SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dnvss x $1 y $2 skyformat $3 skyformat,msg $3 "IMGSVRApply dnvss 1"} + # backward compatibility + | COORD_ numeric numeric deg {ProcessCmdSet4 dnvss x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dnvss 1"} + | COORD_ SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dnvss x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dnvss 1"} ; update : FRAME_ {IMGSVRCmdUpdate dnvss} diff --git a/ds9/parsers/skyviewparser.tac b/ds9/parsers/skyviewparser.tac index e44ffe2..fecc723 100644 --- a/ds9/parsers/skyviewparser.tac +++ b/ds9/parsers/skyviewparser.tac @@ -25,19 +25,22 @@ command : skyview skyview : {IMGSVRApply dskyview 1} | OPEN_ {} | CLOSE_ {ARDestroy dskyview} - | STRING_ {IMGSVRCmdName dskyview $1} - | NAME_ STRING_ {IMGSVRCmdName dskyview $2} - | SIZE_ numeric numeric sizeOpt {IMGSVRCmdSize dskyview $2 $3 $4} - | PIXELS_ numeric numeric {IMGSVRCmdPixels dskyview $2 $3} - | SAVE_ yesno {IMGSVRCmd dskyview save $2} - | FRAME_ frame {IMGSVRCmd dskyview mode $2} - | SURVEY_ STRING_ {IMGSVRCmd dskyview survey $2} + | STRING_ {ProcessCmdSet dskyview name $1 "IMGSVRApply dskyview 1"} + | NAME_ CLEAR_ {ProcessCmdSet dskyview name {}} + | NAME_ STRING_ {ProcessCmdSet dskyview name $2 "IMGSVRApply dskyview 1"} + | SIZE_ numeric numeric sizeOpt + {ProcessCmdSet4 dskyview width $2 height $3 rformat $4 rformat,msg $4} + | PIXELS_ numeric numeric {ProcessCmdSet2 dskyview width,pixels $2 height,pixels $3} + | SAVE_ yesno {ProcessCmdSet dskyview save $2} + | FRAME_ frame {ProcessCmdSet dskyview mode $2} + | SURVEY_ STRING_ {ProcessCmdSet dskyview survey $2} | UPDATE_ update - | numeric numeric coordOpt {IMGSVRCmdCoord dskyview $1 $2 degrees} - | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord dskyview $1 $2 sexagesimal} - | COORD_ numeric numeric deg {IMGSVRCmdCoord dskyview $2 $3 $4} - | COORD_ SEXSTR_ SEXSTR_ sex {IMGSVRCmdCoord dskyview $2 $3 $4} + | numeric numeric deg {ProcessCmdSet4 dskyview x $1 y $2 skyformat $3 skyformat,msg $3 "IMGSVRApply dskyview 1"} + | SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dskyview x $1 y $2 skyformat $3 skyformat,msg $3 "IMGSVRApply dskyview 1"} + # backward compatibility + | COORD_ numeric numeric deg {ProcessCmdSet4 dskyview x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dskyview 1"} + | COORD_ SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dskyview x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dskyview 1"} ; update : FRAME_ {IMGSVRCmdUpdate dskyview} diff --git a/ds9/parsers/twomassparser.tac b/ds9/parsers/twomassparser.tac index ce02100..5eb6e9d 100644 --- a/ds9/parsers/twomassparser.tac +++ b/ds9/parsers/twomassparser.tac @@ -23,18 +23,21 @@ command : twomass twomass : {IMGSVRApply dtwomass 1} | OPEN_ {} | CLOSE_ {ARDestroy dtwomass} - | STRING_ {IMGSVRCmdName dtwomass $1} - | NAME_ STRING_ {IMGSVRCmdName dtwomass $2} - | SIZE_ numeric numeric sizeOpt {IMGSVRCmdSize dtwomass $2 $3 $4} - | SAVE_ yesno {IMGSVRCmd dtwomass save $2} - | FRAME_ frame {IMGSVRCmd dtwomass mode $2} - | SURVEY_ survey {IMGSVRCmd dtwomass survey $2} + | STRING_ {ProcessCmdSet dtwomass name $1 "IMGSVRApply dtwomass 1"} + | NAME_ CLEAR_ {ProcessCmdSet dtwomass name {}} + | NAME_ STRING_ {ProcessCmdSet dtwomass name $2 "IMGSVRApply dtwomass 1"} + | SIZE_ numeric numeric sizeOpt + {ProcessCmdSet4 dtwomass width $2 height $3 rformat $4 rformat,msg $4} + | SAVE_ yesno {ProcessCmdSet dtwomass save $2} + | FRAME_ frame {ProcessCmdSet dtwomass mode $2} + | SURVEY_ survey {ProcessCmdSet dtwomass survey $2} | UPDATE_ update - | numeric numeric coordOpt {IMGSVRCmdCoord dtwomass $1 $2 degrees} - | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord dtwomass $1 $2 sexagesimal} - | COORD_ numeric numeric deg {IMGSVRCmdCoord dtwomass $2 $3 $4} - | COORD_ SEXSTR_ SEXSTR_ sex {IMGSVRCmdCoord dtwomass $2 $3 $4} + | numeric numeric deg {ProcessCmdSet4 dtwomass x $1 y $2 skyformat $3 skyformat,msg $3 "IMGSVRApply dtwomass 1"} + | SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dtwomass x $1 y $2 skyformat $3 skyformat,msg $3 "IMGSVRApply dtwomass 1"} + # backward compatibility + | COORD_ numeric numeric deg {ProcessCmdSet4 dtwomass x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dtwomass 1"} + | COORD_ SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dtwomass x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dtwomass 1"} ; update : FRAME_ {IMGSVRCmdUpdate dtwomass} diff --git a/ds9/parsers/vlaparser.tac b/ds9/parsers/vlaparser.tac index 3add524..3591f24 100644 --- a/ds9/parsers/vlaparser.tac +++ b/ds9/parsers/vlaparser.tac @@ -26,18 +26,21 @@ command : vla vla : {IMGSVRApply dvla 1} | OPEN_ {} | CLOSE_ {ARDestroy dvla} - | STRING_ {IMGSVRCmdName dvla $1} - | NAME_ STRING_ {IMGSVRCmdName dvla $2} - | SIZE_ numeric numeric sizeOpt {IMGSVRCmdSize dvla $2 $3 $4} - | SAVE_ yesno {IMGSVRCmd dvla save $2} - | FRAME_ frame {IMGSVRCmd dvla mode $2} - | SURVEY_ survey {IMGSVRCmd dvla survey $2} + | STRING_ {ProcessCmdSet dvla name $1 "IMGSVRApply dvla 1"} + | NAME_ CLEAR_ {ProcessCmdSet dvla name {}} + | NAME_ STRING_ {ProcessCmdSet dvla name $2 "IMGSVRApply dvla 1"} + | SIZE_ numeric numeric sizeOpt + {ProcessCmdSet4 dvla width $2 height $3 rformat $4 rformat,msg $4} + | SAVE_ yesno {ProcessCmdSet dvla save $2} + | FRAME_ frame {ProcessCmdSet dvla mode $2} + | SURVEY_ survey {ProcessCmdSet dvla survey $2} | UPDATE_ update - | numeric numeric coordOpt {IMGSVRCmdCoord dvla $1 $2 degrees} - | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord dvla $1 $2 sexagesimal} - | COORD_ numeric numeric deg {IMGSVRCmdCoord dvla $2 $3 $4} - | COORD_ SEXSTR_ SEXSTR_ sex {IMGSVRCmdCoord dvla $2 $3 $4} + | numeric numeric deg {ProcessCmdSet4 dvla x $1 y $2 skyformat $3 skyformat,msg $3 "IMGSVRApply dvla 1"} + | SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dvla x $1 y $2 skyformat $3 skyformat,msg $3 "IMGSVRApply dvla 1"} + # backward compatibility + | COORD_ numeric numeric deg {ProcessCmdSet4 dvla x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dvla 1"} + | COORD_ SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dvla x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dvla 1"} ; update : FRAME_ {IMGSVRCmdUpdate dvla} diff --git a/ds9/parsers/vlssparser.tac b/ds9/parsers/vlssparser.tac index 55708fc..43efc1f 100644 --- a/ds9/parsers/vlssparser.tac +++ b/ds9/parsers/vlssparser.tac @@ -23,17 +23,20 @@ command : vlss vlss : {IMGSVRApply dvlss 1} | OPEN_ {} | CLOSE_ {ARDestroy dvlss} - | STRING_ {IMGSVRCmdName dvlss $1} - | NAME_ STRING_ {IMGSVRCmdName dvlss $2} - | SIZE_ numeric numeric sizeOpt {IMGSVRCmdSize dvlss $2 $3 $4} - | SAVE_ yesno {IMGSVRCmd dvlss save $2} - | FRAME_ frame {IMGSVRCmd dvlss mode $2} + | STRING_ {ProcessCmdSet dvlss name $1 "IMGSVRApply dvlss 1"} + | NAME_ CLEAR_ {ProcessCmdSet dvlss name {}} + | NAME_ STRING_ {ProcessCmdSet dvlss name $2 "IMGSVRApply dvlss 1"} + | SIZE_ numeric numeric sizeOpt + {ProcessCmdSet4 dvlss width $2 height $3 rformat $4 rformat,msg $4} + | SAVE_ yesno {ProcessCmdSet dvlss save $2} + | FRAME_ frame {ProcessCmdSet dvlss mode $2} | UPDATE_ update - | numeric numeric coordOpt {IMGSVRCmdCoord dvlss $1 $2 degrees} - | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord dvlss $1 $2 sexagesimal} - | COORD_ numeric numeric deg {IMGSVRCmdCoord dvlss $2 $3 $4} - | COORD_ SEXSTR_ SEXSTR_ sex {IMGSVRCmdCoord dvlss $2 $3 $4} + | numeric numeric deg {ProcessCmdSet4 dvlss x $1 y $2 skyformat $3 skyformat,msg $3 "IMGSVRApply dvlss 1"} + | SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dvlss x $1 y $2 skyformat $3 skyformat,msg $3 "IMGSVRApply dvlss 1"} + # backward compatibility + | COORD_ numeric numeric deg {ProcessCmdSet4 dvlss x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dvlss 1"} + | COORD_ SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dvlss x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dvlss 1"} ; update : FRAME_ {IMGSVRCmdUpdate dvlss} -- cgit v0.12