Command Line Options

From 0ed039f999076cdebb76a3c53ceb7d1fabab43c1 Mon Sep 17 00:00:00 2001 From: William Joye Date: Thu, 3 Jan 2019 14:17:06 -0500 Subject: PRINT: add backward compatible options for resolution to command parser --- ds9/doc/ref/command.html | 46 +++++++++++++++++++++++++++++++++----- ds9/doc/ref/samp.html | 51 +++++++++++++++++++++++++++++++++++++----- ds9/doc/ref/xpa.html | 56 ++++++++++++++++++++++++++++++++++++++++++----- ds9/doc/release/r8.1.html | 1 + ds9/parsers/pslex.fcl | 3 +++ ds9/parsers/psparser.tac | 6 +++++ 6 files changed, 145 insertions(+), 18 deletions(-) diff --git a/ds9/doc/ref/command.html b/ds9/doc/ref/command.html index bd400b6..2b6f8d9 100644 --- a/ds9/doc/ref/command.html +++ b/ds9/doc/ref/command.html @@ -9,9 +9,9 @@ 2.4.7-10 i686) [Netscape]"> Command Line Options - -

Command Line Options

+ +

Command Line Options

DS9 will process each command line option, one at a time, as the last step in the initialization process. Therefore, it is @@ -451,6 +451,7 @@ + [<ref>] [filter <string>]        [<ref>] [filter load <filename>]@@ -466,6 +467,7 @@ + [<ref>] [match]        [<ref>] [match error <value> @@ -485,6 +487,7 @@ + [<ref>] [panto yes|no]         [<ref>] [plot <xcol> <ycol> <xerrcol> @@ -512,6 +515,7 @@ + [<ref>] [save <filename>]         [<ref>] [server cds|adac|cadc|cambridge|sao|ukirt|iucaa|bejing|saao]@@ -539,6 +543,7 @@ + [symbol shape circle point|box point|diamond point|cross point|x point|arrow point|boxcircle point]         @@ -546,6 +551,7 @@ + [<ref>] [symbol add| [#] remove]        [<ref>] [symbol save|load <filename>]@@ -595,6 +601,7 @@ + '\$Hmag' '\$e_Jmag' '\$e_Hmag' $ds9 -catalog print $ds9 -catalog psky fk5@@ -690,6 +697,7 @@ + [match]           [lock [yes|no]]
@@ -824,6 +832,7 @@ + <coordsys>]
           [lock <coordsys>|none]
@@ -987,6 +996,7 @@ + -envi foo.hdr foo.bsq
exit
@@ -1020,12 +1030,14 @@ + [1-100] -export <filename>.tiff + [none|jpeg|packbits|deflate] Example:@@ -1492,11 +1504,13 @@ + <coordsys>]        + [crop <coordsys>]        [slice <coordsys>]@@ -1511,6 +1525,7 @@ + [3d] Example:@@ -1631,6 +1646,7 @@ + [pan]             @@ -1638,6 +1654,7 @@ + [crosshair]             @@ -1645,6 +1662,7 @@ + [open|close] Example: @@ -1756,6 +1774,7 @@ + [yes|open]             [no|close] @@ -1788,6 +1807,7 @@ + load <filename> xy|xyex|xyey|xyexey]       [[<plotname>] save <filename>]@@ -1804,6 +1824,7 @@ + loadconfig <filename>] [[<plotname>] saveconfig <filename>]@@ -1827,11 +1848,13 @@ + close] [[<plotname>] + mode pointer|zoom] # configure graph@@ -1854,6 +1877,7 @@ + legend yes|no]       [[<plotname>] legend position right|left|top|bottom]@@ -1878,6 +1902,7 @@ + barmode normal|stacked|aligned|overlap] # configure current dataset@@ -2062,10 +2087,11 @@ + [color rgb|cmyk|gray]-        [level 1|2]+        [level 1|2|3]       [resolution - 53|72|75|150|300|600]+72|screen|96|144|150|225|300|600|1200] Example: $ds9 -print@@ -2074,7 +2100,7 @@ $ds9 -print filename foo.ps $ds9 -print color cmyk $ds9 -print level 2- $ds9 -print resolution 75 + $ds9 -print resolution 96
raise

