From a208bcc1440c0495deda7c161abe9292cdd3f431 Mon Sep 17 00:00:00 2001 From: William Joye Date: Thu, 24 May 2018 13:55:44 -0400 Subject: update ds9 parsers --- ds9/doc/ref/command.html | 27 ++++++++++++++------------- ds9/doc/ref/samp.html | 27 ++++++++++++++------------- ds9/doc/ref/xpa.html | 23 ++++++++++++----------- ds9/library/contour.tcl | 10 ---------- ds9/parsers/contourparser.tac | 5 +++-- 5 files changed, 43 insertions(+), 49 deletions(-) diff --git a/ds9/doc/ref/command.html b/ds9/doc/ref/command.html index dc0ed84..aeca874 100644 --- a/ds9/doc/ref/command.html +++ b/ds9/doc/ref/command.html @@ -1244,17 +1244,17 @@          [clear]
         [generate]
         [load - <filename> [<color> <width> yes|no]]
+ <filename>]
         [save - <filename> <coordsys> <skyframe>]
+ <filename> [<coordsys> <skyframe>]]
         [convert]
-          [loadlevels +          [load levels <filename>]
-          - [savelevels <filename>]
+          [save + levels <filename>]
          [copy]
         [paste - <coordsys> [<color> <width> yes|no]]
+ [<coordsys> <color> <width> yes|no]]
         [color <color>]
         [width @@ -1285,14 +1285,15 @@ $ds9 -contour generate
$ds9 -contour clear
$ds9 -contour load ds9.ctr
- $ds9 -contour load ds9.ctr red 2 yes
- $ds9 -contour save ds9.ctr wcs fk5
- $ds9 -contour convert
- $ds9 -contour loadlevels ds9.ctr
- $ds9 -contour savelevels ds9.lev
+ $ds9 -contour save ds9.ctr
+ $ds9 -contour save ds9.ctr wcs fk5
+ $ds9 -contour convert
+ $ds9 -contour load levels ds9.ctr
+ $ds9 -contour save levels ds9.lev
$ds9 -contour copy
- $ds9 -contour paste wcs red 2 no
- $ds9 -contour color yellow
+ $ds9 -contour paste
+ $ds9 -contour paste wcs red 2 no
+ $ds9 -contour color yellow
$ds9 -contour width 2
$ds9 -contour dash yes
$ds9 -contour smooth 5
diff --git a/ds9/doc/ref/samp.html b/ds9/doc/ref/samp.html index e61a3f8..fb7c7cf 100644 --- a/ds9/doc/ref/samp.html +++ b/ds9/doc/ref/samp.html @@ -1313,17 +1313,17 @@         [clear]
        [generate]
        [load - <filename> [<color> <width> yes|no]]
+ <filename>]
        [save <filename> - <coordsys> <skyframe>]
+ [<coordsys> <skyframe>]]
        [convert]
-         - [loadlevels <filename>]
+         [load + levels <filename>]
        - [savelevels <filename>]
+ [save levels <filename>]
        [copy]
        [paste - <coordsys> [<color> <width> yes|no]]
+ [<coordsys> <color> <width> yes|no]]
        [color <color>]
        [width <width>]
        [dash yes|no]
@@ -1367,14 +1367,15 @@ contour clear
contour generate
contour load ds9.ctr
- contour load ds9.ctr red 2 yes
- contour save ds9.con wcs fk5
- contour convert
- contour loadlevels ds9.ctr
- contour savelevels ds9.lev
+ contour save ds9.con
+ contour save ds9.con wcs fk5
+ contour convert
+ contour load levels ds9.ctr
+ contour save levels ds9.lev
contour copy
- contour paste wcs red 2 no
- contour color yellow
+ contour paste
+ contour paste wcs red 2 no
+ contour color yellow
contour width 2
contour dash yes
contour smooth 5
diff --git a/ds9/doc/ref/xpa.html b/ds9/doc/ref/xpa.html index fcb419a..d77e7e7 100644 --- a/ds9/doc/ref/xpa.html +++ b/ds9/doc/ref/xpa.html @@ -1301,17 +1301,17 @@         [clear]
        [generate]
        [load - <filename> [<color> <width> yes|no]]
