From 5b9a6b8bcb9aae105330c11dff0496e3190d89ed Mon Sep 17 00:00:00 2001 From: William Joye Date: Thu, 24 May 2018 16:58:46 -0400 Subject: update ds9 parsers --- ds9/doc/ref/command.html | 55 ++++++++++++++---------------------------------- ds9/doc/ref/xpa.html | 24 ++++++++++----------- 2 files changed, 28 insertions(+), 51 deletions(-) diff --git a/ds9/doc/ref/command.html b/ds9/doc/ref/command.html index 28f1cf6..f35141d 100644 --- a/ds9/doc/ref/command.html +++ b/ds9/doc/ref/command.html @@ -2923,23 +2923,7 @@ Syntax:
# create new empty plot window
-plot [line|bar|scatter]
-       - - [new - <title> <xaxis label> <yaxis - label> xy|xyex|xyey|xyexey]
-       [new - line|bar|scatter <title> <xaxis - label> <yaxis label> xy|xyex|xyey|xyexey]
-       - - [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]
-
+
# existing plot
-plot [[<plotname>] load <filename> xy|xyex|xyey|xyexey]
@@ -4555,33 +4539,26 @@  
Example:
# create new empty plot window
- $ds9 -plot
- $ds9 -plot scatter
- $ds9 -plot new
- $ds9 -plot new bar
- $ds9 -plot new name foo
- $ds9 -plot new name foo scatter
+ $ds9 -plot bar

- $ds9 -plot load foo.dat xy # load new dataset with dimension - xy
- $ds9 -plot save bar.dat # save current dataset
- $ds9 -plot clear # clear all datasets
- $ds9 -plot duplicate # duplicate current dataset
- $ds9 -plot stats yes # display current dataset statistics
- $ds9 -plot list yes # list current dataset
- $ds9 -plot loadconfig foo.plt # load plot - configuration
- $ds9 -plot saveconfig bar.plt # save current plot - configuration
+ # existing plot
+ $ds9 -plot load + xy.dat
+ $ds9 -plot save foo.dat
+ $ds9 -plot clear
+ $ds9 -plot duplicate 1
+ $ds9 -plot stats yes
+ $ds9 -plot list yes
+ $ds9 -plot loadconfig foo.plt
+ $ds9 -plot saveconfig foo.plt
$ds9 -plot pagesetup orient portrait
$ds9 -plot pagesetup size letter
$ds9 -plot print
$ds9 -plot print destination file
- $ds9 -plot print command "lp"
- $ds9 -plot print filename "foo.ps"
+ $ds9 -plot print command lp
+ $ds9 -plot print filename foo.ps
$ds9 -plot print color rgb
- $ds9 -plot close # close current plot
-
+ $ds9 -plot close
$ds9 -plot mode pointer

# configure plot
@@ -4589,7 +4566,7 @@ $ds9 -plot axis x log yes
$ds9 -plot axis x flip yes
$ds9 -plot axis x auto no
- $ds9 -plot axis x min 0
+ $ds9 -plot axis x min 1
$ds9 -plot axis x max 100
$ds9 -plot axis x format {%f}
$ds9 -plot legend yes # show legend
diff --git a/ds9/doc/ref/xpa.html b/ds9/doc/ref/xpa.html index dfae17d..3d447aa 100644 --- a/ds9/doc/ref/xpa.html +++ b/ds9/doc/ref/xpa.html @@ -268,8 +268,8 @@ Example:
$xpaget ds9 analysis
$xpaget ds9 analysis task
- $xpaget ds9 analysis entry 'Please enter something'
- $xpaget ds9 analysis entry okcancel 'Please enter something'
+ $xpaget ds9 analysis entry {Please enter something}
+ $xpaget ds9 analysis entry okcancel {Please enter something}
$xpaset -p ds9 analysis 0 # invoke first analysis task
$xpaset -p ds9 analysis task 0
$xpaset -p ds9 analysis task foobar
@@ -1129,7 +1129,7 @@ $xpaset -p ds9 catalog new
$xpaset -p ds9 catalog 2mass
$xpaset -p ds9 catalog cds 2mass
- $xpaset -p ds9 catalog cds "I/252"
+ $xpaset -p ds9 catalog cds {I/252}

