diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2019-03-04 18:37:21 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2019-03-04 18:37:21 (GMT) |
| commit | 8187e43515e318e0e792606365579f0868c2a5b7 (patch) | |
| tree | 5eaee76c03da0f5c3952aa6dcb13b71ae5630cf5 /ds9/parsers/catparser.tac | |
| parent | 8c5558f17b0b6cba05f3895be1287928fc2cc4c7 (diff) | |
| download | blt-8187e43515e318e0e792606365579f0868c2a5b7.zip blt-8187e43515e318e0e792606365579f0868c2a5b7.tar.gz blt-8187e43515e318e0e792606365579f0868c2a5b7.tar.bz2 | |
fixed issue allowing column names for size/size2/angle via parser
Diffstat (limited to 'ds9/parsers/catparser.tac')
| -rw-r--r-- | ds9/parsers/catparser.tac | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ds9/parsers/catparser.tac b/ds9/parsers/catparser.tac index 118ebcc..0b9b3ce 100644 --- a/ds9/parsers/catparser.tac +++ b/ds9/parsers/catparser.tac @@ -246,7 +246,7 @@ symbol : ADD_ {CatalogCmdSymbolAdd} | LOAD_ STRING_ {CatalogCmdSymbolLoad $2} | SAVE_ STRING_ {CatalogCmdSymbolSave $2} - | ANGLE_ numeric {CatalogCmdSymbol angle $2} + | ANGLE_ symbolCol {CatalogCmdSymbol angle $2} | COLOR_ STRING_ {CatalogCmdSymbol color $2} | CONDITION_ STRING_ {CatalogCmdSymbol condition $2} | FONT_ font {CatalogCmdSymbol font $2} @@ -255,8 +255,8 @@ symbol : ADD_ {CatalogCmdSymbolAdd} | FONTSLANT_ fontSlant {CatalogCmdSymbol fontslant $2} # backward compatibility | FONTSTYLE_ fontStyle {CatalogCmdSymbolFontStyle $2} - | SIZE_ numeric {CatalogCmdSymbol size $2} - | SIZE2_ numeric {CatalogCmdSymbol size2 $2} + | SIZE_ symbolCol {CatalogCmdSymbol size $2} + | SIZE2_ symbolCol {CatalogCmdSymbol size2 $2} | SHAPE_ symbolShape {CatalogCmdSymbol shape $2} | TEXT_ STRING_ {CatalogCmdSymbol text $2} | UNITS_ STRING_ {CatalogCmdSymbol units $2} @@ -284,6 +284,10 @@ symbolShape : CIRCLE_ {set _ circle} # backward compatibility | STRING_ {set _ $1} ; + +symbolCol : numeric {set _ $1} + | STRING_ {set _ $1} + ; writer : XML_ {set _ VOTWrite} | VOT_ {set _ VOTWrite} |