diff options
author | William Joye <wjoye@cfa.harvard.edu> | 2018-11-08 19:08:08 (GMT) |
---|---|---|
committer | William Joye <wjoye@cfa.harvard.edu> | 2018-11-08 19:08:08 (GMT) |
commit | 3a2105375b049fecb7146e7683da095589b64178 (patch) | |
tree | a2fa794a968047b735255584873a6f946d3e75b6 /ds9 | |
parent | 138d03e5624d405ad5cf4319ebab2210f8ce2672 (diff) | |
download | blt-3a2105375b049fecb7146e7683da095589b64178.zip blt-3a2105375b049fecb7146e7683da095589b64178.tar.gz blt-3a2105375b049fecb7146e7683da095589b64178.tar.bz2 |
update mask
Diffstat (limited to 'ds9')
-rw-r--r-- | ds9/doc/ref/command.html | 44 | ||||
-rw-r--r-- | ds9/doc/ref/samp.html | 50 | ||||
-rw-r--r-- | ds9/doc/ref/xpa.html | 51 | ||||
-rw-r--r-- | ds9/library/contour.tcl | 1 | ||||
-rw-r--r-- | ds9/library/marker.tcl | 20 | ||||
-rw-r--r-- | ds9/library/mregion.tcl | 2 | ||||
-rw-r--r-- | ds9/library/stdfbox.tcl | 13 | ||||
-rw-r--r-- | ds9/parsers/maskparser.tac | 4 |
8 files changed, 173 insertions, 12 deletions
diff --git a/ds9/doc/ref/command.html b/ds9/doc/ref/command.html index 209e0b9..33e438a 100644 --- a/ds9/doc/ref/command.html +++ b/ds9/doc/ref/command.html @@ -448,6 +448,7 @@ [<ref>] [export sb|tsv <filename>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> + [<ref>] [filter <string>]</tt><tt><br> </tt><tt> [<ref>] [filter load <filename>]</tt><tt><br> @@ -460,10 +461,11 @@ </tt><tt> </tt><tt> </tt><tt> + [<ref>] [match]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> - </tt><tt>[<ref>] - [match error <value> degrees|arcmin|arcsec]</tt><tt><br> + </tt><tt>[<ref>] [match error <value> + degrees|arcmin|arcsec]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[<ref>] [match function 1and2|1not2|2not1]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> @@ -476,6 +478,7 @@ [name <object>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> + [<ref>] [panto yes|no]</tt><tt><br> </tt><tt> </tt><tt> [<ref>] [plot <xcol> <ycol> <xerrcol> @@ -500,6 +503,7 @@ [samp send <application>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> + [<ref>] [save <filename>]</tt><tt><br> </tt><tt> </tt><tt> [<ref>] [server</tt><tt> </tt><tt>cds|adac|cadc|cambridge|sao|ukirt|iucaa|bejing|saao]</tt><tt><br> @@ -524,10 +528,12 @@ [<ref>] [symbol shape circle|ellipse|box|text|point]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt>[<ref>] + [symbol shape</tt><tt> </tt><tt>circle point|box point|diamond point|</tt><tt>cross point|x point|arrow point|boxcircle point]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> + [<ref>] [symbol add| [#] remove]</tt><tt><br> </tt><tt> [<ref>] [symbol save|load <filename>]</tt><tt><br> @@ -574,6 +580,7 @@ </tt><tt> </tt><tt> </tt><tt>$ds9 -catalog name m51</tt><tt><br> </tt><tt> $ds9 -catalog panto no</tt><tt><br> </tt><tt> </tt><tt> </tt><tt>$ds9 -catalog plot</tt><tt> </tt><tt>'\$Jmag' + '\$Hmag' '\$e_Jmag' '\$e_Hmag'</tt><tt><br> </tt><tt> </tt><tt> </tt><tt>$ds9 -catalog print</tt><tt><br> </tt><tt> </tt><tt>$ds9 -catalog psky fk5</tt><tt><br> @@ -666,6 +673,7 @@ </tt> <tt><tt> + [match]<br> [lock [yes|no]]</tt><br> @@ -797,6 +805,7 @@ [match + <coordsys>]<br> [lock <coordsys>|none]</tt><br> @@ -957,6 +966,7 @@ </tt> <tt><tt><tt><tt>$ds9 -envi foo.hdr</tt></tt><tt><tt><tt><tt><tt><tt><br> </tt></tt></tt></tt></tt></tt></tt></tt> <tt><tt>$ds9 + -envi foo.hdr foo.bsq</tt></tt><tt><tt><tt><tt><tt><tt><br> </tt></tt></tt></tt></tt></tt> <p><b><a name="exit" id="exit"></a>exit<br> @@ -987,9 +997,11 @@ </tt><tt> </tt><tt>-export envi <header> [<filename>]</tt><tt> </tt><tt>[big|little</tt><tt>|native]</tt><tt> </tt><tt><br> </tt><tt> </tt><tt> </tt><tt>-export <filename></tt><tt>.jpeg + [1-100]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt>-export <filename></tt><tt>.tiff + [none|jpeg|packbits|deflate]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt><br> </tt><tt> Example:</tt><tt><br> @@ -1425,7 +1437,8 @@ <p>Controls mask parameters.</p> <tt>Syntax:<br> -mask [color <color>]<br> - [mark 1|0]<br> + [mark zero|nonzero|range]<br> + [range <low> <high>]<br> [transparency <value>]<br> </tt><tt><tt><tt> [system <coordsys>]<br> @@ -1435,7 +1448,8 @@ <br> Example:<br> $ds9 -mask color red<br> - $ds9 -mask mark 0<br> + $ds9 -mask mark zero<br> + $ds9 -mask range 10 100<br> $ds9 -mask transparency 50<br> $ds9 -mask system wcs<br> $ds9 -mask clear<br> @@ -1450,8 +1464,10 @@ <coordsys>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt>[crosshair + <coordsys>]</tt><tt> </tt><tt><br> </tt><tt> </tt><tt> </tt><tt> + [crop <coordsys>]</tt><tt><br> </tt><tt> </tt><tt> [slice <coordsys>]</tt><tt><br> @@ -1463,6 +1479,7 @@ </tt><tt> [block]</tt><tt><br> </tt><tt> [smooth]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> + [3d]</tt><tt><br> </tt><tt> </tt><tt><br> </tt><tt> Example:</tt><tt><br> @@ -1580,14 +1597,17 @@ + [pan]<br> + [crosshair]<br> + [open|close]<br> <br> Example:<br> @@ -1696,6 +1716,7 @@ + [yes|open]<br> [no|close]<br> @@ -1725,6 +1746,7 @@ </tt><tt> </tt><tt> </tt><tt><br> </tt><tt> </tt><tt> </tt><tt># existing plot</tt><tt><br> </tt><tt> </tt><tt> </tt><tt>-plot</tt><tt> </tt><tt>[[<plotname>] + load <filename> xy|xyex|xyey|xyexey]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> [[<plotname>] save <filename>]</tt><tt><br> @@ -1738,6 +1760,7 @@ </tt><tt>[[<plotname>] list yes|no]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + loadconfig <filename>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> [[<plotname>] saveconfig <filename>]</tt><tt><br> @@ -1758,8 +1781,10 @@ [[<plotname>] print color rgb|gray]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + close</tt><tt>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + mode pointer|zoom]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt><br> </tt><tt> </tt><tt> </tt><tt># configure graph</tt><tt><br> @@ -1779,6 +1804,7 @@ [[<plotname>] axis x|y format <string>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + legend yes|no]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> [[<plotname>] legend position right|left|top|bottom]</tt><tt><br> @@ -1800,6 +1826,7 @@ [[<plotname>] title x|y <string>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> [</tt><tt>[<plotname>] + barmode normal|stacked|aligned|overlap]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt><br> </tt><tt> </tt><tt> </tt><tt># configure current dataset</tt><tt><br> @@ -1981,6 +2008,7 @@ </tt><tt> [filename <filename>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> + [color rgb|cmyk|gray]</tt><tt><br> </tt><tt> [level 1|2]</tt><tt><br> </tt><tt> [resolution @@ -2261,6 +2289,7 @@ <filename> + [image|table|slice]</tt><br> <tt> <br> Example:<br> @@ -2377,6 +2406,7 @@ [coordinate <ra> <dec> <coordsys>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[<ref>] + [crosshair]</tt><tt><br> </tt><tt> </tt><tt> [<ref>] [export sb|tsv <filename>]</tt><tt><br> @@ -2398,6 +2428,7 @@ [<ref>] [system <coordsys>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[<ref>] + [update]</tt><tt><br> </tt><tt> </tt><tt><br> </tt><tt> Example:</tt><tt><br> @@ -2506,15 +2537,18 @@ </tt></tt></tt></tt> <tt><tt><tt><tt><tt><tt> + [sigma <value>]<br> </tt></tt></tt></tt></tt></tt> <tt><tt><tt><tt><tt><tt> + [sigmaminor <value>]<br> </tt></tt></tt></tt></tt></tt> <tt><tt><tt><tt><tt><tt><tt><tt> [angle + <value>]<br> </tt></tt></tt></tt></tt></tt></tt> [match]<br> @@ -2533,9 +2567,11 @@ -smooth + sigmaminor 2.0<br> </tt></tt></tt></tt></tt></tt> <tt><tt><tt><tt><tt><tt><tt><tt>$ds9 + -smooth angle 45<br> </tt></tt></tt></tt></tt></tt></tt> $ds9 -smooth match<br> diff --git a/ds9/doc/ref/samp.html b/ds9/doc/ref/samp.html index 43a0314..e9d4a4a 100644 --- a/ds9/doc/ref/samp.html +++ b/ds9/doc/ref/samp.html @@ -463,6 +463,7 @@ </tt><tt> [</tt><tt>ua2|ub1|</tt><tt>ucac2|ucac2sup|ucac3|ucac4|urat1]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> + [2mass|iras]</tt><tt><br> </tt><tt> [csc|xmm|rosat]</tt><tt><br> @@ -502,6 +503,7 @@ [<ref>] [export sb|tsv <filename>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> + [<ref>] [filter <string>]</tt><tt><br> </tt><tt> [<ref>] [filter load <filename>]</tt><tt><br> @@ -514,10 +516,11 @@ </tt><tt> </tt><tt> </tt><tt> + [<ref>] [match <ref> <ref>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> - </tt><tt>[<ref>] - [match error <value> degrees|arcmin|arcsec]</tt><tt><br> + </tt><tt>[<ref>] [match error <value> + degrees|arcmin|arcsec]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[<ref>] [match function 1and2|1not2|2not1]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> @@ -530,6 +533,7 @@ [name <object>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> + [<ref>] [panto yes|no]</tt><tt><br> </tt><tt> </tt><tt> [<ref>] [plot <xcol> <ycol> <xerrcol> @@ -554,6 +558,7 @@ [samp send <application>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> + [<ref>] [save <filename>]</tt><tt><br> </tt><tt> </tt><tt> [<ref>] [server</tt><tt> </tt><tt>cds|adac|cadc|cambridge|sao|ukirt|iucaa|bejing|saao]</tt><tt><br> @@ -579,6 +584,7 @@ circle|ellipse|box|text|point]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt>[<ref>] + [symbol shape</tt><tt> </tt><tt>circle point|box point|diamond point|</tt><tt>cross point|x point|arrow point|boxcircle point]</tt><tt><br> </tt><tt> </tt><tt> @@ -633,6 +639,7 @@ </tt><tt> </tt><tt> </tt><tt>catalog name m51</tt><tt><br> </tt><tt> catalog panto no</tt><tt><br> </tt><tt> </tt><tt> </tt><tt>catalog plot</tt><tt> </tt><tt>{$Jmag} + {$Hmag} {$e_Jmag} {$e_Hmag}</tt><tt><br> </tt><tt> </tt><tt> </tt><tt>catalog print</tt><tt><br> </tt><tt> </tt><tt>catalog psky fk5</tt><tt><br> @@ -648,6 +655,7 @@ </tt><tt> </tt><tt>catalog radius 1 degrees</tt><tt><br> </tt><tt> </tt><tt>catalog symbol condition</tt><tt> </tt><tt>{$Jmag>15}</tt><tt><br> </tt><tt> </tt><tt>catalog symbol 2 shape</tt><tt> </tt><tt>{boxcircle + point}</tt><tt><br> </tt><tt> </tt><tt>catalog symbol color red</tt><tt><br> </tt><tt> catalog symbol font times</tt><tt><br> @@ -789,6 +797,7 @@ levels <filename>]<br> </tt></tt> <tt><tt><tt> + [save levels <filename>]<br> </tt></tt> [copy]<br> [paste @@ -870,6 +879,7 @@ <coordsys>|none]</tt><tt><br> </tt><tt> [reset]</tt><tt><br> </tt><tt> [3d</tt><tt> </tt><tt>zmin + zmax <coordsys>]</tt><tt><br> </tt><tt> [open|close]</tt><tt><br> </tt><tt> </tt><tt><br> @@ -1604,6 +1614,7 @@ href="file:///Users/joye/saods9/doc/ref/analysis.html#macros">Analysis + Macros</a> for more information.</p> <tt>Syntax:<br> iexam []<br> @@ -1743,7 +1754,8 @@ <p>Controls mask parameters.</p> <tt>Syntax:<br> mask [color <color>]<br> - [mark 1|0]<br> + [mark zero|nonzero|range]<br> + [range <low> <high>]<br> [transparency <value>]<br> [system <coordsys>]<br> [clear]<br> @@ -1753,11 +1765,13 @@ string value = ds9.get(string cmd)<br> mask color<br> mask mark<br> + mask range<br> mask system<br> mask transparency<br> ds9.set(string cmd)<br> mask color red<br> - mask mark 0<br> + mask mark zero<br> + mask range 10 100<br> mask transparency 50<br> mask system wcs<br> mask clear<br> @@ -2106,6 +2120,7 @@ </tt><tt> </tt><tt> </tt><tt><br> </tt><tt> </tt><tt> </tt><tt># existing plot</tt><tt><br> </tt><tt> </tt><tt> </tt><tt>plot</tt><tt> </tt><tt>[[<plotname>] + load <filename> xy|xyex|xyey|xyexey]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> [[<plotname>] save <filename>]</tt><tt><br> @@ -2113,15 +2128,19 @@ [[<plotname>] clear]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + duplicate [#]]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + stats yes|no]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + list yes|no]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + loadconfig <filename>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> [[<plotname>] saveconfig <filename>]</tt><tt><br> @@ -2142,9 +2161,11 @@ [[<plotname>] print color rgb|gray]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + close</tt><tt>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + mode pointer|zoom]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt><br> </tt><tt> </tt><tt> </tt><tt># configure graph</tt><tt><br> @@ -2164,6 +2185,7 @@ [[<plotname>] axis x|y format <string>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + legend yes|no]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> [[<plotname>] legend position right|left|top|bottom]</tt><tt><br> @@ -2185,44 +2207,56 @@ [[<plotname>] title x|y <string>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> [</tt><tt>[<plotname>] + barmode normal|stacked|aligned|overlap]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt><br> </tt><tt> </tt><tt> </tt><tt># configure current dataset</tt><tt><br> </tt><tt> </tt><tt> </tt><tt>plot [[<plotname>] show yes|no]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + shape circle|square|diamond|plus|splus|scross|triangle|arrow]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + shape fill yes|no]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + shape color <value>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + smooth step|linear|cubic|quadratic|catrom]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + color <value>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + width <value>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + dash yes|no]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + error yes|no]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + error color <value>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> [[<plotname>] color <value>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + error width <value>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + name <string>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt><br> </tt><tt> </tt><tt> </tt><tt># select current dataset</tt><tt><br> @@ -2923,6 +2957,7 @@ [<ref>] [retrieve]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> + [<ref>] [save <filename>]</tt><tt><br> </tt><tt> </tt><tt> [<ref>] [radius <value> degrees|arcmin|arcsec]</tt><tt><br> @@ -3042,18 +3077,22 @@ </tt></tt></tt></tt> <tt><tt><tt><tt><tt><tt> + [sigma <value>]<br> </tt></tt></tt></tt></tt></tt> <tt><tt><tt><tt><tt><tt> + [sigmaminor <value>]<br> </tt></tt></tt></tt></tt></tt> <tt><tt><tt><tt><tt><tt><tt><tt> [angle + <value>]<br> </tt></tt></tt></tt></tt></tt></tt></tt> <tt> + [match]<br> [lock [yes|no]]</tt><br> <tt><tt> [open|close]<br> @@ -3076,12 +3115,15 @@ </tt></tt> <tt><tt><tt><tt><tt><tt>smooth radiusminor 4<br> </tt></tt></tt></tt></tt></tt> <tt><tt><tt><tt><tt><tt><tt><tt><tt>smooth + sigma 2.0<br> </tt></tt></tt></tt></tt></tt></tt></tt></tt> <tt><tt><tt><tt><tt><tt><tt><tt><tt>smooth + sigmaminor 2.0<br> </tt></tt></tt></tt></tt></tt></tt></tt></tt> <tt><tt><tt><tt><tt><tt><tt><tt><tt><tt><tt><tt>smooth + angle 45<br> </tt></tt></tt></tt></tt></tt></tt></tt></tt></tt></tt> smooth open<br> diff --git a/ds9/doc/ref/xpa.html b/ds9/doc/ref/xpa.html index 578e5e9..8af6b06 100644 --- a/ds9/doc/ref/xpa.html +++ b/ds9/doc/ref/xpa.html @@ -208,6 +208,7 @@ compass color red</tt><br> </tt></tt></tt></tt></tt> <tt><tt><tt><tt><tt><tt><tt><tt>$xpaset + -p ds9 3d match</tt></tt></tt></tt></tt></tt></tt></tt><br> <tt><tt><tt><tt><tt><tt><tt><tt><tt><tt><tt>$xpaset -p ds9 3d lock yes</tt><br> @@ -447,6 +448,7 @@ </tt> <tt> [<ref>] [close]</tt><br> <tt> </tt> <tt>[<ref>] + [crosshair]</tt><br> <tt> [<ref>] [dec <col>]</tt><br> @@ -467,20 +469,25 @@ </tt></tt> <tt><tt><tt> + [<ref>] [match <ref> <ref>]<br> </tt></tt> </tt> <tt>[<ref>] [match + error <value> degrees|arcmin|arcsec]</tt><br> <tt> </tt> <tt>[<ref>] + [match function 1and2|1not2|2not1]<br> </tt> <tt> </tt> <tt>[<ref>] + [match return 1and2|1only|2only]</tt><br> <tt> </tt> <tt>[<ref>] + [match unique yes|no]</tt><br> <tt> [<ref>] [maxrows <number>]</tt><br> @@ -530,8 +537,10 @@ [symbol + shape</tt></tt> <tt><tt>circle point|box point|diamond point|</tt>cross + point|x point|arrow point|boxcircle point]<br> [<ref>] [symbol add| [#] remove]<br> @@ -541,6 +550,7 @@ <coordsys>]</tt><tt><br> </tt> <tt> </tt> <tt>[<ref>] + [update]</tt><br> <tt> [<ref>] [x <col>]</tt><br> @@ -1068,6 +1078,7 @@ <tt><tt><tt><tt><tt><tt>$xpaset -p ds9 export envi foo.hdr little</tt></tt><br> </tt></tt></tt></tt> <tt><tt><tt><tt><tt><tt><tt><tt><tt><tt>$xpaset + -p ds9 export envi foo.hdr foo.bsq little</tt></tt><br> </tt></tt></tt></tt> $xpaset -p ds9 export tiff foo.tiff jpeg</tt></tt></tt><br> @@ -1610,7 +1621,8 @@ <p>Controls mask parameters.</p> <tt>Syntax:<br> mask [color <color>]<br> - [mark 1|0]<br> + [mark zero|nonzero|range]<br> + [range <low> <high>]<br> [transparency <value>]<br> </tt><tt><tt> [system <coordsys>]<br> </tt> [clear]<br> @@ -1619,10 +1631,12 @@ Example:<br> $xpaget ds9 mask color<br> $xpaget ds9 mask mark<br> + $xpaget ds9 mask range<br> $xpaget ds9 mask system<br> $xpaget ds9 mask transparency<br> $xpaset -p ds9 mask color red<br> - $xpaset -p ds9 mask mark 0<br> + $xpaset -p ds9 mask mark zero<br> + $xpaset -p ds9 mask range 10 100<br> $xpaset -p ds9 mask transparency 50<br> $xpaset -p ds9 mask system wcs<br> $xpaset -p ds9 mask clear<br> @@ -1951,6 +1965,7 @@ <title> <xaxis label> <yaxis label></tt><tt> </tt><tt>xy|xyex|xyey|xyexey</tt><tt>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[new + [line|bar|scatter] <title> <xaxis label> <yaxis label></tt><tt> </tt><tt>xy|xyex|xyey|xyexey</tt><tt>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[new</tt><tt> @@ -1966,8 +1981,10 @@ </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[new</tt><tt> </tt><tt>[line|bar|scatter]</tt><tt> </tt><tt>stdin</tt><tt>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[new + name <plotname> stdin</tt><tt>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[new + name <plotname></tt><tt> </tt><tt>line|bar|scatter</tt><tt> </tt><tt>stdin</tt><tt>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt><br> @@ -1978,6 +1995,7 @@ </tt><tt> </tt><tt> </tt><tt><br> </tt><tt> </tt><tt> </tt><tt># existing plot</tt><tt><br> </tt><tt> </tt><tt> </tt><tt>plot</tt><tt> </tt><tt>[[<plotname>] + load <filename> xy|xyex|xyey|xyexey]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> [[<plotname>] save <filename>]</tt><tt><br> @@ -1985,15 +2003,19 @@ [[<plotname>] clear]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + duplicate [#]]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + stats yes|no]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + list yes|no]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + loadconfig <filename>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> [[<plotname>] saveconfig <filename>]</tt><tt><br> @@ -2014,9 +2036,11 @@ [[<plotname>] print color rgb|gray]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + close</tt><tt>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + mode pointer|zoom]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt><br> </tt><tt> </tt><tt> </tt><tt># configure graph</tt><tt><br> @@ -2036,6 +2060,7 @@ [[<plotname>] axis x|y format <string>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + legend yes|no]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> [[<plotname>] legend position right|left|top|bottom]</tt><tt><br> @@ -2057,44 +2082,56 @@ [[<plotname>] title x|y <string>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> [</tt><tt>[<plotname>] + barmode normal|stacked|aligned|overlap]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt><br> </tt><tt> </tt><tt> </tt><tt># configure current dataset</tt><tt><br> </tt><tt> </tt><tt> </tt><tt>plot [[<plotname>] show yes|no]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + shape circle|square|diamond|plus|splus|scross|triangle|arrow]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + shape fill yes|no]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + shape color <value>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + smooth step|linear|cubic|quadratic|catrom]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + color <value>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + width <value>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + dash yes|no]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + error yes|no]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + error color <value>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> [[<plotname>] color <value>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + error width <value>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[[<plotname>] + name <string>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt><br> </tt><tt> </tt><tt> </tt><tt># select current dataset</tt><tt><br> @@ -2777,6 +2814,7 @@ </tt><tt> </tt><tt> [<ref>] [coordinate <ra> <dec> <coordsys>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[<ref>] + [crosshair]</tt><tt><br> </tt><tt> </tt><tt> [<ref>] [export sb|tsv <filename>]</tt><tt><br> @@ -2796,6 +2834,7 @@ </tt><tt> </tt><tt> </tt><tt> [<ref>] [system <coordsys>]</tt><tt><br> </tt><tt> </tt><tt> </tt><tt> </tt><tt> </tt><tt>[<ref>] + [update]</tt><br> <tt><br> Example:<br> @@ -2899,18 +2938,22 @@ </tt></tt></tt></tt> <tt><tt><tt><tt><tt><tt> + [sigma <value>]<br> </tt></tt></tt></tt></tt></tt> <tt><tt><tt><tt><tt><tt> + [sigmaminor <value>]<br> </tt></tt></tt></tt></tt></tt> <tt><tt><tt><tt><tt><tt><tt><tt> [angle + <value>]<br> </tt></tt></tt></tt></tt></tt></tt></tt> <tt> + [match]<br> [lock [yes|no]]</tt><br> <tt><tt> [open|close]<br> @@ -2923,6 +2966,7 @@ </tt></tt> <tt><tt><tt><tt><tt><tt>$xpaget ds9 smooth sigma<br> </tt></tt></tt></tt></tt></tt> <tt><tt><tt><tt><tt><tt><tt><tt><tt>$xpaget + ds9 smooth sigmaminor<br> </tt></tt></tt></tt></tt></tt></tt></tt> $xpaget ds9 smooth lock<br> @@ -2934,12 +2978,15 @@ radiusminor 4<br> </tt></tt></tt></tt></tt></tt> <tt><tt><tt><tt><tt><tt><tt><tt><tt>$xpaset + -p ds9 smooth sigma 2.0<br> </tt></tt></tt></tt></tt></tt></tt></tt></tt> <tt><tt><tt><tt><tt><tt><tt><tt><tt>$xpaset + -p ds9 smooth sigmaminor 2.0<br> </tt></tt></tt></tt></tt></tt></tt></tt></tt> <tt><tt><tt><tt><tt><tt><tt><tt><tt><tt><tt><tt>$xpaset + -p ds9 smooth angle 45<br> </tt></tt></tt></tt></tt></tt></tt></tt></tt></tt></tt> $xpaset -p ds9 smooth match<br> diff --git a/ds9/library/contour.tcl b/ds9/library/contour.tcl index 44e32b9..e737695 100644 --- a/ds9/library/contour.tcl +++ b/ds9/library/contour.tcl @@ -832,7 +832,6 @@ proc ContourLoadNewDialog {fn} { proc Contour2Polygons {} { global current - global contour if {$current(frame) != {}} { $current(frame) contour create polygon diff --git a/ds9/library/marker.tcl b/ds9/library/marker.tcl index a618fd3..bba8b41 100644 --- a/ds9/library/marker.tcl +++ b/ds9/library/marker.tcl @@ -1235,6 +1235,26 @@ proc MarkerSave {} { } } +proc Marker2Mask {} { + global current + + if {$current(frame) == {}} { + return + } + if {![$current(frame) has fits]} { + return + } + + set filename [SaveFileDialog maskfbox] + if {$filename == {}} { + return + } + + $current(frame) marker create mask $filename + + MarkerDeleteAll +} + proc MarkerInfo {} { global current global marker diff --git a/ds9/library/mregion.tcl b/ds9/library/mregion.tcl index 1035d02..82d0cb8 100644 --- a/ds9/library/mregion.tcl +++ b/ds9/library/mregion.tcl @@ -62,6 +62,8 @@ proc RegionMainMenu {} { -command MarkerLoad $ds9(mb).region add command -label "[msgcat::mc {Save Regions}]..." \ -command MarkerSave + $ds9(mb).region add command -label [msgcat::mc {Convert to Mask}] \ + -command Marker2Mask $ds9(mb).region add separator $ds9(mb).region add cascade -label [msgcat::mc {Region Parameters}] \ -menu $ds9(mb).region.params diff --git a/ds9/library/stdfbox.tcl b/ds9/library/stdfbox.tcl index a7998d8..ba40183 100644 --- a/ds9/library/stdfbox.tcl +++ b/ds9/library/stdfbox.tcl @@ -50,6 +50,19 @@ proc InitDialogBox {} { [list {FITS} {*.fits.z}] \ ] + global maskfbox + set maskfbox(file) {mask.fits} + set maskfbox(dir) {} + set maskfbox(types) [list \ + [list {FITS} {*.fits}] \ + [list {FITS} {*.fit}] \ + [list {FITS} {*.fts}] \ + [list {FITS} {*.fits.gz}] \ + [list {FITS} {*.fits.bz2}] \ + [list {FITS} {*.fits.Z}] \ + [list {FITS} {*.fits.z}] \ + ] + global epsfbox set epsfbox(file) {ds9.eps} set epsfbox(dir) {} diff --git a/ds9/parsers/maskparser.tac b/ds9/parsers/maskparser.tac index 8831f46..df578d4 100644 --- a/ds9/parsers/maskparser.tac +++ b/ds9/parsers/maskparser.tac @@ -35,10 +35,12 @@ mask : {global parse; set parse(result) mask} | CLOSE_ {MaskDestroyDialog} | CLEAR_ {MaskClear} | COLOR_ STRING_ {ProcessCmdSet mask color $2 MaskColor} - | MARK_ INT_ {ProcessCmdSet mask mark $2 MaskMark} | MARK_ mark {ProcessCmdSet mask mark $2 MaskMark} + | RANGE_ numeric numeric {ProcessCmdSet2 mask low $2 high $3 MaskRange} | SYSTEM_ system | TRANSPARENCY_ numeric {ProcessCmdSet mask transparency $2 MaskTransparency} +# backward compatibility + | MARK_ INT_ {ProcessCmdSet mask mark $2 MaskMark} ; mark : ZERO_ {set _ zero} |