+ <filename>]
        [save <filename> - <coordsys> <skyframe>]
+ [<coordsys> <skyframe>]]
        [convert]
-         [loadlevels +         [load levels <filename>]
-         [savelevels +         [save levels <filename>]
        [copy]
        [paste - <coordsys> [<color> <width> yes|no]]
+ [<coordsys> <color> <width> yes|no]]
        [color <color>]
        [width <width>]
        [dash yes|no]
@@ -1351,14 +1351,15 @@ $xpaset -p ds9 contour clear
$xpaset -p ds9 contour generate
$xpaset -p ds9 contour load ds9.ctr
- $xpaset -p ds9 contour load ds9.ctr red 2 yes
- $xpaset -p ds9 contour save ds9.ctr wcs fk5
+ $xpaset -p ds9 contour save ds9.ctr
+ $xpaset -p ds9 contour save ds9.ctr wcs fk5
$xpaset -p ds9 contour convert
- $xpaset -p ds9 contour loadlevels ds9.ctr
- $xpaset -p ds9 contour savelevels ds9.lev
+ $xpaset -p ds9 contour load levels ds9.ctr
+ $xpaset -p ds9 contour save levels ds9.lev
 $xpaset -p ds9 contour copy
- $xpaset -p ds9 contour paste wcs red 2 no
- $xpaset -p ds9 contour color yellow
+ $xpaset -p ds9 contour paste
+ $xpaset -p ds9 contour paste wcs red 2 no
+ $xpaset -p ds9 contour color yellow
$xpaset -p ds9 contour width 2
$xpaset -p ds9 contour dash yes
$xpaset -p ds9 contour smooth 5
diff --git a/ds9/library/contour.tcl b/ds9/library/contour.tcl index 12b8bdb..d55e3c9 100644 --- a/ds9/library/contour.tcl +++ b/ds9/library/contour.tcl @@ -1292,16 +1292,6 @@ proc ContourCmdLoad {fn} { } } -proc ContourCmdLoadParam {fn color width dash} { - global current - - if {$current(frame) != {} && $fn != {}} { - $current(frame) contour load $fn $color $width $dash - FileLast contourlfbox $fn - UpdateContourDialog - } -} - proc ContourCmdLoadOrg {fn sys sky color width dash} { global current diff --git a/ds9/parsers/contourparser.tac b/ds9/parsers/contourparser.tac index f672f45..7301ee4 100644 --- a/ds9/parsers/contourparser.tac +++ b/ds9/parsers/contourparser.tac @@ -66,6 +66,7 @@ contour : yesno {ContourCmdSet view $1} # backward compatibility | LOADLEVELS_ STRING_ {ContourCmdLoadLevels $2} +# backward compatibility | SAVELEVELS_ STRING_ {ContourCmdSaveLevels $2} | COPY_ {ContourCCopyDialog} @@ -93,15 +94,15 @@ load : STRING_ {ContourCmdLoad $1} | STRING_ skyframe STRING_ INT_ yesno {ContourCmdLoadOrg $1 wcs $2 $3 $4 $5} | STRING_ wcssys skyframe STRING_ INT_ yesno {ContourCmdLoadOrg $1 $2 $3 $4 $5 $6} # no longer supported -# | STRING_ STRING_ INT_ yesno {ContourCmdLoadParam $1 $2 $3 $4} +# | STRING_ STRING_ INT_ yesno ; save : STRING_ {ContourCmdSave $1 physical fk5} - | LEVELS_ STRING_ {ContourCmdSaveLevels $2} | STRING_ coordsys {ContourCmdSave $1 $2 fk5} | STRING_ wcssys {ContourCmdSave $1 $2 fk5} | STRING_ skyframe {ContourCmdSave $1 wcs $2} | STRING_ wcssys skyframe {ContourCmdSave $1 $2 $3} + | LEVELS_ STRING_ {ContourCmdSaveLevels $2} # backward compatibility # no longer supported # | STRING_ wcssys skyframe STRING_ INT_ yesno {ContourCmdSave $1 $2 $3} -- cgit v0.12