diff options
| -rw-r--r-- | ds9/doc/ref/command.html | 27 | ||||
| -rw-r--r-- | ds9/doc/ref/samp.html | 27 | ||||
| -rw-r--r-- | ds9/doc/ref/xpa.html | 23 | ||||
| -rw-r--r-- | ds9/library/contour.tcl | 10 | ||||
| -rw-r--r-- | 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]<br> [generate]<br> [load - <filename> [<color> <width> yes|no]]<br> + <filename>]<br> [save - <filename> <coordsys> <skyframe>]<br> + <filename> [<coordsys> <skyframe>]]<br> [convert]<br> - [loadlevels + [load levels <filename>]</tt><br> - <tt><tt> - [savelevels <filename>]<br> + <tt><tt> [save + levels <filename>]<br> </tt> [copy]<br> [paste - <coordsys> [<color> <width> yes|no]]<br> + [<coordsys> <color> <width> yes|no]]<br> [color <color>]<br> [width @@ -1285,14 +1285,15 @@ $ds9 -contour generate<br> $ds9 -contour clear<br> $ds9 -contour load ds9.ctr<br> - $ds9 -contour load ds9.ctr red 2 yes<br> - $ds9 -contour save ds9.ctr wcs fk5<br> - $ds9 -contour convert<br> - $ds9 -contour loadlevels ds9.ctr<br> - </tt><tt><tt>$ds9 -contour savelevels ds9.lev<br> + </tt><tt><tt>$ds9 -contour save ds9.ctr<br> + </tt></tt><tt><tt><tt>$ds9 -contour save ds9.ctr wcs fk5<br> + </tt></tt>$ds9 -contour convert<br> + $ds9 -contour load levels ds9.ctr<br> + </tt><tt><tt>$ds9 -contour save levels ds9.lev<br> </tt>$ds9 -contour copy<br> - $ds9 -contour paste wcs red 2 no<br> - $ds9 -contour color yellow<br> + </tt><tt><tt>$ds9 -contour paste<br> + </tt></tt><tt><tt><tt>$ds9 -contour paste wcs red 2 no<br> + </tt></tt>$ds9 -contour color yellow<br> $ds9 -contour width 2<br> $ds9 -contour dash yes<br> $ds9 -contour smooth 5<br> 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]<br> [generate]<br> [load - <filename> [<color> <width> yes|no]]<br> + <filename>]<br> [save <filename> - <coordsys> <skyframe>]<br> + [<coordsys> <skyframe>]]<br> [convert]<br> - </tt><tt><tt> - [loadlevels <filename>]<br> + </tt><tt><tt> [load + levels <filename>]<br> </tt></tt><tt><tt><tt> - [savelevels <filename>]<br> + [save levels <filename>]<br> </tt></tt> [copy]<br> [paste - <coordsys> [<color> <width> yes|no]]<br> + [<coordsys> <color> <width> yes|no]]<br> [color <color>]<br> [width <width>]<br> [dash yes|no]<br> @@ -1367,14 +1367,15 @@ contour clear<br> contour generate<br> contour load ds9.ctr<br> - contour load ds9.ctr red 2 yes<br> - contour save ds9.con wcs fk5<br> - contour convert<br> - </tt><tt><tt>contour loadlevels ds9.ctr<br> - </tt></tt><tt><tt><tt>contour savelevels ds9.lev<br> + </tt><tt><tt>contour save ds9.con<br> + </tt></tt><tt><tt><tt>contour save ds9.con wcs fk5<br> + </tt></tt>contour convert<br> + </tt><tt><tt>contour load levels ds9.ctr<br> + </tt></tt><tt><tt><tt>contour save levels ds9.lev<br> </tt></tt>contour copy<br> - contour paste wcs red 2 no<br> - contour color yellow<br> + </tt><tt><tt>contour paste<br> + </tt></tt><tt><tt><tt>contour paste wcs red 2 no<br> + </tt></tt>contour color yellow<br> contour width 2<br> contour dash yes<br> contour smooth 5<br> 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]<br> [generate]<br> [load - <filename> [<color> <width> yes|no]]<br> + <filename>]<br> [save <filename> - <coordsys> <skyframe>]<br> + [<coordsys> <skyframe>]]<br> [convert]<br> - [loadlevels + [load levels <filename>]<br> - [savelevels + [save levels <filename>]<br> [copy]<br> [paste - <coordsys> [<color> <width> yes|no]]<br> + [<coordsys> <color> <width> yes|no]]<br> [color <color>]<br> [width <width>]<br> [dash yes|no]<br> @@ -1351,14 +1351,15 @@ $xpaset -p ds9 contour clear<br> $xpaset -p ds9 contour generate<br> </tt><tt><tt>$xpaset -p ds9 contour load ds9.ctr<br> - </tt></tt><tt>$xpaset -p ds9 contour load ds9.ctr red 2 yes<br> - $xpaset -p ds9 contour save ds9.ctr wcs fk5<br> + </tt></tt><tt><tt>$xpaset -p ds9 contour save ds9.ctr<br> + </tt>$xpaset -p ds9 contour save ds9.ctr wcs fk5<br> $xpaset -p ds9 contour convert<br> - $xpaset -p ds9 contour loadlevels ds9.ctr</tt><br> - <tt><tt>$xpaset -p ds9 contour savelevels ds9.lev<br> + $xpaset -p ds9 contour load levels ds9.ctr</tt><br> + <tt><tt>$xpaset -p ds9 contour save levels ds9.lev<br> </tt> $xpaset -p ds9 contour copy<br> - $xpaset -p ds9 contour paste wcs red 2 no<br> - $xpaset -p ds9 contour color yellow<br> + </tt><tt><tt>$xpaset -p ds9 contour paste<br> + </tt></tt><tt><tt><tt>$xpaset -p ds9 contour paste wcs red 2 no<br> + </tt></tt>$xpaset -p ds9 contour color yellow<br> $xpaset -p ds9 contour width 2<br> $xpaset -p ds9 contour dash yes<br> $xpaset -p ds9 contour smooth 5<br> 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} |