Raise in the window stacking order.
Syntax: @@ -2345,6 +2371,7 @@ + [image|table|slice]
Example: @@ -2464,6 +2491,7 @@ + [crosshair]      [<ref>] [export sb|tsv <filename>]@@ -2488,6 +2516,7 @@ + [update] Example:@@ -2599,6 +2628,7 @@ + [sigma <value>]         @@ -2606,6 +2636,7 @@ + [sigmaminor <value>]         [angle @@ -2614,6 +2645,7 @@ + <value>]         [match] @@ -2635,12 +2667,14 @@ + sigmaminor 2.0 $ds9 + -smooth angle 45 $ds9 -smooth match diff --git a/ds9/doc/ref/samp.html b/ds9/doc/ref/samp.html index df90178..db5c239 100644 --- a/ds9/doc/ref/samp.html +++ b/ds9/doc/ref/samp.html @@ -9,9 +9,9 @@ 2.4.7-10 i686) [Netscape]"> SAMP - - SAMP + + SAMP SAMP is a messaging protocol that enables astronomy software tools to interoperate and communicate. Broadly speaking, SAMP is @@ -466,6 +466,7 @@ + [2mass|iras]         [csc|xmm|rosat] @@ -508,6 +509,7 @@ + [<ref>] [filter <string>]         [<ref>] [filter load <filename>] @@ -523,6 +525,7 @@ + [<ref>] [match <ref> <ref>]         [<ref>] [match error <value> @@ -542,6 +545,7 @@ + [<ref>] [panto yes|no]         [<ref>] [plot <xcol> <ycol> <xerrcol> @@ -569,6 +573,7 @@ + [<ref>] [save <filename>]         [<ref>] [server cds|adac|cadc|cambridge|sao|ukirt|iucaa|bejing|saao] @@ -597,6 +602,7 @@ + [symbol shape circle point|box point|diamond point|cross point|x point|arrow point|boxcircle point]         @@ -654,6 +660,7 @@ + {$Hmag} {$e_Jmag} {$e_Hmag} catalog print catalog psky fk5 @@ -672,6 +679,7 @@ + point} catalog symbol color red catalog symbol font times @@ -816,6 +824,7 @@ + [save levels <filename>]         [copy]         [paste @@ -900,6 +909,7 @@ + zmax <coordsys>]       [open|close] @@ -1637,6 +1647,7 @@ + Macros for more information. Syntax: iexam [] @@ -2145,6 +2156,7 @@ + load <filename> xy|xyex|xyey|xyexey]      [[<plotname>] save <filename>] @@ -2155,24 +2167,28 @@ + duplicate [#]]      [[<plotname>] + stats yes|no]      [[<plotname>] + list yes|no]      [[<plotname>] + loadconfig <filename>]      [[<plotname>] saveconfig <filename>] @@ -2196,12 +2212,14 @@ + close]      [[<plotname>] + mode pointer|zoom] # configure graph @@ -2224,6 +2242,7 @@ + legend yes|no]      [[<plotname>] legend position right|left|top|bottom] @@ -2248,6 +2267,7 @@ + barmode normal|stacked|aligned|overlap] # configure current dataset @@ -2257,54 +2277,63 @@ + shape circle|square|diamond|plus|splus|scross|triangle|arrow]      [[<plotname>] + shape fill yes|no]      [[<plotname>] + shape color <value>]      [[<plotname>] + smooth step|linear|cubic|quadratic|catrom]      [[<plotname>] + color <value>]      [[<plotname>] + width <value>]      [[<plotname>] + dash yes|no]      [[<plotname>] + error yes|no]      [[<plotname>] + error color <value>]      [[<plotname>] color <value>] @@ -2313,12 +2342,14 @@ + error width <value>]      [[<plotname>] + name <string>] # select current dataset @@ -2533,8 +2564,8 @@       [command <command>]       [filename <filename>]       [color rgb|cmyk|gray] -       [level 1|2] -       [resolution 53|72|75|150|300|600] +       [level 1|2|3] +       [resolution 72|screen|96|144|150|225|300|600|1200] Example: string value = ds9.get(string cmd) @@ -2551,7 +2582,7 @@ print filename foo.ps print color cmyk print level 2 - print resolution 75 + print resolution 96 raise Raise in the window stacking order. Syntax: @@ -3022,6 +3053,7 @@ + [<ref>] [save <filename>]       [<ref>] [radius <value> degrees|arcmin|arcsec] @@ -3144,6 +3176,7 @@ + [sigma <value>]        @@ -3151,6 +3184,7 @@ + [sigmaminor <value>]        [angle @@ -3159,12 +3193,14 @@ + <value>]        + [match]        [lock [yes|no]]        [open|close] @@ -3190,18 +3226,21 @@ + sigma 2.0 smooth + sigmaminor 2.0 smooth + angle 45 smooth open diff --git a/ds9/doc/ref/xpa.html b/ds9/doc/ref/xpa.html index 9fd8f80..c509dd9 100644 --- a/ds9/doc/ref/xpa.html +++ b/ds9/doc/ref/xpa.html @@ -9,9 +9,9 @@ 2.4.7-10 i686) [Netscape]"> XPA Access Points - - XPA Access Points + + XPA Access Points The XPA messaging system provides seamless communication between DS9 and @@ -211,6 +211,7 @@ + -p ds9 3d match $xpaset -p ds9 3d lock yes @@ -453,6 +454,7 @@ + [crosshair]         [<ref>] [dec <col>] @@ -476,6 +478,7 @@ + [<ref>] [match <ref> <ref>]         [<ref>] [match @@ -484,24 +487,28 @@ + error <value> degrees|arcmin|arcsec]         [<ref>] + [match function 1and2|1not2|2not1]         [<ref>] + [match return 1and2|1only|2only]         [<ref>] + [match unique yes|no]         [<ref>] [maxrows <number>] @@ -554,11 +561,13 @@ + shape circle point|box point|diamond point|cross + point|x point|arrow point|boxcircle point]         [<ref>] [symbol add| [#] remove] @@ -571,6 +580,7 @@ + [update]         [<ref>] [x <col>] @@ -1101,6 +1111,7 @@ + -p ds9 export envi foo.hdr foo.bsq little $xpaset -p ds9 export tiff foo.tiff jpeg @@ -1990,6 +2001,7 @@ + [line|bar|scatter] <title> <xaxis label> <yaxis label> xy|xyex|xyey|xyexey]      [new @@ -2008,11 +2020,13 @@ + name <plotname> stdin]      [new + name <plotname> line|bar|scatter stdin] @@ -2026,6 +2040,7 @@ + load <filename> xy|xyex|xyey|xyexey]      [[<plotname>] save <filename>] @@ -2036,24 +2051,28 @@ + duplicate [#]]      [[<plotname>] + stats yes|no]      [[<plotname>] + list yes|no]      [[<plotname>] + loadconfig <filename>]      [[<plotname>] saveconfig <filename>] @@ -2077,12 +2096,14 @@ + close]      [[<plotname>] + mode pointer|zoom] # configure graph @@ -2105,6 +2126,7 @@ + legend yes|no]      [[<plotname>] legend position right|left|top|bottom] @@ -2129,6 +2151,7 @@ + barmode normal|stacked|aligned|overlap] # configure current dataset @@ -2138,54 +2161,63 @@ + shape circle|square|diamond|plus|splus|scross|triangle|arrow]      [[<plotname>] + shape fill yes|no]      [[<plotname>] + shape color <value>]      [[<plotname>] + smooth step|linear|cubic|quadratic|catrom]      [[<plotname>] + color <value>]      [[<plotname>] + width <value>]      [[<plotname>] + dash yes|no]      [[<plotname>] + error yes|no]      [[<plotname>] + error color <value>]      [[<plotname>] color <value>] @@ -2194,12 +2226,14 @@ + error width <value>]      [[<plotname>] + name <string>] # select current dataset @@ -2421,8 +2455,8 @@       [command <command>]       [filename <filename>]       [color rgb|cmyk|gray] -       [level 1|2] -       [resolution 53|72|75|150|300|600] +       [level 1|2|3] +       [resolution 72|screen|96|144|150|225|300|600|1200] Example: $xpaget ds9 print destination @@ -2437,7 +2471,7 @@ $xpaset -p ds9 print filename foo.ps $xpaset -p ds9 print color cmyk $xpaset -p ds9 print level 2 - $xpaset -p ds9 print resolution 75 + $xpaset -p ds9 print resolution 96 raise Raise in the window stacking order. Syntax: @@ -2885,6 +2919,7 @@ + [crosshair]     [<ref>] [export sb|tsv <filename>] @@ -2907,6 +2942,7 @@ + [update] Example: @@ -3013,6 +3049,7 @@ + [sigma <value>]        @@ -3020,6 +3057,7 @@ + [sigmaminor <value>]        [angle @@ -3028,12 +3066,14 @@ + <value>]     +    [match]        [lock [yes|no]]        [open|close] @@ -3049,6 +3089,7 @@ + ds9 smooth sigmaminor $xpaget ds9 smooth lock @@ -3063,18 +3104,21 @@ + -p ds9 smooth sigma 2.0 $xpaset + -p ds9 smooth sigmaminor 2.0 $xpaset + -p ds9 smooth angle 45 $xpaset -p ds9 smooth match diff --git a/ds9/doc/release/r8.1.html b/ds9/doc/release/r8.1.html index 323e5c5..d6e0e41 100644 --- a/ds9/doc/release/r8.1.html +++ b/ds9/doc/release/r8.1.html @@ -32,6 +32,7 @@ 12.29.2018 TKWIN: update TEA to 3.13. 01.03.2019 DS9: fixed a problem with MacOS Aqua and Windows unable to locate ds9 parser scripts at startup. 01.03.2019 SCALE: fixed scale command. +01.03.2019 PRINT: add backward compatible options for resolution to command parser. xx.xx.2018 RELEASE version 8.1b1 diff --git a/ds9/parsers/pslex.fcl b/ds9/parsers/pslex.fcl index ea34343..208d7b8 100644 --- a/ds9/parsers/pslex.fcl +++ b/ds9/parsers/pslex.fcl @@ -31,6 +31,9 @@ screen {return $SCREEN_} 600 {return $600_} 1200 {return $1200_} +53 {return $53_} +75 {return $75_} + #include string.fin #include ws.fin diff --git a/ds9/parsers/psparser.tac b/ds9/parsers/psparser.tac index aca229c..6bd877c 100644 --- a/ds9/parsers/psparser.tac +++ b/ds9/parsers/psparser.tac @@ -30,6 +30,9 @@ %token 600_ %token 1200_ +%token 53_ +%token 75_ + %% command : ps @@ -70,6 +73,9 @@ resolution : 72_ {set _ 72} | 300_ {set _ 300} | 600_ {set _ 600} | 1200_ {set _ 1200} +#backward compatibility + | 53_ {set _ 53} + | 75_ {set _ 75} ; %% -- cgit v0.12