diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2018-05-22 18:56:04 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2018-05-22 18:56:04 (GMT) |
| commit | 90f368a04030bd4d7665a672e2d498e91bc1a13c (patch) | |
| tree | 287a7fec62f7ea5bc8bed9cceb9561055aec04c4 | |
| parent | 6f1bf3ef346df2faaef586547e75c1152bf42ff2 (diff) | |
| download | blt-90f368a04030bd4d7665a672e2d498e91bc1a13c.zip blt-90f368a04030bd4d7665a672e2d498e91bc1a13c.tar.gz blt-90f368a04030bd4d7665a672e2d498e91bc1a13c.tar.bz2 | |
update ds9 parsers
| -rw-r--r-- | ds9/doc/ref/command.html | 18 | ||||
| -rw-r--r-- | ds9/doc/ref/samp.html | 18 | ||||
| -rw-r--r-- | ds9/doc/ref/xpa.html | 18 | ||||
| -rw-r--r-- | ds9/parsers/catparser.tac | 14 | ||||
| -rw-r--r-- | ds9/parsers/gridparser.tac | 3 | ||||
| -rw-r--r-- | ds9/parsers/plotparser.tac | 1 |
6 files changed, 40 insertions, 32 deletions
diff --git a/ds9/doc/ref/command.html b/ds9/doc/ref/command.html index 1769bf9..c2dce16 100644 --- a/ds9/doc/ref/command.html +++ b/ds9/doc/ref/command.html @@ -533,7 +533,6 @@ <filename>]</tt><br> <tt> [<ref>] [header]</tt><br> - <tt> [<ref>] [hide]</tt><br> <tt> [<ref>] [location <code>]</tt><br> <tt><tt> [<ref>] @@ -949,7 +948,8 @@ [save <filename>]</tt><br> <tt> [<ref>] [server </tt><tt><tt>cds|adac|cadc|cambridge|sao|ukirt|iucaa|bejing|saao]</tt></tt><br> - <tt> [<ref>] [show]</tt><br> + <tt> [<ref>] [show + yes|no]</tt><br> <tt> [<ref>] [size <width> <height> degrees|arcmin|arcsec]</tt><br> <tt> </tt><tt> [<ref>] @@ -965,11 +965,12 @@ </tt><tt> [<ref>] [symbol [#] text|size|size2|units|angle <value>] </tt><br> <tt><tt> [<ref>] - [symbol shape circle|ellipse|box|text|circle point|box - point|diamond point|<br> - - cross point|x point|arrow point|boxcircle - point]<br> + [symbol shape circle|ellipse|box|text|point]<br> + </tt></tt><tt><tt><tt><tt>[<ref>] + + [symbol shape </tt></tt></tt></tt><tt><tt><tt><tt><tt><tt>circle + point|box point|diamond point|</tt></tt></tt></tt>cross + point|x point|arrow point|boxcircle point]<br> </tt> </tt><tt> [<ref>] [symbol add| [#] remove]<br> [<ref>] [symbol @@ -1098,7 +1099,6 @@ </tt><tt>$ds9 -catalog filter </tt><tt>'\$Jmag>15'</tt><tt><br> $ds9 -catalog filter load foo.flt<br> $ds9 -catalog header<br> - </tt><tt>$ds9 -catalog hide<br> </tt><tt>$ds9 -catalog location 500</tt><br> <tt>$ds9 -catalog match error 2 arcsec<br> $ds9 -catalog match function 1and2<br> @@ -1121,7 +1121,7 @@ $ds9 -catalog samp send aladin<br> $ds9 -catalog save foo.xml<br> </tt><tt>$ds9 -catalog server sao<br> - </tt><tt>$ds9 -catalog show</tt><br> + </tt><tt>$ds9 -catalog show yes</tt><br> <tt> $ds9 -catalog size 1 1 degrees</tt><br> <tt>$ds9 -catalog symbol condition '\$Jmag>15'<br> $ds9 -catalog symbol 2 shape "boxcircle point"<br> diff --git a/ds9/doc/ref/samp.html b/ds9/doc/ref/samp.html index 742c7ea..e5159ba 100644 --- a/ds9/doc/ref/samp.html +++ b/ds9/doc/ref/samp.html @@ -585,7 +585,6 @@ <filename>]</tt><br> <tt> [<ref>] [header]</tt><br> - <tt> [<ref>] [hide]</tt><br> <tt> [<ref>] [location <code>]</tt><br> <tt><tt> [<ref>] @@ -992,7 +991,8 @@ [save <filename>]</tt><br> <tt> [<ref>] [server </tt><tt><tt>cds|adac|cadc|cambridge|sao|ukirt|iucaa|bejing|saao]</tt></tt><br> - <tt> [<ref>] [show]</tt><br> + <tt> [<ref>] [show + yes|no]</tt><br> <tt> [<ref>] [size <width> <height> degrees|arcmin|arcsec]</tt><br> <tt> </tt><tt> [<ref>] @@ -1008,11 +1008,12 @@ </tt><tt> [<ref>] [symbol [#] text|size|size2|units|angle <value>] <br> </tt><tt><tt> [<ref>] - [symbol shape circle|ellipse|box|text|circle point|box - point|diamond point|<br> - - cross point|x point|arrow point|boxcircle - point]<br> + [symbol shape circle|ellipse|box|text|point]<br> + </tt></tt><tt><tt><tt><tt>[<ref>] + + [symbol shape </tt></tt></tt></tt><tt><tt><tt><tt><tt><tt>circle + point|box point|diamond point|</tt></tt></tt></tt>cross + point|x point|arrow point|boxcircle point]<br> </tt> [<ref>] [symbol add| [#] remove]<br> [<ref>] [symbol @@ -1144,7 +1145,6 @@ </tt><tt>catalog filter {$Jmag>10}<br> catalog filter load foo.flt<br> catalog header<br> - </tt><tt>catalog hide<br> </tt><tt>catalog location 500</tt><br> <tt>catalog match error 2 arcsec<br> catalog match function 1and2<br> @@ -1167,7 +1167,7 @@ catalog samp send aladin<br> catalog save foo.xml<br> </tt><tt>catalog server sao<br> - </tt><tt>catalog show</tt><br> + </tt><tt>catalog show yes</tt><br> <tt> catalog size 1 1 degrees</tt><br> <tt>catalog symbol condition </tt><tt>{$Jmag>15}</tt><br> <tt> catalog symbol 2 shape </tt><tt>{boxcircle point}</tt><br> diff --git a/ds9/doc/ref/xpa.html b/ds9/doc/ref/xpa.html index f4aca85..dc2e838 100644 --- a/ds9/doc/ref/xpa.html +++ b/ds9/doc/ref/xpa.html @@ -562,7 +562,6 @@ <filename>]</tt><br> <tt> [<ref>] [header]</tt><br> - <tt> [<ref>] [hide]</tt><br> <tt> [<ref>] [location <code>]</tt><br> <tt><tt> [<ref>] @@ -983,7 +982,8 @@ [save <filename>]</tt><br> <tt> [<ref>] [server cds|adac|cadc|cambridge|sao|ukirt|iucaa|bejing|saao]</tt><br> - <tt> [<ref>] [show]</tt><br> + <tt> [<ref>] [show + yes|no]</tt><br> <tt> [<ref>] [size <width> <height> degrees|arcmin|arcsec]</tt><br> <tt> </tt><tt> [<ref>] @@ -999,11 +999,12 @@ </tt><tt> [<ref>] [symbol [#] text|size|size2|units|angle <value>] <br> </tt><tt> [<ref>] - [symbol shape circle|ellipse|box|text|circle point|box - point|diamond point|<br> - - cross point|x point|arrow point|boxcircle - point]<br> + [symbol shape circle|ellipse|box|text|point]<br> + </tt><tt><tt>[<ref>] + + [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> [<ref>] [symbol @@ -1137,7 +1138,6 @@ </tt><tt>$xpaset -p ds9 catalog filter '$Jmag>10'<br> $xpaset -p ds9 catalog filter load foo.flt<br> $xpaset -p ds9 catalog header<br> - </tt><tt>$xpaset -p ds9 catalog hide<br> </tt><tt>$xpaset -p ds9 catalog location 500</tt><br> <tt>$xpaset -p ds9 catalog match error 2 arcsec<br> $xpaset -p ds9 catalog match function 1and2<br> @@ -1160,7 +1160,7 @@ $xpaset -p ds9 catalog samp send aladin<br> $xpaset -p ds9 catalog save foo.xml<br> </tt><tt>$xpaset -p ds9 catalog server sao<br> - </tt><tt>$xpaset -p ds9 catalog show</tt><br> + </tt><tt>$xpaset -p ds9 catalog show yes</tt><br> <tt>$xpaset -p ds9 catalog size 1 1 degrees</tt><br> <tt>$xpaset -p ds9 catalog symbol condition '$Jmag>15'<br> $xpaset -p ds9 catalog symbol 2 shape "boxcircle point"<br> diff --git a/ds9/parsers/catparser.tac b/ds9/parsers/catparser.tac index 22f651e..a6b5e17 100644 --- a/ds9/parsers/catparser.tac +++ b/ds9/parsers/catparser.tac @@ -135,6 +135,7 @@ catCmd : coordinate | EXPORT_ writer STRING_ {CatalogCmdSave $3 $2} | FILTER_ filter | HEADER_ {global cvarname; CATHeader $cvarname} +# backward compatibilty | HIDE_ {CatalogCmdGenerate show 0} | LOCATION_ INT_ {CatalogCmdGenerate loc $2} | MATCH_ match @@ -237,6 +238,7 @@ symbol : ADD_ {CatalogCmdSymbolAdd} | FONTSIZE_ INT_ {CatalogCmdSymbol fontsize $2} | FONTWEIGHT_ fontWeight {CatalogCmdSymbol fontweight $2} | FONTSLANT_ fontSlant {CatalogCmdSymbol fontslant $2} +# backward compatibility | FONTSTYLE_ fontStyle {CatalogCmdSymbolFontStyle $2} | SIZE_ numeric {CatalogCmdSymbol size $2} | SIZE2_ numeric {CatalogCmdSymbol size2 $2} @@ -245,7 +247,12 @@ symbol : ADD_ {CatalogCmdSymbolAdd} | UNITS_ STRING_ {CatalogCmdSymbol units $2} ; -symbolShape : POINT_ {set _ "circle point"} +symbolShape : CIRCLE_ {set _ circle} + | ELLIPSE_ {set _ ellipse} + | BOX_ {set _ box} + | TEXT_ {set _ text} + + | POINT_ {set _ "circle point"} | CIRCLE_ POINT_ {set _ "circle point"} | BOX_ POINT_ {set _ "box point"} | DIAMOND_ {set _ "diamond point"} @@ -258,10 +265,7 @@ symbolShape : POINT_ {set _ "circle point"} | ARROW_ POINT_ {set _ "arrow point"} | BOXCIRCLE_ {set _ "boxcircle point"} | BOXCIRCLE_ POINT_ {set _ "boxcircle point"} - | CIRCLE_ {set _ circle} - | ELLIPSE_ {set _ ellipse} - | BOX_ {set _ box} - | TEXT_ {set _ text} + # backward compatibility | STRING_ {set _ $1} ; diff --git a/ds9/parsers/gridparser.tac b/ds9/parsers/gridparser.tac index 1bbe070..bffadf7 100644 --- a/ds9/parsers/gridparser.tac +++ b/ds9/parsers/gridparser.tac @@ -162,6 +162,7 @@ numerics : yesno {GridCmdSet numlab $1} | FONTSIZE_ INT_ {GridCmdSet numlab,size $2} | FONTWEIGHT_ fontWeight {GridCmdSet numlab,weight $2} | FONTSLANT_ fontSlant {GridCmdSet numlab,slant $2} +# backward compatibility | FONTSTYLE_ fontStyle {GridCmdFontStyle numlab $2} | COLOR_ STRING_ {GridCmdSet numlab,color $2} | GAP1_ numeric {GridCmdSet numlab,gap1 $2} @@ -179,6 +180,7 @@ title : yesno {GridCmdSet title $1} | FONTSIZE_ INT_ {GridCmdSet title,size $2} | FONTWEIGHT_ fontWeight {GridCmdSet title,weight $2} | FONTSLANT_ fontSlant {GridCmdSet title,slant $2} +# backward compatibility | FONTSTYLE_ fontStyle {GridCmdFontStyle title $2} | COLOR_ STRING_ {GridCmdSet title,color $2} ; @@ -194,6 +196,7 @@ labels : yesno {GridCmdSet textlab $1} | FONTSIZE_ INT_ {GridCmdSet textlab,size $2} | FONTWEIGHT_ fontWeight {GridCmdSet textlab,weight $2} | FONTSLANT_ fontSlant {GridCmdSet textlab,slant $2} +# backward compatibility | FONTSTYLE_ fontStyle {GridCmdFontStyle textlab $2} | COLOR_ STRING_ {GridCmdSet textlab,color $2} ; diff --git a/ds9/parsers/plotparser.tac b/ds9/parsers/plotparser.tac index 9131293..904c5a0 100644 --- a/ds9/parsers/plotparser.tac +++ b/ds9/parsers/plotparser.tac @@ -323,6 +323,7 @@ fontt : fontType FONT_ font {PlotCmdUpdateGraph "$1,family" $3} | fontType FONTSIZE_ INT_ {PlotCmdUpdateGraph "$1,size" $3} | fontType FONTWEIGHT_ fontWeight {PlotCmdUpdateGraph "$1,weight" $3} | fontType FONTSLANT_ fontSlant {PlotCmdUpdateGraph "$1,slant" $3} +# backward compatibility | fontType FONTSTYLE_ fontStyle {PlotCmdFontStyle $1 $3} | fontType SIZE_ INT_ {PlotCmdUpdateGraph "$1,size" $3} | fontType WEIGHT_ fontWeight {PlotCmdUpdateGraph "$1,weight" $3} |