$xpaset -p ds9 catalog load foo.xml
$xpaset -p ds9 catalog import tsv foo.tsv
@@ -1172,7 +1172,7 @@ $xpaset -p ds9 catalog show yes
$xpaset -p ds9 catalog size 1 1 degrees
$xpaset -p ds9 catalog symbol condition '$Jmag>15'
- $xpaset -p ds9 catalog symbol 2 shape "boxcircle point"
+ $xpaset -p ds9 catalog symbol 2 shape {boxcircle point}
$xpaset -p ds9 catalog symbol color red
$xpaset -p ds9 catalog symbol font times
$xpaset -p ds9 catalog symbol fontsize 14
@@ -1184,7 +1184,7 @@ $xpaset -p ds9 catalog symbol save bar.sym
$xpaset -p ds9 catalog sky fk5
$xpaset -p ds9 catalog skyformat degrees
- $xpaset -p ds9 catalog sort "Jmag" incr
+ $xpaset -p ds9 catalog sort {Jmag} incr
$xpaset -p ds9 catalog system wcs
$xpaset -p ds9 catalog update
$xpaset -p ds9 catalog x RA
@@ -4758,10 +4758,10 @@ $xpaget ds9 plot stats
$xpaget ds9 plot list
- $xpaset -p ds9 plot load plot/xy.dat xy
+ $xpaset -p ds9 plot load xy.dat xy
$xpaset -p ds9 plot save foo.dat
$xpaset -p ds9 plot clear
- $xpaset -p ds9 plot duplicate
+ $xpaset -p ds9 plot duplicate 1
$xpaset -p ds9 plot stats yes
$xpaset -p ds9 plot list yes
@@ -4771,8 +4771,8 @@ $xpaset -p ds9 plot pagesetup size letter
$xpaset -p ds9 plot print
$xpaset -p ds9 plot print destination file
- $xpaset -p ds9 plot print command "lp"
- $xpaset -p ds9 plot print filename "foo.ps"
+ $xpaset -p ds9 plot print command lp
+ $xpaset -p ds9 plot print filename foo.ps
$xpaset -p ds9 plot print color rgb
$xpaset -p ds9 plot close
$xpaget ds9 plot mode
@@ -4932,7 +4932,7 @@ $xpaset -p ds9 plot axis x auto no
$xpaset -p ds9 plot axis x min 1
$xpaset -p ds9 plot axis x max 100
- $xpaset -p ds9 plot axis x format "%f"
+ $xpaset -p ds9 plot axis x format {%f}

$xpaget ds9 plot legend
$xpaget ds9 plot @@ -5980,7 +5980,7 @@ $echo "box 100 100 20 40 25" | xpaset ds9 regions
$echo "image; line 100 100 200 400" | xpaset ds9 regions
$echo "physical; ruler 200 300 200 400" | xpaset ds9 regions
- $echo "image; text 100 100 # text={Hello, World} | xpaset ds9 + $echo "image; text 100 100 # text={Hello, World}" | xpaset ds9 regions
$echo "fk4; boxcircle point 13:29:55 47:11:50" | xpaset ds9 regions
@@ -6959,7 +6959,7 @@ $xpaget ds9 vo delay
$xpaget ds9 vo connect
$xpaset -p ds9 vo method xpa
- $xpaset -p ds9 vo server "http://foo.bar.edu/list.txt"
+ $xpaset -p ds9 vo server http://foo.bar.edu/list.txt
$xpaset -p ds9 vo internal yes
$xpaset -p ds9 vo delay 15 # keep-alive delay
$xpaset -p ds9 vo chandra-ed
-- cgit v0.12