diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2020-03-24 19:22:11 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2020-03-24 19:22:11 (GMT) |
| commit | 46212c877b533ef1d48bd68f93c41f3940319f88 (patch) | |
| tree | 3d5e19d4cee1ad271af9fd22d1fd79fdb1daa09b | |
| parent | 514ce4d8396c8520c5da9df8dd931ca96292726a (diff) | |
| download | blt-46212c877b533ef1d48bd68f93c41f3940319f88.zip blt-46212c877b533ef1d48bd68f93c41f3940319f88.tar.gz blt-46212c877b533ef1d48bd68f93c41f3940319f88.tar.bz2 | |
libutil
| -rw-r--r-- | tksao/Makefile.in | 10 | ||||
| -rwxr-xr-x | tksao/configure | 22 | ||||
| -rw-r--r-- | tksao/configure.ac | 22 | ||||
| -rw-r--r-- | tksao/frame/basebox.C | 1 | ||||
| -rw-r--r-- | tksao/frame/basecommand.C | 1 | ||||
| -rw-r--r-- | tksao/frame/baseellipse.C | 1 | ||||
| -rw-r--r-- | tksao/frame/basemarker.C | 1 | ||||
| -rw-r--r-- | tksao/frame/bpanda.C | 1 | ||||
| -rw-r--r-- | tksao/frame/ciaoparser.C | 105 | ||||
| -rw-r--r-- | tksao/frame/ciaoparser.H | 2 | ||||
| -rw-r--r-- | tksao/frame/ciaoparser.Y | 1 | ||||
| -rw-r--r-- | tksao/frame/compass.C | 1 | ||||
| -rw-r--r-- | tksao/frame/contourparser.C | 209 | ||||
| -rw-r--r-- | tksao/frame/contourparser.H | 2 | ||||
| -rw-r--r-- | tksao/frame/contourparser.Y | 3 | ||||
| -rw-r--r-- | tksao/frame/coord.C | 1 | ||||
| -rw-r--r-- | tksao/frame/cpanda.C | 1 | ||||
| -rw-r--r-- | tksao/frame/ds9parser.C | 631 | ||||
| -rw-r--r-- | tksao/frame/ds9parser.H | 2 | ||||
| -rw-r--r-- | tksao/frame/ds9parser.Y | 1 | ||||
| -rw-r--r-- | tksao/frame/epanda.C | 1 | ||||
| -rw-r--r-- | tksao/frame/fitsimage.C | 1 | ||||
| -rw-r--r-- | tksao/frame/fitsmap.C | 1 | ||||
| -rw-r--r-- | tksao/frame/fr3dcommand.C | 1 | ||||
| -rw-r--r-- | tksao/frame/frame3d.C | 1 | ||||
| -rw-r--r-- | tksao/frame/frame3dbase.C | 1 | ||||
| -rw-r--r-- | tksao/frame/frmap.C | 1 | ||||
| -rw-r--r-- | tksao/frame/frmarker.C | 1 | ||||
| -rw-r--r-- | tksao/frame/frmarkerxml.C | 1 | ||||
| -rw-r--r-- | tksao/frame/parser.C | 2449 | ||||
| -rw-r--r-- | tksao/frame/parser.H | 2 | ||||
| -rw-r--r-- | tksao/frame/parser.Y | 3 | ||||
| -rw-r--r-- | tksao/frame/point.C | 1 | ||||
| -rw-r--r-- | tksao/frame/prosparser.C | 159 | ||||
| -rw-r--r-- | tksao/frame/prosparser.H | 2 | ||||
| -rw-r--r-- | tksao/frame/prosparser.Y | 1 | ||||
| -rw-r--r-- | tksao/frame/saoparser.C | 97 | ||||
| -rw-r--r-- | tksao/frame/saoparser.H | 2 | ||||
| -rw-r--r-- | tksao/frame/saoparser.Y | 1 | ||||
| -rw-r--r-- | tksao/frame/text.C | 1 | ||||
| -rw-r--r-- | tksao/frame/tngparser.C | 145 | ||||
| -rw-r--r-- | tksao/frame/tngparser.H | 2 | ||||
| -rw-r--r-- | tksao/frame/tngparser.Y | 1 | ||||
| -rw-r--r-- | tksao/frame/xyparser.C | 147 | ||||
| -rw-r--r-- | tksao/frame/xyparser.H | 2 | ||||
| -rw-r--r-- | tksao/frame/xyparser.Y | 1 | ||||
| -rw-r--r-- | tksao/tkutil/FlexLexer.h (renamed from tksao/util/FlexLexer.h) | 0 | ||||
| -rw-r--r-- | tksao/tkutil/attribute.C (renamed from tksao/util/attribute.C) | 0 | ||||
| -rw-r--r-- | tksao/tkutil/attribute.h (renamed from tksao/util/attribute.h) | 0 | ||||
| -rw-r--r-- | tksao/tkutil/convolve.C (renamed from tksao/util/convolve.C) | 0 | ||||
| -rw-r--r-- | tksao/tkutil/convolve.h (renamed from tksao/util/convolve.h) | 0 | ||||
| -rw-r--r-- | tksao/tkutil/fdstream.hpp (renamed from tksao/util/fdstream.hpp) | 0 | ||||
| -rw-r--r-- | tksao/tkutil/grf.C (renamed from tksao/util/grf.C) | 0 | ||||
| -rw-r--r-- | tksao/tkutil/grf3d.C (renamed from tksao/util/grf3d.C) | 0 | ||||
| -rw-r--r-- | tksao/tkutil/grid25dbase.C (renamed from tksao/util/grid25dbase.C) | 0 | ||||
| -rw-r--r-- | tksao/tkutil/grid25dbase.h (renamed from tksao/util/grid25dbase.h) | 0 | ||||
| -rw-r--r-- | tksao/tkutil/grid2dbase.C (renamed from tksao/util/grid2dbase.C) | 0 | ||||
| -rw-r--r-- | tksao/tkutil/grid2dbase.h (renamed from tksao/util/grid2dbase.h) | 0 | ||||
| -rw-r--r-- | tksao/tkutil/grid3dbase.C (renamed from tksao/util/grid3dbase.C) | 0 | ||||
| -rw-r--r-- | tksao/tkutil/grid3dbase.h (renamed from tksao/util/grid3dbase.h) | 0 | ||||
| -rw-r--r-- | tksao/tkutil/gridbase.C (renamed from tksao/util/gridbase.C) | 1 | ||||
| -rw-r--r-- | tksao/tkutil/gridbase.h (renamed from tksao/util/gridbase.h) | 0 | ||||
| -rw-r--r-- | tksao/tkutil/ps.C (renamed from tksao/util/ps.C) | 1 | ||||
| -rw-r--r-- | tksao/tkutil/ps.h (renamed from tksao/util/ps.h) | 0 | ||||
| -rw-r--r-- | tksao/tkutil/tkutil.C (renamed from tksao/util/util.C) | 1 | ||||
| -rw-r--r-- | tksao/tkutil/tkutil.h (renamed from tksao/util/util.h) | 4 |
66 files changed, 2044 insertions, 2006 deletions
diff --git a/tksao/Makefile.in b/tksao/Makefile.in index b1d3abb..13944ab 100644 --- a/tksao/Makefile.in +++ b/tksao/Makefile.in @@ -202,7 +202,7 @@ binaries: $(BINARIES) libraries: -parsers : cbparsers fitsyparsers frparsers magparser panparser +parsers : cbparsers frparsers magparser panparser contourparser cbparsers : cbparser cblutparser cbsaoparser @@ -248,10 +248,6 @@ xyparser : bison -d -p xy -o frame/xyparser.C frame/xyparser.Y flex -Pxy -oframe/xylex.C frame/xylex.L -contourparser : - bison -d -p ct -o frame/contourparser.C frame/contourparser.Y - flex -Pct -oframe/contourlex.C frame/contourlex.L - magparser : bison -d -p mg -o magnifier/parser.C magnifier/parser.Y flex -Pmg -omagnifier/lex.C magnifier/lex.L @@ -260,6 +256,10 @@ panparser : bison -d -p pn -o panner/parser.C panner/parser.Y flex -Ppn -opanner/lex.C panner/lex.L +contourparser : + bison -d -p ct -o frame/contourparser.C frame/contourparser.Y + flex -Pct -oframe/contourlex.C frame/contourlex.L + #======================================================================== # Your doc target should differentiate from doc builds (by the developer) # and doc installs (see install-doc), which just install the docs on the diff --git a/tksao/configure b/tksao/configure index e1a8387..46f624d 100755 --- a/tksao/configure +++ b/tksao/configure @@ -5605,16 +5605,16 @@ panner/lex.C panner/panner.C panner/pannertrue.C panner/parser.C -util/attribute.C -util/convolve.C -util/grf.C -util/grf3d.C -util/grid25dbase.C -util/grid2dbase.C -util/grid3dbase.C -util/gridbase.C -util/ps.C -util/util.C +tkutil/attribute.C +tkutil/convolve.C +tkutil/grf.C +tkutil/grf3d.C +tkutil/grid25dbase.C +tkutil/grid2dbase.C +tkutil/grid3dbase.C +tkutil/gridbase.C +tkutil/ps.C +tkutil/tkutil.C widget/truecolor16.C widget/truecolor24.C widget/truecolor8.C @@ -5666,7 +5666,7 @@ widget/widget.C - vars="-I. -I./colorbar -I./frame -I./list -I./magnifier -I./panner -I./util -I./widget -I${prefix}/include" + vars="-I. -I./colorbar -I./frame -I./list -I./magnifier -I./panner -I./tkutil -I./widget -I${prefix}/include" for i in $vars; do PKG_INCLUDES="$PKG_INCLUDES $i" done diff --git a/tksao/configure.ac b/tksao/configure.ac index 57ffdb8..f32f601 100644 --- a/tksao/configure.ac +++ b/tksao/configure.ac @@ -206,16 +206,16 @@ panner/lex.C panner/panner.C panner/pannertrue.C panner/parser.C -util/attribute.C -util/convolve.C -util/grf.C -util/grf3d.C -util/grid25dbase.C -util/grid2dbase.C -util/grid3dbase.C -util/gridbase.C -util/ps.C -util/util.C +tkutil/attribute.C +tkutil/convolve.C +tkutil/grf.C +tkutil/grf3d.C +tkutil/grid25dbase.C +tkutil/grid2dbase.C +tkutil/grid3dbase.C +tkutil/gridbase.C +tkutil/ps.C +tkutil/tkutil.C widget/truecolor16.C widget/truecolor24.C widget/truecolor8.C @@ -223,7 +223,7 @@ widget/widget.C ]) TEA_ADD_HEADERS([]) -TEA_ADD_INCLUDES([-I. -I./colorbar -I./frame -I./list -I./magnifier -I./panner -I./util -I./widget -I${prefix}/include]) +TEA_ADD_INCLUDES([-I. -I./colorbar -I./frame -I./list -I./magnifier -I./panner -I./tkutil -I./widget -I${prefix}/include]) TEA_ADD_LIBS([]) TEA_ADD_CFLAGS([]) TEA_ADD_STUB_SOURCES([]) diff --git a/tksao/frame/basebox.C b/tksao/frame/basebox.C index aebb31f..78e5482 100644 --- a/tksao/frame/basebox.C +++ b/tksao/frame/basebox.C @@ -3,6 +3,7 @@ // For conditions of distribution and use, see copyright notice in "copyright" #include "util.h" +#include "tkutil.h" #include "basebox.h" #include "fitsimage.h" diff --git a/tksao/frame/basecommand.C b/tksao/frame/basecommand.C index c87c075..d4664b6 100644 --- a/tksao/frame/basecommand.C +++ b/tksao/frame/basecommand.C @@ -6,6 +6,7 @@ #include "fdstream.hpp" #include "util.h" +#include "tkutil.h" #include "base.h" #include "context.h" #include "fitsimage.h" diff --git a/tksao/frame/baseellipse.C b/tksao/frame/baseellipse.C index f63a270..50110d6 100644 --- a/tksao/frame/baseellipse.C +++ b/tksao/frame/baseellipse.C @@ -3,6 +3,7 @@ // For conditions of distribution and use, see copyright notice in "copyright" #include "util.h" +#include "tkutil.h" #include "baseellipse.h" #include "fitsimage.h" diff --git a/tksao/frame/basemarker.C b/tksao/frame/basemarker.C index 608c255..18eb749 100644 --- a/tksao/frame/basemarker.C +++ b/tksao/frame/basemarker.C @@ -4,6 +4,7 @@ #include "basemarker.h" #include "base.h" +#include "tkutil.h" // Base Markers Public diff --git a/tksao/frame/bpanda.C b/tksao/frame/bpanda.C index b21b288..2bdfa30 100644 --- a/tksao/frame/bpanda.C +++ b/tksao/frame/bpanda.C @@ -2,6 +2,7 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" +#include "tkutil.h" #include "bpanda.h" #include "fitsimage.h" diff --git a/tksao/frame/ciaoparser.C b/tksao/frame/ciaoparser.C index 9968de9..fc55feb 100644 --- a/tksao/frame/ciaoparser.C +++ b/tksao/frame/ciaoparser.C @@ -142,6 +142,7 @@ #include <string.h> #include <iostream> +#include "tkutil.h" #include "base.h" #include "fitsimage.h" #include "basemarker.h" @@ -187,7 +188,7 @@ static void setProps(unsigned short* props, unsigned short prop, int value); #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 44 "frame/ciaoparser.Y" +#line 45 "frame/ciaoparser.Y" { #define CIAOBUFSIZE 2048 double real; @@ -196,7 +197,7 @@ typedef union YYSTYPE double vector[3]; } /* Line 193 of yacc.c. */ -#line 200 "frame/ciaoparser.C" +#line 201 "frame/ciaoparser.C" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -209,7 +210,7 @@ typedef union YYSTYPE /* Line 216 of yacc.c. */ -#line 213 "frame/ciaoparser.C" +#line 214 "frame/ciaoparser.C" #ifdef short # undef short @@ -518,13 +519,13 @@ static const yytype_int8 yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 94, 94, 95, 98, 99, 100, 101, 104, 105, - 106, 109, 110, 111, 112, 113, 114, 115, 116, 119, - 120, 123, 124, 127, 130, 133, 136, 147, 150, 151, - 152, 153, 156, 163, 170, 177, 186, 189, 192, 195, - 202, 209, 216, 225, 230, 235, 236, 241, 246, 247, - 252, 257, 257, 262, 269, 270, 271, 274, 281, 282, - 285 + 0, 95, 95, 96, 99, 100, 101, 102, 105, 106, + 107, 110, 111, 112, 113, 114, 115, 116, 117, 120, + 121, 124, 125, 128, 131, 134, 137, 148, 151, 152, + 153, 154, 157, 164, 171, 178, 187, 190, 193, 196, + 203, 210, 217, 226, 231, 236, 237, 242, 247, 248, + 253, 258, 258, 263, 270, 271, 272, 275, 282, 283, + 286 }; #endif @@ -1527,52 +1528,52 @@ yyreduce: switch (yyn) { case 6: -#line 100 "frame/ciaoparser.Y" +#line 101 "frame/ciaoparser.Y" {cerr << "CIAO Regions File 1.0" << endl;;} break; case 10: -#line 106 "frame/ciaoparser.Y" +#line 107 "frame/ciaoparser.Y" {YYACCEPT;;} break; case 16: -#line 114 "frame/ciaoparser.Y" +#line 115 "frame/ciaoparser.Y" {setProps(&props, Marker::INCLUDE, 0);;} break; case 17: -#line 115 "frame/ciaoparser.Y" +#line 116 "frame/ciaoparser.Y" {setProps(&props, Marker::INCLUDE, 0);;} break; case 18: -#line 116 "frame/ciaoparser.Y" +#line 117 "frame/ciaoparser.Y" {setProps(&props, Marker::INCLUDE, 0);;} break; case 19: -#line 119 "frame/ciaoparser.Y" +#line 120 "frame/ciaoparser.Y" {(yyval.real)=(yyvsp[(1) - (1)].real);;} break; case 20: -#line 120 "frame/ciaoparser.Y" +#line 121 "frame/ciaoparser.Y" {(yyval.real)=(yyvsp[(1) - (1)].integer);;} break; case 21: -#line 123 "frame/ciaoparser.Y" +#line 124 "frame/ciaoparser.Y" {yydebug=1;;} break; case 22: -#line 124 "frame/ciaoparser.Y" +#line 125 "frame/ciaoparser.Y" {yydebug=0;;} break; case 26: -#line 136 "frame/ciaoparser.Y" +#line 137 "frame/ciaoparser.Y" { // reset maperr flag maperr =0; @@ -1585,32 +1586,32 @@ yyreduce: break; case 27: -#line 147 "frame/ciaoparser.Y" +#line 148 "frame/ciaoparser.Y" {(yyval.real) = zeroTWOPI(degToRad((yyvsp[(1) - (1)].real)));;} break; case 28: -#line 150 "frame/ciaoparser.Y" +#line 151 "frame/ciaoparser.Y" {(yyval.real) = FITSPTR->mapLenToRef((yyvsp[(1) - (1)].real), Coord::PHYSICAL);;} break; case 29: -#line 151 "frame/ciaoparser.Y" +#line 152 "frame/ciaoparser.Y" {(yyval.real) = FITSPTR->mapLenToRef((yyvsp[(1) - (1)].real), Coord::WCS, Coord::DEGREE);;} break; case 30: -#line 152 "frame/ciaoparser.Y" +#line 153 "frame/ciaoparser.Y" {(yyval.real) = FITSPTR->mapLenToRef((yyvsp[(1) - (1)].real), Coord::WCS, Coord::ARCMIN);;} break; case 31: -#line 153 "frame/ciaoparser.Y" +#line 154 "frame/ciaoparser.Y" {(yyval.real) = FITSPTR->mapLenToRef((yyvsp[(1) - (1)].real), Coord::WCS, Coord::ARCSEC);;} break; case 32: -#line 157 "frame/ciaoparser.Y" +#line 158 "frame/ciaoparser.Y" { Vector rr = FITSPTR->mapLenToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), Coord::PHYSICAL); (yyval.vector)[0] = rr[0]; @@ -1620,7 +1621,7 @@ yyreduce: break; case 33: -#line 164 "frame/ciaoparser.Y" +#line 165 "frame/ciaoparser.Y" { Vector rr= FITSPTR->mapLenToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), Coord::WCS,Coord::DEGREE); (yyval.vector)[0] = rr[0]; @@ -1630,7 +1631,7 @@ yyreduce: break; case 34: -#line 171 "frame/ciaoparser.Y" +#line 172 "frame/ciaoparser.Y" { Vector rr = FITSPTR->mapLenToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), Coord::WCS, Coord::ARCMIN); (yyval.vector)[0] = rr[0]; @@ -1640,7 +1641,7 @@ yyreduce: break; case 35: -#line 178 "frame/ciaoparser.Y" +#line 179 "frame/ciaoparser.Y" { Vector rr = FITSPTR->mapLenToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), Coord::WCS, Coord::ARCSEC); (yyval.vector)[0] = rr[0]; @@ -1650,22 +1651,22 @@ yyreduce: break; case 36: -#line 186 "frame/ciaoparser.Y" +#line 187 "frame/ciaoparser.Y" {(yyval.real) = parseSEXStr((yyvsp[(1) - (1)].str));;} break; case 37: -#line 189 "frame/ciaoparser.Y" +#line 190 "frame/ciaoparser.Y" {(yyval.real) = parseHMSStr((yyvsp[(1) - (1)].str));;} break; case 38: -#line 192 "frame/ciaoparser.Y" +#line 193 "frame/ciaoparser.Y" {(yyval.real) = parseDMSStr((yyvsp[(1) - (1)].str));;} break; case 39: -#line 196 "frame/ciaoparser.Y" +#line 197 "frame/ciaoparser.Y" { Vector rr = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), Coord::PHYSICAL); (yyval.vector)[0] = rr[0]; @@ -1675,7 +1676,7 @@ yyreduce: break; case 40: -#line 203 "frame/ciaoparser.Y" +#line 204 "frame/ciaoparser.Y" { Vector rr = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real)*360./24.,(yyvsp[(3) - (3)].real)), Coord::WCS,Coord::FK5); (yyval.vector)[0] = rr[0]; @@ -1685,7 +1686,7 @@ yyreduce: break; case 41: -#line 210 "frame/ciaoparser.Y" +#line 211 "frame/ciaoparser.Y" { Vector rr = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), Coord::WCS, Coord::FK5); (yyval.vector)[0] = rr[0]; @@ -1695,7 +1696,7 @@ yyreduce: break; case 42: -#line 217 "frame/ciaoparser.Y" +#line 218 "frame/ciaoparser.Y" { Vector rr = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), Coord::WCS, Coord::FK5); (yyval.vector)[0] = rr[0]; @@ -1705,7 +1706,7 @@ yyreduce: break; case 43: -#line 226 "frame/ciaoparser.Y" +#line 227 "frame/ciaoparser.Y" { fr->createAnnulusCmd(Vector((yyvsp[(3) - (7)].vector)), (yyvsp[(5) - (7)].real), (yyvsp[(7) - (7)].real), 1, color,dash,1,font,text,props,NULL,taglist,cblist); @@ -1713,7 +1714,7 @@ yyreduce: break; case 44: -#line 231 "frame/ciaoparser.Y" +#line 232 "frame/ciaoparser.Y" { fr->createBoxCmd(Vector((yyvsp[(3) - (5)].vector)), (yyvsp[(5) - (5)].vector), 0, fill_, color,dash,1,font,text,props,NULL,taglist,cblist); @@ -1721,7 +1722,7 @@ yyreduce: break; case 46: -#line 237 "frame/ciaoparser.Y" +#line 238 "frame/ciaoparser.Y" { fr->createCircleCmd(Vector((yyvsp[(3) - (5)].vector)), (yyvsp[(5) - (5)].real), fill_, color,dash,1,font,text,props,NULL,taglist,cblist); @@ -1729,7 +1730,7 @@ yyreduce: break; case 47: -#line 242 "frame/ciaoparser.Y" +#line 243 "frame/ciaoparser.Y" { fr->createEllipseCmd(Vector((yyvsp[(3) - (7)].vector)), Vector((yyvsp[(5) - (7)].vector)), (yyvsp[(7) - (7)].real), fill_, color,dash,1,font,text,props,NULL,taglist,cblist); @@ -1737,12 +1738,12 @@ yyreduce: break; case 48: -#line 246 "frame/ciaoparser.Y" +#line 247 "frame/ciaoparser.Y" {/* not supported */;} break; case 49: -#line 248 "frame/ciaoparser.Y" +#line 249 "frame/ciaoparser.Y" { fr->createCpandaCmd(Vector((yyvsp[(3) - (11)].vector)), (yyvsp[(9) - (11)].real), (yyvsp[(11) - (11)].real), 1, (yyvsp[(5) - (11)].real), (yyvsp[(7) - (11)].real), 1, color,dash,1,font,text,props,NULL,taglist,cblist); @@ -1750,7 +1751,7 @@ yyreduce: break; case 50: -#line 253 "frame/ciaoparser.Y" +#line 254 "frame/ciaoparser.Y" { fr->createPointCmd(Vector((yyvsp[(3) - (3)].vector)), Point::BOXCIRCLE, POINTSIZE, color,dash,1,font,text,props,NULL,taglist,cblist); @@ -1758,12 +1759,12 @@ yyreduce: break; case 51: -#line 257 "frame/ciaoparser.Y" +#line 258 "frame/ciaoparser.Y" {polylist.deleteAll();;} break; case 52: -#line 258 "frame/ciaoparser.Y" +#line 259 "frame/ciaoparser.Y" { fr->createPolygonCmd(polylist, fill_, color,dash,1,font,text,props,NULL,taglist,cblist); @@ -1771,7 +1772,7 @@ yyreduce: break; case 53: -#line 263 "frame/ciaoparser.Y" +#line 264 "frame/ciaoparser.Y" { Vector cc = (Vector((yyvsp[(5) - (5)].vector))-Vector((yyvsp[(3) - (5)].vector)))/2.+Vector((yyvsp[(3) - (5)].vector)); Vector wh = Vector((yyvsp[(5) - (5)].vector))-Vector((yyvsp[(3) - (5)].vector)); @@ -1781,17 +1782,17 @@ yyreduce: break; case 54: -#line 269 "frame/ciaoparser.Y" +#line 270 "frame/ciaoparser.Y" {/* not supported */;} break; case 56: -#line 271 "frame/ciaoparser.Y" +#line 272 "frame/ciaoparser.Y" {/* not supported */;} break; case 57: -#line 275 "frame/ciaoparser.Y" +#line 276 "frame/ciaoparser.Y" { fr->createBoxCmd(Vector((yyvsp[(2) - (6)].vector)), Vector((yyvsp[(4) - (6)].vector)), (yyvsp[(6) - (6)].real), fill_, color,dash,1,font,text,props,NULL,taglist,cblist); @@ -1799,13 +1800,13 @@ yyreduce: break; case 60: -#line 285 "frame/ciaoparser.Y" +#line 286 "frame/ciaoparser.Y" {polylist.append(new Vertex((yyvsp[(1) - (1)].vector)));;} break; /* Line 1267 of yacc.c. */ -#line 1809 "frame/ciaoparser.C" +#line 1810 "frame/ciaoparser.C" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2019,7 +2020,7 @@ yyreturn: } -#line 288 "frame/ciaoparser.Y" +#line 289 "frame/ciaoparser.Y" static void setProps(unsigned short* props, unsigned short prop, int value) diff --git a/tksao/frame/ciaoparser.H b/tksao/frame/ciaoparser.H index 43b98f3..4b2bf07 100644 --- a/tksao/frame/ciaoparser.H +++ b/tksao/frame/ciaoparser.H @@ -98,7 +98,7 @@ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 44 "frame/ciaoparser.Y" +#line 45 "frame/ciaoparser.Y" { #define CIAOBUFSIZE 2048 double real; diff --git a/tksao/frame/ciaoparser.Y b/tksao/frame/ciaoparser.Y index 1bd4f60..faa27de 100644 --- a/tksao/frame/ciaoparser.Y +++ b/tksao/frame/ciaoparser.Y @@ -16,6 +16,7 @@ #include <string.h> #include <iostream> +#include "tkutil.h" #include "base.h" #include "fitsimage.h" #include "basemarker.h" diff --git a/tksao/frame/compass.C b/tksao/frame/compass.C index 077dded..aec928c 100644 --- a/tksao/frame/compass.C +++ b/tksao/frame/compass.C @@ -3,6 +3,7 @@ // For conditions of distribution and use, see copyright notice in "copyright" #include "util.h" +#include "tkutil.h" #include "compass.h" #include "fitsimage.h" diff --git a/tksao/frame/contourparser.C b/tksao/frame/contourparser.C index cbd8931..982c6e7 100644 --- a/tksao/frame/contourparser.C +++ b/tksao/frame/contourparser.C @@ -226,6 +226,7 @@ #include <iostream> #include "util.h" +#include "tkutil.h" #include "base.h" #include "context.h" #include "fitsimage.h" @@ -281,7 +282,7 @@ static Coord::SkyFrame checkWCSSky(); #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 56 "frame/contourparser.Y" +#line 57 "frame/contourparser.Y" { #define CTBUFSIZE 2048 double real; @@ -290,7 +291,7 @@ typedef union YYSTYPE double vector[3]; } /* Line 193 of yacc.c. */ -#line 294 "frame/contourparser.C" +#line 295 "frame/contourparser.C" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -303,7 +304,7 @@ typedef union YYSTYPE /* Line 216 of yacc.c. */ -#line 307 "frame/contourparser.C" +#line 308 "frame/contourparser.C" #ifdef short # undef short @@ -631,18 +632,18 @@ static const yytype_int8 yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 148, 148, 151, 152, 156, 162, 163, 165, 166, - 170, 175, 180, 181, 181, 182, 182, 183, 188, 189, - 196, 196, 199, 200, 204, 211, 212, 215, 229, 230, - 230, 233, 234, 235, 245, 246, 249, 250, 253, 255, - 256, 257, 258, 260, 261, 262, 263, 266, 267, 270, - 273, 276, 279, 293, 302, 303, 304, 305, 306, 309, - 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, - 320, 321, 322, 323, 324, 325, 326, 327, 328, 329, - 330, 331, 332, 333, 334, 335, 338, 339, 340, 341, - 342, 343, 344, 347, 348, 351, 352, 353, 354, 355, - 358, 359, 362, 363, 364, 365, 368, 381, 389, 397, - 404, 412, 419 + 0, 149, 149, 152, 153, 157, 163, 164, 166, 167, + 171, 176, 181, 182, 182, 183, 183, 184, 189, 190, + 197, 197, 200, 201, 205, 212, 213, 216, 230, 231, + 231, 234, 235, 236, 246, 247, 250, 251, 254, 256, + 257, 258, 259, 261, 262, 263, 264, 267, 268, 271, + 274, 277, 280, 294, 303, 304, 305, 306, 307, 310, + 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, + 321, 322, 323, 324, 325, 326, 327, 328, 329, 330, + 331, 332, 333, 334, 335, 336, 339, 340, 341, 342, + 343, 344, 345, 348, 349, 352, 353, 354, 355, 356, + 359, 360, 363, 364, 365, 366, 369, 382, 390, 398, + 405, 413, 420 }; #endif @@ -1707,7 +1708,7 @@ yyreduce: switch (yyn) { case 5: -#line 156 "frame/contourparser.Y" +#line 157 "frame/contourparser.Y" { if (cc && cl) { cl->lcontour().append(cc); @@ -1717,19 +1718,19 @@ yyreduce: break; case 7: -#line 163 "frame/contourparser.Y" +#line 164 "frame/contourparser.Y" {cerr << "DS9 Contour File 7.5" << endl;;} break; case 9: -#line 167 "frame/contourparser.Y" +#line 168 "frame/contourparser.Y" { globalSystem=(Coord::CoordSystem)(yyvsp[(1) - (2)].integer); ;} break; case 10: -#line 171 "frame/contourparser.Y" +#line 172 "frame/contourparser.Y" { globalSystem=globalWCS; globalSky=(Coord::SkyFrame)(yyvsp[(1) - (2)].integer); @@ -1737,7 +1738,7 @@ yyreduce: break; case 11: -#line 176 "frame/contourparser.Y" +#line 177 "frame/contourparser.Y" { globalSystem=globalWCS; globalSky=Coord::FK5; @@ -1745,17 +1746,17 @@ yyreduce: break; case 13: -#line 181 "frame/contourparser.Y" +#line 182 "frame/contourparser.Y" {localLevel = (yyvsp[(3) - (3)].real);} break; case 15: -#line 182 "frame/contourparser.Y" +#line 183 "frame/contourparser.Y" {localLevel = (yyvsp[(3) - (3)].real);} break; case 17: -#line 184 "frame/contourparser.Y" +#line 185 "frame/contourparser.Y" { if (cl) cc = new Contour(cl); @@ -1763,7 +1764,7 @@ yyreduce: break; case 19: -#line 190 "frame/contourparser.Y" +#line 191 "frame/contourparser.Y" { if (cc && cl) { cl->lcontour().append(cc); @@ -1773,12 +1774,12 @@ yyreduce: break; case 20: -#line 196 "frame/contourparser.Y" +#line 197 "frame/contourparser.Y" {DISCARD_(1);;} break; case 24: -#line 204 "frame/contourparser.Y" +#line 205 "frame/contourparser.Y" { if (cl) ct->contourAppendAux(cl); @@ -1787,7 +1788,7 @@ yyreduce: break; case 27: -#line 216 "frame/contourparser.Y" +#line 217 "frame/contourparser.Y" { if (cc) cc->lvertex().append(new Vertex((yyvsp[(1) - (2)].vector))); @@ -1802,12 +1803,12 @@ yyreduce: break; case 29: -#line 230 "frame/contourparser.Y" +#line 231 "frame/contourparser.Y" {DISCARD_(1);;} break; case 33: -#line 236 "frame/contourparser.Y" +#line 237 "frame/contourparser.Y" { if (cl) { ct->contourAppendAux(cl); @@ -1818,87 +1819,87 @@ yyreduce: break; case 34: -#line 245 "frame/contourparser.Y" +#line 246 "frame/contourparser.Y" {(yyval.real)=(yyvsp[(1) - (1)].real);;} break; case 35: -#line 246 "frame/contourparser.Y" +#line 247 "frame/contourparser.Y" {(yyval.real)=(yyvsp[(1) - (1)].integer);;} break; case 36: -#line 249 "frame/contourparser.Y" +#line 250 "frame/contourparser.Y" {yydebug=1;;} break; case 37: -#line 250 "frame/contourparser.Y" +#line 251 "frame/contourparser.Y" {yydebug=0;;} break; case 38: -#line 253 "frame/contourparser.Y" +#line 254 "frame/contourparser.Y" {(yyval.integer)=((yyvsp[(1) - (1)].integer) ? 1 : 0);;} break; case 39: -#line 255 "frame/contourparser.Y" +#line 256 "frame/contourparser.Y" {(yyval.integer)=1;;} break; case 40: -#line 256 "frame/contourparser.Y" +#line 257 "frame/contourparser.Y" {(yyval.integer)=1;;} break; case 41: -#line 257 "frame/contourparser.Y" +#line 258 "frame/contourparser.Y" {(yyval.integer)=1;;} break; case 42: -#line 258 "frame/contourparser.Y" +#line 259 "frame/contourparser.Y" {(yyval.integer)=1;;} break; case 43: -#line 260 "frame/contourparser.Y" +#line 261 "frame/contourparser.Y" {(yyval.integer)=0;;} break; case 44: -#line 261 "frame/contourparser.Y" +#line 262 "frame/contourparser.Y" {(yyval.integer)=0;;} break; case 45: -#line 262 "frame/contourparser.Y" +#line 263 "frame/contourparser.Y" {(yyval.integer)=0;;} break; case 46: -#line 263 "frame/contourparser.Y" +#line 264 "frame/contourparser.Y" {(yyval.integer)=0;;} break; case 49: -#line 270 "frame/contourparser.Y" +#line 271 "frame/contourparser.Y" {(yyval.real) = parseSEXStr((yyvsp[(1) - (1)].str));;} break; case 50: -#line 273 "frame/contourparser.Y" +#line 274 "frame/contourparser.Y" {(yyval.real) = parseHMSStr((yyvsp[(1) - (1)].str));;} break; case 51: -#line 276 "frame/contourparser.Y" +#line 277 "frame/contourparser.Y" {(yyval.real) = parseDMSStr((yyvsp[(1) - (1)].str));;} break; case 52: -#line 279 "frame/contourparser.Y" +#line 280 "frame/contourparser.Y" { cl = NULL; cc = NULL; @@ -1914,7 +1915,7 @@ yyreduce: break; case 53: -#line 293 "frame/contourparser.Y" +#line 294 "frame/contourparser.Y" { strcpy(localColor,globalColor); localDash = globalDash; @@ -1925,247 +1926,247 @@ yyreduce: break; case 54: -#line 302 "frame/contourparser.Y" +#line 303 "frame/contourparser.Y" {(yyval.integer) = Coord::IMAGE;;} break; case 55: -#line 303 "frame/contourparser.Y" +#line 304 "frame/contourparser.Y" {(yyval.integer) = Coord::PHYSICAL;;} break; case 56: -#line 304 "frame/contourparser.Y" +#line 305 "frame/contourparser.Y" {(yyval.integer) = Coord::DETECTOR;;} break; case 57: -#line 305 "frame/contourparser.Y" +#line 306 "frame/contourparser.Y" {(yyval.integer) = Coord::AMPLIFIER;;} break; case 58: -#line 306 "frame/contourparser.Y" +#line 307 "frame/contourparser.Y" {(yyval.integer) = (yyvsp[(1) - (1)].integer); globalWCS = (Coord::CoordSystem)(yyvsp[(1) - (1)].integer);;} break; case 59: -#line 309 "frame/contourparser.Y" +#line 310 "frame/contourparser.Y" {(yyval.integer) = Coord::WCS;;} break; case 60: -#line 310 "frame/contourparser.Y" +#line 311 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSA;;} break; case 61: -#line 311 "frame/contourparser.Y" +#line 312 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSB;;} break; case 62: -#line 312 "frame/contourparser.Y" +#line 313 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSC;;} break; case 63: -#line 313 "frame/contourparser.Y" +#line 314 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSD;;} break; case 64: -#line 314 "frame/contourparser.Y" +#line 315 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSE;;} break; case 65: -#line 315 "frame/contourparser.Y" +#line 316 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSF;;} break; case 66: -#line 316 "frame/contourparser.Y" +#line 317 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSG;;} break; case 67: -#line 317 "frame/contourparser.Y" +#line 318 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSH;;} break; case 68: -#line 318 "frame/contourparser.Y" +#line 319 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSI;;} break; case 69: -#line 319 "frame/contourparser.Y" +#line 320 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSJ;;} break; case 70: -#line 320 "frame/contourparser.Y" +#line 321 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSK;;} break; case 71: -#line 321 "frame/contourparser.Y" +#line 322 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSL;;} break; case 72: -#line 322 "frame/contourparser.Y" +#line 323 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSM;;} break; case 73: -#line 323 "frame/contourparser.Y" +#line 324 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSN;;} break; case 74: -#line 324 "frame/contourparser.Y" +#line 325 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSO;;} break; case 75: -#line 325 "frame/contourparser.Y" +#line 326 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSP;;} break; case 76: -#line 326 "frame/contourparser.Y" +#line 327 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSQ;;} break; case 77: -#line 327 "frame/contourparser.Y" +#line 328 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSR;;} break; case 78: -#line 328 "frame/contourparser.Y" +#line 329 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSS;;} break; case 79: -#line 329 "frame/contourparser.Y" +#line 330 "frame/contourparser.Y" {(yyval.integer) = Coord::WCST;;} break; case 80: -#line 330 "frame/contourparser.Y" +#line 331 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSU;;} break; case 81: -#line 331 "frame/contourparser.Y" +#line 332 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSV;;} break; case 82: -#line 332 "frame/contourparser.Y" +#line 333 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSW;;} break; case 83: -#line 333 "frame/contourparser.Y" +#line 334 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSX;;} break; case 84: -#line 334 "frame/contourparser.Y" +#line 335 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSY;;} break; case 85: -#line 335 "frame/contourparser.Y" +#line 336 "frame/contourparser.Y" {(yyval.integer) = Coord::WCSZ;;} break; case 86: -#line 338 "frame/contourparser.Y" +#line 339 "frame/contourparser.Y" {(yyval.integer) = Coord::FK4;;} break; case 87: -#line 339 "frame/contourparser.Y" +#line 340 "frame/contourparser.Y" {(yyval.integer) = Coord::FK4;;} break; case 88: -#line 340 "frame/contourparser.Y" +#line 341 "frame/contourparser.Y" {(yyval.integer) = Coord::FK5;;} break; case 89: -#line 341 "frame/contourparser.Y" +#line 342 "frame/contourparser.Y" {(yyval.integer) = Coord::FK5;;} break; case 90: -#line 342 "frame/contourparser.Y" +#line 343 "frame/contourparser.Y" {(yyval.integer) = Coord::ICRS;;} break; case 91: -#line 343 "frame/contourparser.Y" +#line 344 "frame/contourparser.Y" {(yyval.integer) = Coord::GALACTIC;;} break; case 92: -#line 344 "frame/contourparser.Y" +#line 345 "frame/contourparser.Y" {(yyval.integer) = Coord::ECLIPTIC;;} break; case 95: -#line 351 "frame/contourparser.Y" +#line 352 "frame/contourparser.Y" {strncpy(globalColor,(yyvsp[(3) - (3)].str),16);;} break; case 96: -#line 352 "frame/contourparser.Y" +#line 353 "frame/contourparser.Y" {globalDash = (yyvsp[(3) - (3)].integer);;} break; case 97: -#line 353 "frame/contourparser.Y" +#line 354 "frame/contourparser.Y" {globalDashList[0] =(yyvsp[(3) - (4)].integer); globalDashList[1] =(yyvsp[(4) - (4)].integer);;} break; case 98: -#line 354 "frame/contourparser.Y" +#line 355 "frame/contourparser.Y" {globalWCS = (Coord::CoordSystem)(yyvsp[(3) - (3)].integer);;} break; case 99: -#line 355 "frame/contourparser.Y" +#line 356 "frame/contourparser.Y" {globalWidth = (yyvsp[(3) - (3)].integer);;} break; case 102: -#line 362 "frame/contourparser.Y" +#line 363 "frame/contourparser.Y" {strncpy(localColor,(yyvsp[(3) - (3)].str),16);;} break; case 103: -#line 363 "frame/contourparser.Y" +#line 364 "frame/contourparser.Y" {localDash = (yyvsp[(3) - (3)].integer);;} break; case 104: -#line 364 "frame/contourparser.Y" +#line 365 "frame/contourparser.Y" {localDashList[0] =(yyvsp[(3) - (4)].integer); localDashList[1] =(yyvsp[(4) - (4)].integer);;} break; case 105: -#line 365 "frame/contourparser.Y" +#line 366 "frame/contourparser.Y" {localWidth = (yyvsp[(3) - (3)].integer);;} break; case 106: -#line 369 "frame/contourparser.Y" +#line 370 "frame/contourparser.Y" { Vector r; Coord::CoordSystem sys = checkWCSSystem(); @@ -2181,7 +2182,7 @@ yyreduce: break; case 107: -#line 382 "frame/contourparser.Y" +#line 383 "frame/contourparser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), checkWCSSystem(), checkWCSSky()); @@ -2192,7 +2193,7 @@ yyreduce: break; case 108: -#line 390 "frame/contourparser.Y" +#line 391 "frame/contourparser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), checkWCSSystem(), checkWCSSky()); @@ -2203,7 +2204,7 @@ yyreduce: break; case 109: -#line 398 "frame/contourparser.Y" +#line 399 "frame/contourparser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), globalSystem, globalSky); (yyval.vector)[0] = r[0]; @@ -2213,7 +2214,7 @@ yyreduce: break; case 110: -#line 405 "frame/contourparser.Y" +#line 406 "frame/contourparser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), checkWCSSystem(), checkWCSSky()); @@ -2224,7 +2225,7 @@ yyreduce: break; case 111: -#line 413 "frame/contourparser.Y" +#line 414 "frame/contourparser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), Coord::IMAGE); (yyval.vector)[0] = r[0]; @@ -2234,7 +2235,7 @@ yyreduce: break; case 112: -#line 420 "frame/contourparser.Y" +#line 421 "frame/contourparser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), Coord::PHYSICAL); (yyval.vector)[0] = r[0]; @@ -2244,7 +2245,7 @@ yyreduce: /* Line 1267 of yacc.c. */ -#line 2248 "frame/contourparser.C" +#line 2249 "frame/contourparser.C" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2458,7 +2459,7 @@ yyreturn: } -#line 426 "frame/contourparser.Y" +#line 427 "frame/contourparser.Y" static Coord::CoordSystem checkWCSSystem() diff --git a/tksao/frame/contourparser.H b/tksao/frame/contourparser.H index a5df146..7262a1a 100644 --- a/tksao/frame/contourparser.H +++ b/tksao/frame/contourparser.H @@ -180,7 +180,7 @@ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 56 "frame/contourparser.Y" +#line 57 "frame/contourparser.Y" { #define CTBUFSIZE 2048 double real; diff --git a/tksao/frame/contourparser.Y b/tksao/frame/contourparser.Y index 1cda1ca..e3fca6e 100644 --- a/tksao/frame/contourparser.Y +++ b/tksao/frame/contourparser.Y @@ -17,11 +17,12 @@ #include <string.h> #include <iostream> +#include "util.h" +#include "tkutil.h" #include "base.h" #include "context.h" #include "fitsimage.h" #include "contour.h" -#include "util.h" #undef yyFlexLexer #define yyFlexLexer ctFlexLexer diff --git a/tksao/frame/coord.C b/tksao/frame/coord.C index be9c50c..49d3abe 100644 --- a/tksao/frame/coord.C +++ b/tksao/frame/coord.C @@ -3,6 +3,7 @@ // For conditions of distribution and use, see copyright notice in "copyright" #include "util.h" +#include "tkutil.h" #include "coord.h" #include "fitsimage.h" diff --git a/tksao/frame/cpanda.C b/tksao/frame/cpanda.C index 69f330f..06414a6 100644 --- a/tksao/frame/cpanda.C +++ b/tksao/frame/cpanda.C @@ -2,6 +2,7 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" +#include "tkutil.h" #include "cpanda.h" #include "fitsimage.h" diff --git a/tksao/frame/ds9parser.C b/tksao/frame/ds9parser.C index d4c26a0..84fc8e7 100644 --- a/tksao/frame/ds9parser.C +++ b/tksao/frame/ds9parser.C @@ -341,6 +341,7 @@ #include <string.h> #include <iostream> +#include "tkutil.h" #include "base.h" #include "fitsimage.h" #include "basemarker.h" @@ -482,7 +483,7 @@ static Coord::SkyFrame checkWCSSky(); #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 141 "frame/ds9parser.Y" +#line 142 "frame/ds9parser.Y" { #define MKBUFSIZE 2048 double real; @@ -491,7 +492,7 @@ typedef union YYSTYPE double vector[3]; } /* Line 193 of yacc.c. */ -#line 495 "frame/ds9parser.C" +#line 496 "frame/ds9parser.C" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -504,7 +505,7 @@ typedef union YYSTYPE /* Line 216 of yacc.c. */ -#line 508 "frame/ds9parser.C" +#line 509 "frame/ds9parser.C" #ifdef short # undef short @@ -960,39 +961,39 @@ static const yytype_int16 yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 300, 300, 303, 304, 307, 308, 309, 311, 312, - 314, 314, 315, 315, 316, 316, 318, 319, 320, 323, - 324, 325, 326, 326, 329, 330, 330, 333, 334, 334, - 335, 336, 336, 339, 340, 340, 341, 342, 342, 345, - 346, 347, 350, 351, 354, 355, 358, 360, 361, 362, - 363, 365, 366, 367, 368, 371, 372, 375, 376, 379, - 380, 383, 384, 385, 388, 389, 392, 394, 396, 399, - 400, 401, 402, 403, 404, 407, 414, 421, 428, 435, - 442, 451, 454, 457, 460, 463, 476, 484, 492, 499, - 507, 514, 522, 523, 524, 525, 526, 529, 530, 531, - 532, 533, 534, 535, 536, 537, 538, 539, 540, 541, - 542, 543, 544, 545, 546, 547, 548, 549, 550, 551, - 552, 553, 554, 555, 556, 559, 560, 561, 562, 563, - 564, 565, 568, 569, 570, 573, 574, 575, 576, 577, - 578, 579, 580, 581, 582, 585, 586, 587, 588, 589, - 590, 591, 592, 593, 594, 595, 596, 597, 598, 599, - 600, 601, 602, 603, 604, 605, 608, 609, 612, 617, - 622, 627, 628, 633, 638, 643, 648, 653, 654, 659, - 663, 668, 669, 673, 674, 675, 684, 685, 686, 689, - 696, 703, 710, 717, 724, 731, 738, 744, 753, 758, - 763, 768, 775, 819, 820, 823, 824, 825, 830, 831, - 832, 833, 834, 836, 837, 838, 840, 841, 842, 843, - 844, 845, 846, 847, 848, 855, 856, 857, 858, 859, - 862, 869, 876, 883, 890, 897, 904, 911, 918, 927, - 932, 937, 942, 949, 949, 950, 953, 953, 955, 958, - 958, 960, 963, 1014, 1015, 1016, 1017, 1018, 1019, 1020, - 1023, 1024, 1027, 1035, 1035, 1042, 1049, 1058, 1068, 1076, - 1084, 1093, 1100, 1108, 1131, 1154, 1163, 1163, 1170, 1170, - 1178, 1186, 1194, 1201, 1201, 1209, 1216, 1223, 1230, 1237, - 1244, 1251, 1258, 1265, 1274, 1284, 1292, 1299, 1309, 1317, - 1327, 1337, 1349, 1357, 1367, 1379, 1389, 1398, 1420, 1444, - 1469, 1470, 1471, 1473, 1475, 1484, 1485, 1488, 1491, 1492, - 1495, 1502, 1503, 1506, 1513, 1514, 1517, 1521 + 0, 301, 301, 304, 305, 308, 309, 310, 312, 313, + 315, 315, 316, 316, 317, 317, 319, 320, 321, 324, + 325, 326, 327, 327, 330, 331, 331, 334, 335, 335, + 336, 337, 337, 340, 341, 341, 342, 343, 343, 346, + 347, 348, 351, 352, 355, 356, 359, 361, 362, 363, + 364, 366, 367, 368, 369, 372, 373, 376, 377, 380, + 381, 384, 385, 386, 389, 390, 393, 395, 397, 400, + 401, 402, 403, 404, 405, 408, 415, 422, 429, 436, + 443, 452, 455, 458, 461, 464, 477, 485, 493, 500, + 508, 515, 523, 524, 525, 526, 527, 530, 531, 532, + 533, 534, 535, 536, 537, 538, 539, 540, 541, 542, + 543, 544, 545, 546, 547, 548, 549, 550, 551, 552, + 553, 554, 555, 556, 557, 560, 561, 562, 563, 564, + 565, 566, 569, 570, 571, 574, 575, 576, 577, 578, + 579, 580, 581, 582, 583, 586, 587, 588, 589, 590, + 591, 592, 593, 594, 595, 596, 597, 598, 599, 600, + 601, 602, 603, 604, 605, 606, 609, 610, 613, 618, + 623, 628, 629, 634, 639, 644, 649, 654, 655, 660, + 664, 669, 670, 674, 675, 676, 685, 686, 687, 690, + 697, 704, 711, 718, 725, 732, 739, 745, 754, 759, + 764, 769, 776, 820, 821, 824, 825, 826, 831, 832, + 833, 834, 835, 837, 838, 839, 841, 842, 843, 844, + 845, 846, 847, 848, 849, 856, 857, 858, 859, 860, + 863, 870, 877, 884, 891, 898, 905, 912, 919, 928, + 933, 938, 943, 950, 950, 951, 954, 954, 956, 959, + 959, 961, 964, 1015, 1016, 1017, 1018, 1019, 1020, 1021, + 1024, 1025, 1028, 1036, 1036, 1043, 1050, 1059, 1069, 1077, + 1085, 1094, 1101, 1109, 1132, 1155, 1164, 1164, 1171, 1171, + 1179, 1187, 1195, 1202, 1202, 1210, 1217, 1224, 1231, 1238, + 1245, 1252, 1259, 1266, 1275, 1285, 1293, 1300, 1310, 1318, + 1328, 1338, 1350, 1358, 1368, 1380, 1390, 1399, 1421, 1445, + 1470, 1471, 1472, 1474, 1476, 1485, 1486, 1489, 1492, 1493, + 1496, 1503, 1504, 1507, 1514, 1515, 1518, 1522 }; #endif @@ -2769,227 +2770,227 @@ yyreduce: switch (yyn) { case 7: -#line 309 "frame/ds9parser.Y" +#line 310 "frame/ds9parser.Y" {cerr << "DS9 Regions File 3.2" << endl;;} break; case 9: -#line 312 "frame/ds9parser.Y" +#line 313 "frame/ds9parser.Y" {globalTile = (yyvsp[(2) - (2)].integer);;} break; case 10: -#line 314 "frame/ds9parser.Y" +#line 315 "frame/ds9parser.Y" {globalSystem=(Coord::CoordSystem)(yyvsp[(1) - (1)].integer);;} break; case 12: -#line 315 "frame/ds9parser.Y" +#line 316 "frame/ds9parser.Y" {globalSystem=globalWCS; globalSky=(Coord::SkyFrame)(yyvsp[(1) - (1)].integer);;} break; case 14: -#line 316 "frame/ds9parser.Y" +#line 317 "frame/ds9parser.Y" {globalSystem=globalWCS; globalSky=Coord::FK5;;} break; case 21: -#line 325 "frame/ds9parser.Y" +#line 326 "frame/ds9parser.Y" {globalTile = (yyvsp[(2) - (2)].integer);;} break; case 22: -#line 326 "frame/ds9parser.Y" +#line 327 "frame/ds9parser.Y" {DISCARD_(1);;} break; case 25: -#line 330 "frame/ds9parser.Y" +#line 331 "frame/ds9parser.Y" {DISCARD_(1);;} break; case 28: -#line 334 "frame/ds9parser.Y" +#line 335 "frame/ds9parser.Y" {DISCARD_(1);;} break; case 29: -#line 334 "frame/ds9parser.Y" +#line 335 "frame/ds9parser.Y" {strncpy(localComment,(yyvsp[(3) - (4)].str),80);;} break; case 31: -#line 336 "frame/ds9parser.Y" +#line 337 "frame/ds9parser.Y" {DISCARD_(1);;} break; case 32: -#line 336 "frame/ds9parser.Y" +#line 337 "frame/ds9parser.Y" {strncpy(localComment,(yyvsp[(4) - (5)].str),80);;} break; case 34: -#line 340 "frame/ds9parser.Y" +#line 341 "frame/ds9parser.Y" {DISCARD_(1);;} break; case 35: -#line 340 "frame/ds9parser.Y" +#line 341 "frame/ds9parser.Y" {strncpy(localComment,(yyvsp[(2) - (3)].str),80);;} break; case 37: -#line 342 "frame/ds9parser.Y" +#line 343 "frame/ds9parser.Y" {DISCARD_(1);;} break; case 38: -#line 342 "frame/ds9parser.Y" +#line 343 "frame/ds9parser.Y" {strncpy(localComment,(yyvsp[(3) - (4)].str),80);;} break; case 41: -#line 347 "frame/ds9parser.Y" +#line 348 "frame/ds9parser.Y" {YYACCEPT;;} break; case 42: -#line 350 "frame/ds9parser.Y" +#line 351 "frame/ds9parser.Y" {(yyval.real)=(yyvsp[(1) - (1)].real);;} break; case 43: -#line 351 "frame/ds9parser.Y" +#line 352 "frame/ds9parser.Y" {(yyval.real)=(yyvsp[(1) - (1)].integer);;} break; case 44: -#line 354 "frame/ds9parser.Y" +#line 355 "frame/ds9parser.Y" {yydebug=1;;} break; case 45: -#line 355 "frame/ds9parser.Y" +#line 356 "frame/ds9parser.Y" {yydebug=0;;} break; case 46: -#line 358 "frame/ds9parser.Y" +#line 359 "frame/ds9parser.Y" {(yyval.integer)=((yyvsp[(1) - (1)].integer) ? 1 : 0);;} break; case 47: -#line 360 "frame/ds9parser.Y" +#line 361 "frame/ds9parser.Y" {(yyval.integer)=1;;} break; case 48: -#line 361 "frame/ds9parser.Y" +#line 362 "frame/ds9parser.Y" {(yyval.integer)=1;;} break; case 49: -#line 362 "frame/ds9parser.Y" +#line 363 "frame/ds9parser.Y" {(yyval.integer)=1;;} break; case 50: -#line 363 "frame/ds9parser.Y" +#line 364 "frame/ds9parser.Y" {(yyval.integer)=1;;} break; case 51: -#line 365 "frame/ds9parser.Y" +#line 366 "frame/ds9parser.Y" {(yyval.integer)=0;;} break; case 52: -#line 366 "frame/ds9parser.Y" +#line 367 "frame/ds9parser.Y" {(yyval.integer)=0;;} break; case 53: -#line 367 "frame/ds9parser.Y" +#line 368 "frame/ds9parser.Y" {(yyval.integer)=0;;} break; case 54: -#line 368 "frame/ds9parser.Y" +#line 369 "frame/ds9parser.Y" {(yyval.integer)=0;;} break; case 61: -#line 383 "frame/ds9parser.Y" +#line 384 "frame/ds9parser.Y" {cStatus = 0;;} break; case 62: -#line 384 "frame/ds9parser.Y" +#line 385 "frame/ds9parser.Y" {cStatus = 1;;} break; case 63: -#line 385 "frame/ds9parser.Y" +#line 386 "frame/ds9parser.Y" {cStatus = 1;;} break; case 64: -#line 388 "frame/ds9parser.Y" +#line 389 "frame/ds9parser.Y" {(yyval.real) = fr->mapAngleToRef(0,localSystem,localSky);;} break; case 65: -#line 389 "frame/ds9parser.Y" +#line 390 "frame/ds9parser.Y" {(yyval.real) = (yyvsp[(1) - (1)].real);;} break; case 66: -#line 393 "frame/ds9parser.Y" +#line 394 "frame/ds9parser.Y" {(yyval.real) = fr->mapAngleToRef(zeroTWOPI(degToRad((yyvsp[(1) - (1)].real))),localSystem,localSky);;} break; case 67: -#line 395 "frame/ds9parser.Y" +#line 396 "frame/ds9parser.Y" {(yyval.real) = fr->mapAngleToRef(zeroTWOPI(degToRad((yyvsp[(1) - (1)].real))),localSystem,localSky);;} break; case 68: -#line 396 "frame/ds9parser.Y" +#line 397 "frame/ds9parser.Y" {(yyval.real) = fr->mapAngleToRef((yyvsp[(1) - (1)].real),localSystem,localSky);;} break; case 69: -#line 399 "frame/ds9parser.Y" +#line 400 "frame/ds9parser.Y" {(yyval.real) = FITSPTR->mapLenToRef((yyvsp[(1) - (1)].real), localSystem, Coord::DEGREE);;} break; case 70: -#line 400 "frame/ds9parser.Y" +#line 401 "frame/ds9parser.Y" {(yyval.real) = FITSPTR->mapLenToRef((yyvsp[(1) - (1)].real), Coord::PHYSICAL);;} break; case 71: -#line 401 "frame/ds9parser.Y" +#line 402 "frame/ds9parser.Y" {(yyval.real) = FITSPTR->mapLenToRef((yyvsp[(1) - (1)].real), Coord::IMAGE);;} break; case 72: -#line 402 "frame/ds9parser.Y" +#line 403 "frame/ds9parser.Y" {(yyval.real) = FITSPTR->mapLenToRef((yyvsp[(1) - (1)].real), checkWCSSystem(), Coord::DEGREE);;} break; case 73: -#line 403 "frame/ds9parser.Y" +#line 404 "frame/ds9parser.Y" {(yyval.real) = FITSPTR->mapLenToRef((yyvsp[(1) - (1)].real), checkWCSSystem(), Coord::ARCMIN);;} break; case 74: -#line 404 "frame/ds9parser.Y" +#line 405 "frame/ds9parser.Y" {(yyval.real) = FITSPTR->mapLenToRef((yyvsp[(1) - (1)].real), checkWCSSystem(), Coord::ARCSEC);;} break; case 75: -#line 408 "frame/ds9parser.Y" +#line 409 "frame/ds9parser.Y" { Vector r = FITSPTR->mapLenToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), localSystem, Coord::DEGREE); (yyval.vector)[0] = r[0]; @@ -2999,7 +3000,7 @@ yyreduce: break; case 76: -#line 415 "frame/ds9parser.Y" +#line 416 "frame/ds9parser.Y" { Vector r = FITSPTR->mapLenToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), Coord::PHYSICAL); (yyval.vector)[0] = r[0]; @@ -3009,7 +3010,7 @@ yyreduce: break; case 77: -#line 422 "frame/ds9parser.Y" +#line 423 "frame/ds9parser.Y" { Vector r = FITSPTR->mapLenToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), Coord::IMAGE); (yyval.vector)[0] = r[0]; @@ -3019,7 +3020,7 @@ yyreduce: break; case 78: -#line 429 "frame/ds9parser.Y" +#line 430 "frame/ds9parser.Y" { Vector r=FITSPTR->mapLenToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)),checkWCSSystem(),Coord::DEGREE); (yyval.vector)[0] = r[0]; @@ -3029,7 +3030,7 @@ yyreduce: break; case 79: -#line 436 "frame/ds9parser.Y" +#line 437 "frame/ds9parser.Y" { Vector r=FITSPTR->mapLenToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)),checkWCSSystem(),Coord::ARCMIN); (yyval.vector)[0] = r[0]; @@ -3039,7 +3040,7 @@ yyreduce: break; case 80: -#line 443 "frame/ds9parser.Y" +#line 444 "frame/ds9parser.Y" { Vector r=FITSPTR->mapLenToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)),checkWCSSystem(),Coord::ARCSEC); (yyval.vector)[0] = r[0]; @@ -3049,27 +3050,27 @@ yyreduce: break; case 81: -#line 451 "frame/ds9parser.Y" +#line 452 "frame/ds9parser.Y" {(yyval.integer) = (yyvsp[(3) - (3)].integer);;} break; case 82: -#line 454 "frame/ds9parser.Y" +#line 455 "frame/ds9parser.Y" {(yyval.real) = parseSEXStr((yyvsp[(1) - (1)].str));;} break; case 83: -#line 457 "frame/ds9parser.Y" +#line 458 "frame/ds9parser.Y" {(yyval.real) = parseHMSStr((yyvsp[(1) - (1)].str));;} break; case 84: -#line 460 "frame/ds9parser.Y" +#line 461 "frame/ds9parser.Y" {(yyval.real) = parseDMSStr((yyvsp[(1) - (1)].str));;} break; case 85: -#line 464 "frame/ds9parser.Y" +#line 465 "frame/ds9parser.Y" { Vector r; Coord::CoordSystem sys = checkWCSSystem(); @@ -3085,7 +3086,7 @@ yyreduce: break; case 86: -#line 477 "frame/ds9parser.Y" +#line 478 "frame/ds9parser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), checkWCSSystem(), checkWCSSky()); @@ -3096,7 +3097,7 @@ yyreduce: break; case 87: -#line 485 "frame/ds9parser.Y" +#line 486 "frame/ds9parser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), checkWCSSystem(), checkWCSSky()); @@ -3107,7 +3108,7 @@ yyreduce: break; case 88: -#line 493 "frame/ds9parser.Y" +#line 494 "frame/ds9parser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), localSystem, localSky); (yyval.vector)[0] = r[0]; @@ -3117,7 +3118,7 @@ yyreduce: break; case 89: -#line 500 "frame/ds9parser.Y" +#line 501 "frame/ds9parser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), checkWCSSystem(), checkWCSSky()); @@ -3128,7 +3129,7 @@ yyreduce: break; case 90: -#line 508 "frame/ds9parser.Y" +#line 509 "frame/ds9parser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), Coord::IMAGE); (yyval.vector)[0] = r[0]; @@ -3138,7 +3139,7 @@ yyreduce: break; case 91: -#line 515 "frame/ds9parser.Y" +#line 516 "frame/ds9parser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), Coord::PHYSICAL); (yyval.vector)[0] = r[0]; @@ -3147,377 +3148,377 @@ yyreduce: break; case 92: -#line 522 "frame/ds9parser.Y" +#line 523 "frame/ds9parser.Y" {(yyval.integer) = Coord::IMAGE;;} break; case 93: -#line 523 "frame/ds9parser.Y" +#line 524 "frame/ds9parser.Y" {(yyval.integer) = Coord::PHYSICAL;;} break; case 94: -#line 524 "frame/ds9parser.Y" +#line 525 "frame/ds9parser.Y" {(yyval.integer) = Coord::DETECTOR;;} break; case 95: -#line 525 "frame/ds9parser.Y" +#line 526 "frame/ds9parser.Y" {(yyval.integer) = Coord::AMPLIFIER;;} break; case 96: -#line 526 "frame/ds9parser.Y" +#line 527 "frame/ds9parser.Y" {(yyval.integer) = (yyvsp[(1) - (1)].integer); globalWCS = (Coord::CoordSystem)(yyvsp[(1) - (1)].integer);;} break; case 97: -#line 529 "frame/ds9parser.Y" +#line 530 "frame/ds9parser.Y" {(yyval.integer) = Coord::WCS;;} break; case 98: -#line 530 "frame/ds9parser.Y" +#line 531 "frame/ds9parser.Y" {(yyval.integer) = Coord::WCSA;;} break; case 99: -#line 531 "frame/ds9parser.Y" +#line 532 "frame/ds9parser.Y" {(yyval.integer) = Coord::WCSB;;} break; case 100: -#line 532 "frame/ds9parser.Y" +#line 533 "frame/ds9parser.Y" {(yyval.integer) = Coord::WCSC;;} break; case 101: -#line 533 "frame/ds9parser.Y" +#line 534 "frame/ds9parser.Y" {(yyval.integer) = Coord::WCSD;;} break; case 102: -#line 534 "frame/ds9parser.Y" +#line 535 "frame/ds9parser.Y" {(yyval.integer) = Coord::WCSE;;} break; case 103: -#line 535 "frame/ds9parser.Y" +#line 536 "frame/ds9parser.Y" {(yyval.integer) = Coord::WCSF;;} break; case 104: -#line 536 "frame/ds9parser.Y" +#line 537 "frame/ds9parser.Y" {(yyval.integer) = Coord::WCSG;;} break; case 105: -#line 537 "frame/ds9parser.Y" +#line 538 "frame/ds9parser.Y" {(yyval.integer) = Coord::WCSH;;} break; case 106: -#line 538 "frame/ds9parser.Y" +#line 539 "frame/ds9parser.Y" {(yyval.integer) = Coord::WCSI;;} break; case 107: -#line 539 "frame/ds9parser.Y" +#line 540 "frame/ds9parser.Y" {(yyval.integer) = Coord::WCSJ;;} break; case 108: -#line 540 "frame/ds9parser.Y" +#line 541 "frame/ds9parser.Y" {(yyval.integer) = Coord::WCSK;;} break; case 109: -#line 541 "frame/ds9parser.Y" +#line 542 "frame/ds9parser.Y" {(yyval.integer) = Coord::WCSL;;} break; case 110: -#line 542 "frame/ds9parser.Y" +#line 543 "frame/ds9parser.Y" {(yyval.integer) = Coord::WCSM;;} break; case 111: -#line 543 "frame/ds9parser.Y" +#line 544 "frame/ds9parser.Y" {(yyval.integer) = Coord::WCSN;;} break; case 112: -#line 544 "frame/ds9parser.Y" +#line 545 "frame/ds9parser.Y" {(yyval.integer) = Coord::WCSO;;} break; case 113: -#line 545 "frame/ds9parser.Y" +#line 546 "frame/ds9parser.Y" {(yyval.integer) = Coord::WCSP;;} break; case 114: -#line 546 "frame/ds9parser.Y" +#line 547 "frame/ds9parser.Y" {(yyval.integer) = Coord::WCSQ;;} break; case 115: -#line 547 "frame/ds9parser.Y" +#line 548 "frame/ds9parser.Y" {(yyval.integer) = Coord::WCSR;;} break; case 116: -#line 548 "frame/ds9parser.Y" +#line 549 "frame/ds9parser.Y" {(yyval.integer) = Coord::WCSS;;} break; case 117: -#line 549 "frame/ds9parser.Y" +#line 550 "frame/ds9parser.Y" {(yyval.integer) = Coord::WCST;;} break; case 118: -#line 550 "frame/ds9parser.Y" +#line 551 "frame/ds9parser.Y" {(yyval.integer) = Coord::WCSU;;} break; case 119: -#line 551 "frame/ds9parser.Y" +#line 552 "frame/ds9parser.Y" {(yyval.integer) = Coord::WCSV;;} break; case 120: -#line 552 "frame/ds9parser.Y" +#line 553 "frame/ds9parser.Y" {(yyval.integer) = Coord::WCSW;;} break; case 121: -#line 553 "frame/ds9parser.Y" +#line 554 "frame/ds9parser.Y" {(yyval.integer) = Coord::WCSX;;} break; case 122: -#line 554 "frame/ds9parser.Y" +#line 555 "frame/ds9parser.Y" {(yyval.integer) = Coord::WCSY;;} break; case 123: -#line 555 "frame/ds9parser.Y" +#line 556 "frame/ds9parser.Y" {(yyval.integer) = Coord::WCSZ;;} break; case 124: -#line 556 "frame/ds9parser.Y" +#line 557 "frame/ds9parser.Y" {(yyval.integer) = Coord::WCS0;;} break; case 125: -#line 559 "frame/ds9parser.Y" +#line 560 "frame/ds9parser.Y" {(yyval.integer) = Coord::FK4;;} break; case 126: -#line 560 "frame/ds9parser.Y" +#line 561 "frame/ds9parser.Y" {(yyval.integer) = Coord::FK4;;} break; case 127: -#line 561 "frame/ds9parser.Y" +#line 562 "frame/ds9parser.Y" {(yyval.integer) = Coord::FK5;;} break; case 128: -#line 562 "frame/ds9parser.Y" +#line 563 "frame/ds9parser.Y" {(yyval.integer) = Coord::FK5;;} break; case 129: -#line 563 "frame/ds9parser.Y" +#line 564 "frame/ds9parser.Y" {(yyval.integer) = Coord::ICRS;;} break; case 130: -#line 564 "frame/ds9parser.Y" +#line 565 "frame/ds9parser.Y" {(yyval.integer) = Coord::GALACTIC;;} break; case 131: -#line 565 "frame/ds9parser.Y" +#line 566 "frame/ds9parser.Y" {(yyval.integer) = Coord::ECLIPTIC;;} break; case 132: -#line 568 "frame/ds9parser.Y" +#line 569 "frame/ds9parser.Y" {(yyval.integer)=Coord::DEGREE;;} break; case 133: -#line 569 "frame/ds9parser.Y" +#line 570 "frame/ds9parser.Y" {(yyval.integer)=Coord::ARCMIN;;} break; case 134: -#line 570 "frame/ds9parser.Y" +#line 571 "frame/ds9parser.Y" {(yyval.integer)=Coord::ARCSEC;;} break; case 135: -#line 573 "frame/ds9parser.Y" +#line 574 "frame/ds9parser.Y" {(yyval.integer) = Marker::SELECT;;} break; case 136: -#line 574 "frame/ds9parser.Y" +#line 575 "frame/ds9parser.Y" {(yyval.integer) = Marker::HIGHLITE;;} break; case 137: -#line 575 "frame/ds9parser.Y" +#line 576 "frame/ds9parser.Y" {(yyval.integer) = Marker::DASH;;} break; case 138: -#line 576 "frame/ds9parser.Y" +#line 577 "frame/ds9parser.Y" {(yyval.integer) = Marker::FIXED;;} break; case 139: -#line 577 "frame/ds9parser.Y" +#line 578 "frame/ds9parser.Y" {(yyval.integer) = Marker::EDIT;;} break; case 140: -#line 578 "frame/ds9parser.Y" +#line 579 "frame/ds9parser.Y" {(yyval.integer) = Marker::MOVE;;} break; case 141: -#line 579 "frame/ds9parser.Y" +#line 580 "frame/ds9parser.Y" {(yyval.integer) = Marker::ROTATE;;} break; case 142: -#line 580 "frame/ds9parser.Y" +#line 581 "frame/ds9parser.Y" {(yyval.integer) = Marker::DELETE;;} break; case 143: -#line 581 "frame/ds9parser.Y" +#line 582 "frame/ds9parser.Y" {(yyval.integer) = Marker::INCLUDE;;} break; case 144: -#line 582 "frame/ds9parser.Y" +#line 583 "frame/ds9parser.Y" {(yyval.integer) = Marker::SOURCE;;} break; case 145: -#line 585 "frame/ds9parser.Y" +#line 586 "frame/ds9parser.Y" {(yyval.integer) = CallBack::SELECTCB;;} break; case 146: -#line 586 "frame/ds9parser.Y" +#line 587 "frame/ds9parser.Y" {(yyval.integer) = CallBack::UNSELECTCB;;} break; case 147: -#line 587 "frame/ds9parser.Y" +#line 588 "frame/ds9parser.Y" {(yyval.integer) = CallBack::HIGHLITECB;;} break; case 148: -#line 588 "frame/ds9parser.Y" +#line 589 "frame/ds9parser.Y" {(yyval.integer) = CallBack::UNHIGHLITECB;;} break; case 149: -#line 589 "frame/ds9parser.Y" +#line 590 "frame/ds9parser.Y" {(yyval.integer) = CallBack::MOVEBEGINCB;;} break; case 150: -#line 590 "frame/ds9parser.Y" +#line 591 "frame/ds9parser.Y" {(yyval.integer) = CallBack::MOVECB;;} break; case 151: -#line 591 "frame/ds9parser.Y" +#line 592 "frame/ds9parser.Y" {(yyval.integer) = CallBack::MOVEENDCB;;} break; case 152: -#line 592 "frame/ds9parser.Y" +#line 593 "frame/ds9parser.Y" {(yyval.integer) = CallBack::EDITBEGINCB;;} break; case 153: -#line 593 "frame/ds9parser.Y" +#line 594 "frame/ds9parser.Y" {(yyval.integer) = CallBack::EDITCB;;} break; case 154: -#line 594 "frame/ds9parser.Y" +#line 595 "frame/ds9parser.Y" {(yyval.integer) = CallBack::EDITENDCB;;} break; case 155: -#line 595 "frame/ds9parser.Y" +#line 596 "frame/ds9parser.Y" {(yyval.integer) = CallBack::ROTATEBEGINCB;;} break; case 156: -#line 596 "frame/ds9parser.Y" +#line 597 "frame/ds9parser.Y" {(yyval.integer) = CallBack::ROTATECB;;} break; case 157: -#line 597 "frame/ds9parser.Y" +#line 598 "frame/ds9parser.Y" {(yyval.integer) = CallBack::ROTATEENDCB;;} break; case 158: -#line 598 "frame/ds9parser.Y" +#line 599 "frame/ds9parser.Y" {(yyval.integer) = CallBack::DELETECB;;} break; case 159: -#line 599 "frame/ds9parser.Y" +#line 600 "frame/ds9parser.Y" {(yyval.integer) = CallBack::TEXTCB;;} break; case 160: -#line 600 "frame/ds9parser.Y" +#line 601 "frame/ds9parser.Y" {(yyval.integer) = CallBack::COLORCB;;} break; case 161: -#line 601 "frame/ds9parser.Y" +#line 602 "frame/ds9parser.Y" {(yyval.integer) = CallBack::LINEWIDTHCB;;} break; case 162: -#line 602 "frame/ds9parser.Y" +#line 603 "frame/ds9parser.Y" {(yyval.integer) = CallBack::PROPERTYCB;;} break; case 163: -#line 603 "frame/ds9parser.Y" +#line 604 "frame/ds9parser.Y" {(yyval.integer) = CallBack::FONTCB;;} break; case 164: -#line 604 "frame/ds9parser.Y" +#line 605 "frame/ds9parser.Y" {(yyval.integer) = CallBack::KEYCB;;} break; case 165: -#line 605 "frame/ds9parser.Y" +#line 606 "frame/ds9parser.Y" {(yyval.integer) = CallBack::UPDATECB;;} break; case 168: -#line 613 "frame/ds9parser.Y" +#line 614 "frame/ds9parser.Y" { setProps(&globalProps,(yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].integer)); setProps(&localProps,(yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].integer)); @@ -3525,7 +3526,7 @@ yyreduce: break; case 169: -#line 618 "frame/ds9parser.Y" +#line 619 "frame/ds9parser.Y" { strncpy(globalColor,(yyvsp[(3) - (3)].str),16); strncpy(localColor,(yyvsp[(3) - (3)].str),16); @@ -3533,7 +3534,7 @@ yyreduce: break; case 170: -#line 623 "frame/ds9parser.Y" +#line 624 "frame/ds9parser.Y" { globalDash[0] = localDash[0] =(yyvsp[(3) - (4)].integer); globalDash[1] = localDash[1] =(yyvsp[(4) - (4)].integer); @@ -3541,12 +3542,12 @@ yyreduce: break; case 171: -#line 627 "frame/ds9parser.Y" +#line 628 "frame/ds9parser.Y" {globalWidth = localWidth = (yyvsp[(3) - (3)].integer);;} break; case 172: -#line 629 "frame/ds9parser.Y" +#line 630 "frame/ds9parser.Y" { strncpy(globalFont,(yyvsp[(3) - (3)].str),32); strncpy(localFont,(yyvsp[(3) - (3)].str),32); @@ -3554,7 +3555,7 @@ yyreduce: break; case 173: -#line 634 "frame/ds9parser.Y" +#line 635 "frame/ds9parser.Y" { strncpy(globalText,(yyvsp[(3) - (3)].str),80); strncpy(localText,(yyvsp[(3) - (3)].str),80); @@ -3562,7 +3563,7 @@ yyreduce: break; case 174: -#line 639 "frame/ds9parser.Y" +#line 640 "frame/ds9parser.Y" { setProps(&globalProps,Marker::DASH,1); setProps(&localProps,Marker::DASH,1); @@ -3570,7 +3571,7 @@ yyreduce: break; case 175: -#line 644 "frame/ds9parser.Y" +#line 645 "frame/ds9parser.Y" { setProps(&globalProps,Marker::SOURCE,1); setProps(&localProps,Marker::SOURCE,1); @@ -3578,7 +3579,7 @@ yyreduce: break; case 176: -#line 649 "frame/ds9parser.Y" +#line 650 "frame/ds9parser.Y" { setProps(&globalProps,Marker::SOURCE,0); setProps(&localProps,Marker::SOURCE,0); @@ -3586,12 +3587,12 @@ yyreduce: break; case 177: -#line 653 "frame/ds9parser.Y" +#line 654 "frame/ds9parser.Y" {globalPoint = localPoint = (yyvsp[(3) - (3)].integer);;} break; case 178: -#line 655 "frame/ds9parser.Y" +#line 656 "frame/ds9parser.Y" { globalPoint = localPoint = (yyvsp[(3) - (4)].integer); globalPointSize = localPointSize = (yyvsp[(4) - (4)].integer); @@ -3599,14 +3600,14 @@ yyreduce: break; case 179: -#line 660 "frame/ds9parser.Y" +#line 661 "frame/ds9parser.Y" { globalFill = localFill = (yyvsp[(3) - (3)].integer); ;} break; case 180: -#line 664 "frame/ds9parser.Y" +#line 665 "frame/ds9parser.Y" { globalLine1 = localLine1 = (yyvsp[(3) - (4)].integer); globalLine2 = localLine2 = (yyvsp[(4) - (4)].integer); @@ -3614,29 +3615,29 @@ yyreduce: break; case 181: -#line 668 "frame/ds9parser.Y" +#line 669 "frame/ds9parser.Y" {globalVector = localVector = (yyvsp[(3) - (3)].integer);;} break; case 182: -#line 670 "frame/ds9parser.Y" +#line 671 "frame/ds9parser.Y" { globalComposite = localComposite = (yyvsp[(3) - (3)].integer); ;} break; case 183: -#line 673 "frame/ds9parser.Y" +#line 674 "frame/ds9parser.Y" {;} break; case 184: -#line 674 "frame/ds9parser.Y" +#line 675 "frame/ds9parser.Y" {strncpy(globalRulerDistSpec,(yyvsp[(3) - (3)].str),32);;} break; case 185: -#line 676 "frame/ds9parser.Y" +#line 677 "frame/ds9parser.Y" { strncpy(globalCompassNorth,(yyvsp[(4) - (7)].str),80); strncpy(globalCompassEast,(yyvsp[(5) - (7)].str),80); @@ -3648,22 +3649,22 @@ yyreduce: break; case 186: -#line 684 "frame/ds9parser.Y" +#line 685 "frame/ds9parser.Y" {globalTextAngle = localTextAngle = (yyvsp[(3) - (3)].real);;} break; case 187: -#line 685 "frame/ds9parser.Y" +#line 686 "frame/ds9parser.Y" {globalTextRotate = localTextRotate = (yyvsp[(3) - (3)].integer);;} break; case 188: -#line 686 "frame/ds9parser.Y" +#line 687 "frame/ds9parser.Y" {globalWCS = (Coord::CoordSystem)(yyvsp[(3) - (3)].integer);;} break; case 189: -#line 690 "frame/ds9parser.Y" +#line 691 "frame/ds9parser.Y" { globalRulerCoordSystem = localRulerCoordSystem = (Coord::CoordSystem)(yyvsp[(1) - (4)].integer); globalRulerSkyFrame = localRulerSkyFrame = (Coord::SkyFrame)(yyvsp[(2) - (4)].integer); @@ -3673,7 +3674,7 @@ yyreduce: break; case 190: -#line 697 "frame/ds9parser.Y" +#line 698 "frame/ds9parser.Y" { globalRulerCoordSystem = localRulerCoordSystem = (Coord::CoordSystem)(yyvsp[(1) - (2)].integer); globalRulerSkyFrame = localRulerSkyFrame = Coord::FK5; @@ -3683,7 +3684,7 @@ yyreduce: break; case 191: -#line 704 "frame/ds9parser.Y" +#line 705 "frame/ds9parser.Y" { globalRulerCoordSystem = localRulerCoordSystem = (Coord::CoordSystem)(yyvsp[(1) - (2)].integer); globalRulerSkyFrame = localRulerSkyFrame = Coord::FK5; @@ -3693,7 +3694,7 @@ yyreduce: break; case 192: -#line 711 "frame/ds9parser.Y" +#line 712 "frame/ds9parser.Y" { globalRulerCoordSystem = localRulerCoordSystem = Coord::WCS; globalRulerSkyFrame = localRulerSkyFrame = (Coord::SkyFrame)(yyvsp[(1) - (2)].integer); @@ -3703,7 +3704,7 @@ yyreduce: break; case 193: -#line 718 "frame/ds9parser.Y" +#line 719 "frame/ds9parser.Y" { globalRulerCoordSystem = localRulerCoordSystem = Coord::WCS; globalRulerSkyFrame = localRulerSkyFrame = (Coord::SkyFrame)(yyvsp[(1) - (2)].integer); @@ -3713,7 +3714,7 @@ yyreduce: break; case 194: -#line 725 "frame/ds9parser.Y" +#line 726 "frame/ds9parser.Y" { globalRulerCoordSystem = localRulerCoordSystem = Coord::WCS; globalRulerSkyFrame = localRulerSkyFrame = Coord::FK5; @@ -3723,7 +3724,7 @@ yyreduce: break; case 195: -#line 732 "frame/ds9parser.Y" +#line 733 "frame/ds9parser.Y" { globalRulerCoordSystem = localRulerCoordSystem = Coord::WCS; globalRulerSkyFrame = localRulerSkyFrame = Coord::FK5; @@ -3733,7 +3734,7 @@ yyreduce: break; case 196: -#line 739 "frame/ds9parser.Y" +#line 740 "frame/ds9parser.Y" { globalRulerCoordSystem = localRulerCoordSystem = Coord::IMAGE; globalRulerSkyFrame = localRulerSkyFrame = Coord::FK5; @@ -3742,7 +3743,7 @@ yyreduce: break; case 197: -#line 745 "frame/ds9parser.Y" +#line 746 "frame/ds9parser.Y" { globalRulerCoordSystem = localRulerCoordSystem = Coord::IMAGE; globalRulerSkyFrame = localRulerSkyFrame = Coord::FK5; @@ -3752,7 +3753,7 @@ yyreduce: break; case 198: -#line 754 "frame/ds9parser.Y" +#line 755 "frame/ds9parser.Y" { globalCompassCoordSystem = localCompassCoordSystem = (Coord::CoordSystem)(yyvsp[(1) - (2)].integer); globalCompassSkyFrame = localCompassSkyFrame = (Coord::SkyFrame)(yyvsp[(2) - (2)].integer); @@ -3760,7 +3761,7 @@ yyreduce: break; case 199: -#line 759 "frame/ds9parser.Y" +#line 760 "frame/ds9parser.Y" { globalCompassCoordSystem = localCompassCoordSystem = (Coord::CoordSystem)(yyvsp[(1) - (1)].integer); globalCompassSkyFrame = localCompassSkyFrame = Coord::FK5; @@ -3768,7 +3769,7 @@ yyreduce: break; case 200: -#line 764 "frame/ds9parser.Y" +#line 765 "frame/ds9parser.Y" { globalCompassCoordSystem = localCompassCoordSystem = Coord::WCS; globalCompassSkyFrame = localCompassSkyFrame = (Coord::SkyFrame)(yyvsp[(1) - (1)].integer); @@ -3776,7 +3777,7 @@ yyreduce: break; case 201: -#line 769 "frame/ds9parser.Y" +#line 770 "frame/ds9parser.Y" { globalCompassCoordSystem = localCompassCoordSystem = Coord::WCS; globalCompassSkyFrame = localCompassSkyFrame = Coord::FK5; @@ -3784,7 +3785,7 @@ yyreduce: break; case 202: -#line 775 "frame/ds9parser.Y" +#line 776 "frame/ds9parser.Y" { // global properties globalSystem = Coord::PHYSICAL; @@ -3830,17 +3831,17 @@ yyreduce: break; case 205: -#line 823 "frame/ds9parser.Y" +#line 824 "frame/ds9parser.Y" {setProps(&localProps,(yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].integer));;} break; case 206: -#line 824 "frame/ds9parser.Y" +#line 825 "frame/ds9parser.Y" {strncpy(localColor,(yyvsp[(3) - (3)].str),16);;} break; case 207: -#line 826 "frame/ds9parser.Y" +#line 827 "frame/ds9parser.Y" { localDash[0] =(yyvsp[(3) - (4)].integer); localDash[1] =(yyvsp[(4) - (4)].integer); @@ -3848,83 +3849,83 @@ yyreduce: break; case 208: -#line 830 "frame/ds9parser.Y" +#line 831 "frame/ds9parser.Y" {localWidth = (yyvsp[(3) - (3)].integer);;} break; case 209: -#line 831 "frame/ds9parser.Y" +#line 832 "frame/ds9parser.Y" {strncpy(localFont,(yyvsp[(3) - (3)].str),32);;} break; case 210: -#line 832 "frame/ds9parser.Y" +#line 833 "frame/ds9parser.Y" {strncpy(localText,(yyvsp[(3) - (3)].str),80);;} break; case 211: -#line 833 "frame/ds9parser.Y" +#line 834 "frame/ds9parser.Y" {taglist.append(new Tag((yyvsp[(3) - (3)].str)));;} break; case 212: -#line 834 "frame/ds9parser.Y" +#line 835 "frame/ds9parser.Y" {cblist.append( new CallBack(fr->getInterp(),(CallBack::Type)(yyvsp[(3) - (5)].integer),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str)));;} break; case 213: -#line 836 "frame/ds9parser.Y" +#line 837 "frame/ds9parser.Y" {setProps(&localProps,Marker::DASH,1);;} break; case 214: -#line 837 "frame/ds9parser.Y" +#line 838 "frame/ds9parser.Y" {setProps(&localProps,Marker::SOURCE,1);;} break; case 215: -#line 838 "frame/ds9parser.Y" +#line 839 "frame/ds9parser.Y" {setProps(&localProps,Marker::SOURCE,0);;} break; case 216: -#line 840 "frame/ds9parser.Y" +#line 841 "frame/ds9parser.Y" {localPoint = (yyvsp[(3) - (3)].integer);;} break; case 217: -#line 841 "frame/ds9parser.Y" +#line 842 "frame/ds9parser.Y" {localPoint = (yyvsp[(3) - (4)].integer); localPointSize = (yyvsp[(4) - (4)].integer);;} break; case 218: -#line 842 "frame/ds9parser.Y" +#line 843 "frame/ds9parser.Y" {localFill=(yyvsp[(3) - (3)].integer);;} break; case 219: -#line 843 "frame/ds9parser.Y" +#line 844 "frame/ds9parser.Y" {localLine1=(yyvsp[(3) - (4)].integer); localLine2=(yyvsp[(4) - (4)].integer);;} break; case 220: -#line 844 "frame/ds9parser.Y" +#line 845 "frame/ds9parser.Y" {localVector=(yyvsp[(3) - (3)].integer);;} break; case 221: -#line 845 "frame/ds9parser.Y" +#line 846 "frame/ds9parser.Y" {localComposite=(yyvsp[(3) - (3)].integer);;} break; case 223: -#line 847 "frame/ds9parser.Y" +#line 848 "frame/ds9parser.Y" {strncpy(localRulerDistSpec,(yyvsp[(3) - (3)].str),32);;} break; case 224: -#line 849 "frame/ds9parser.Y" +#line 850 "frame/ds9parser.Y" { strncpy(localCompassNorth,(yyvsp[(4) - (7)].str),80); strncpy(localCompassEast,(yyvsp[(5) - (7)].str),80); @@ -3934,17 +3935,17 @@ yyreduce: break; case 225: -#line 855 "frame/ds9parser.Y" +#line 856 "frame/ds9parser.Y" {localTextAngle=(yyvsp[(3) - (3)].real);;} break; case 226: -#line 856 "frame/ds9parser.Y" +#line 857 "frame/ds9parser.Y" {localTextRotate=(yyvsp[(3) - (3)].integer);;} break; case 230: -#line 863 "frame/ds9parser.Y" +#line 864 "frame/ds9parser.Y" { localRulerCoordSystem = (Coord::CoordSystem)(yyvsp[(1) - (4)].integer); localRulerSkyFrame = (Coord::SkyFrame)(yyvsp[(2) - (4)].integer); @@ -3954,7 +3955,7 @@ yyreduce: break; case 231: -#line 870 "frame/ds9parser.Y" +#line 871 "frame/ds9parser.Y" { localRulerCoordSystem = (Coord::CoordSystem)(yyvsp[(1) - (2)].integer); localRulerSkyFrame = Coord::FK5; @@ -3964,7 +3965,7 @@ yyreduce: break; case 232: -#line 877 "frame/ds9parser.Y" +#line 878 "frame/ds9parser.Y" { localRulerCoordSystem = (Coord::CoordSystem)(yyvsp[(1) - (2)].integer); localRulerSkyFrame = Coord::FK5; @@ -3974,7 +3975,7 @@ yyreduce: break; case 233: -#line 884 "frame/ds9parser.Y" +#line 885 "frame/ds9parser.Y" { localRulerCoordSystem = Coord::WCS; localRulerSkyFrame = (Coord::SkyFrame)(yyvsp[(1) - (2)].integer); @@ -3984,7 +3985,7 @@ yyreduce: break; case 234: -#line 891 "frame/ds9parser.Y" +#line 892 "frame/ds9parser.Y" { localRulerCoordSystem = Coord::WCS; localRulerSkyFrame = (Coord::SkyFrame)(yyvsp[(1) - (2)].integer); @@ -3994,7 +3995,7 @@ yyreduce: break; case 235: -#line 898 "frame/ds9parser.Y" +#line 899 "frame/ds9parser.Y" { localRulerCoordSystem = Coord::WCS; localRulerSkyFrame = Coord::FK5; @@ -4004,7 +4005,7 @@ yyreduce: break; case 236: -#line 905 "frame/ds9parser.Y" +#line 906 "frame/ds9parser.Y" { localRulerCoordSystem = Coord::WCS; localRulerSkyFrame = Coord::FK5; @@ -4014,7 +4015,7 @@ yyreduce: break; case 237: -#line 912 "frame/ds9parser.Y" +#line 913 "frame/ds9parser.Y" { localRulerCoordSystem = Coord::IMAGE; localRulerSkyFrame = Coord::FK5; @@ -4024,7 +4025,7 @@ yyreduce: break; case 238: -#line 919 "frame/ds9parser.Y" +#line 920 "frame/ds9parser.Y" { localRulerCoordSystem = Coord::IMAGE; localRulerSkyFrame = Coord::FK5; @@ -4034,7 +4035,7 @@ yyreduce: break; case 239: -#line 928 "frame/ds9parser.Y" +#line 929 "frame/ds9parser.Y" { localCompassCoordSystem = (Coord::CoordSystem)(yyvsp[(1) - (2)].integer); localCompassSkyFrame = (Coord::SkyFrame)(yyvsp[(2) - (2)].integer); @@ -4042,7 +4043,7 @@ yyreduce: break; case 240: -#line 933 "frame/ds9parser.Y" +#line 934 "frame/ds9parser.Y" { localCompassCoordSystem = (Coord::CoordSystem)(yyvsp[(1) - (1)].integer); localCompassSkyFrame = Coord::FK5; @@ -4050,7 +4051,7 @@ yyreduce: break; case 241: -#line 938 "frame/ds9parser.Y" +#line 939 "frame/ds9parser.Y" { localCompassCoordSystem = Coord::WCS; localCompassSkyFrame = (Coord::SkyFrame)(yyvsp[(1) - (1)].integer); @@ -4058,7 +4059,7 @@ yyreduce: break; case 242: -#line 943 "frame/ds9parser.Y" +#line 944 "frame/ds9parser.Y" { localCompassCoordSystem = Coord::WCS; localCompassSkyFrame = Coord::FK5; @@ -4066,52 +4067,52 @@ yyreduce: break; case 243: -#line 949 "frame/ds9parser.Y" +#line 950 "frame/ds9parser.Y" {aNum=0; aAngNum=0;;} break; case 244: -#line 949 "frame/ds9parser.Y" +#line 950 "frame/ds9parser.Y" {localCpanda = 2;;} break; case 245: -#line 950 "frame/ds9parser.Y" +#line 951 "frame/ds9parser.Y" {localCpanda=0;;} break; case 246: -#line 953 "frame/ds9parser.Y" +#line 954 "frame/ds9parser.Y" {aNum=0; aAngNum=0, aAngle=0;;} break; case 247: -#line 954 "frame/ds9parser.Y" +#line 955 "frame/ds9parser.Y" {aAngle=(yyvsp[(9) - (10)].real);localEpanda=2;;} break; case 248: -#line 955 "frame/ds9parser.Y" +#line 956 "frame/ds9parser.Y" {localEpanda=0;;} break; case 249: -#line 958 "frame/ds9parser.Y" +#line 959 "frame/ds9parser.Y" {aNum=0; aAngNum=0, aAngle=0;;} break; case 250: -#line 959 "frame/ds9parser.Y" +#line 960 "frame/ds9parser.Y" {aAngle=(yyvsp[(9) - (10)].real);localBpanda=2;;} break; case 251: -#line 960 "frame/ds9parser.Y" +#line 961 "frame/ds9parser.Y" {localBpanda=0;;} break; case 252: -#line 963 "frame/ds9parser.Y" +#line 964 "frame/ds9parser.Y" { // reset maperr flag maperr = 0; @@ -4164,52 +4165,52 @@ yyreduce: break; case 253: -#line 1014 "frame/ds9parser.Y" +#line 1015 "frame/ds9parser.Y" {(yyval.integer) = Point::CIRCLE;;} break; case 254: -#line 1015 "frame/ds9parser.Y" +#line 1016 "frame/ds9parser.Y" {(yyval.integer) = Point::BOX;;} break; case 255: -#line 1016 "frame/ds9parser.Y" +#line 1017 "frame/ds9parser.Y" {(yyval.integer) = Point::DIAMOND;;} break; case 256: -#line 1017 "frame/ds9parser.Y" +#line 1018 "frame/ds9parser.Y" {(yyval.integer) = Point::CROSS;;} break; case 257: -#line 1018 "frame/ds9parser.Y" +#line 1019 "frame/ds9parser.Y" {(yyval.integer) = Point::EX;;} break; case 258: -#line 1019 "frame/ds9parser.Y" +#line 1020 "frame/ds9parser.Y" {(yyval.integer) = Point::ARROW;;} break; case 259: -#line 1020 "frame/ds9parser.Y" +#line 1021 "frame/ds9parser.Y" {(yyval.integer) = Point::BOXCIRCLE;;} break; case 260: -#line 1023 "frame/ds9parser.Y" +#line 1024 "frame/ds9parser.Y" {setProps(&localProps, Marker::INCLUDE, 1);;} break; case 261: -#line 1024 "frame/ds9parser.Y" +#line 1025 "frame/ds9parser.Y" {setProps(&localProps, Marker::INCLUDE, 0);;} break; case 262: -#line 1028 "frame/ds9parser.Y" +#line 1029 "frame/ds9parser.Y" { fr->createVectCmd(Vector((yyvsp[(3) - (10)].vector)), (yyvsp[(5) - (10)].real),(yyvsp[(7) - (10)].real), @@ -4220,12 +4221,12 @@ yyreduce: break; case 263: -#line 1035 "frame/ds9parser.Y" +#line 1036 "frame/ds9parser.Y" {polylist.deleteAll();;} break; case 264: -#line 1037 "frame/ds9parser.Y" +#line 1038 "frame/ds9parser.Y" { fr->createSegmentCmd(polylist, localColor,localDash,localWidth,localFont, @@ -4234,7 +4235,7 @@ yyreduce: break; case 265: -#line 1043 "frame/ds9parser.Y" +#line 1044 "frame/ds9parser.Y" { fr->createTextCmd(Vector((yyvsp[(3) - (6)].vector)), localTextAngle,localTextRotate, @@ -4244,7 +4245,7 @@ yyreduce: break; case 266: -#line 1050 "frame/ds9parser.Y" +#line 1051 "frame/ds9parser.Y" { fr->createRulerCmd(Vector((yyvsp[(3) - (8)].vector)), Vector((yyvsp[(5) - (8)].vector)), @@ -4256,7 +4257,7 @@ yyreduce: break; case 267: -#line 1059 "frame/ds9parser.Y" +#line 1060 "frame/ds9parser.Y" { fr->createCompassCmd(Vector((yyvsp[(3) - (8)].vector)), (yyvsp[(5) - (8)].real), @@ -4269,7 +4270,7 @@ yyreduce: break; case 268: -#line 1069 "frame/ds9parser.Y" +#line 1070 "frame/ds9parser.Y" { fr->createProjectionCmd(Vector((yyvsp[(3) - (10)].vector)), Vector((yyvsp[(5) - (10)].vector)), @@ -4280,7 +4281,7 @@ yyreduce: break; case 269: -#line 1077 "frame/ds9parser.Y" +#line 1078 "frame/ds9parser.Y" { // backward compatibility fr->createCircleCmd(Vector((yyvsp[(3) - (8)].vector)), @@ -4291,7 +4292,7 @@ yyreduce: break; case 270: -#line 1085 "frame/ds9parser.Y" +#line 1086 "frame/ds9parser.Y" { fr->createCompositeCmd(Vector((yyvsp[(3) - (8)].vector)), (yyvsp[(5) - (8)].real), localComposite, @@ -4301,7 +4302,7 @@ yyreduce: break; case 271: -#line 1094 "frame/ds9parser.Y" +#line 1095 "frame/ds9parser.Y" { fr->createCircleCmd(Vector((yyvsp[(3) - (8)].vector)), (yyvsp[(5) - (8)].real), localFill, @@ -4311,7 +4312,7 @@ yyreduce: break; case 272: -#line 1101 "frame/ds9parser.Y" +#line 1102 "frame/ds9parser.Y" { // backwards compatibility fr->createCircleCmd(Vector((yyvsp[(3) - (8)].vector)), @@ -4322,7 +4323,7 @@ yyreduce: break; case 273: -#line 1109 "frame/ds9parser.Y" +#line 1110 "frame/ds9parser.Y" { // for ellipse annulus aStatus = 1; @@ -4348,7 +4349,7 @@ yyreduce: break; case 274: -#line 1132 "frame/ds9parser.Y" +#line 1133 "frame/ds9parser.Y" { // for box annulus aStatus = 3; @@ -4374,7 +4375,7 @@ yyreduce: break; case 275: -#line 1155 "frame/ds9parser.Y" +#line 1156 "frame/ds9parser.Y" { // backwards compatibility fr->createBoxCmd(Vector((yyvsp[(3) - (10)].vector)), @@ -4386,12 +4387,12 @@ yyreduce: break; case 276: -#line 1163 "frame/ds9parser.Y" +#line 1164 "frame/ds9parser.Y" {polylist.deleteAll();;} break; case 277: -#line 1165 "frame/ds9parser.Y" +#line 1166 "frame/ds9parser.Y" { fr->createPolygonCmd(polylist, localFill, localColor,localDash,localWidth,localFont, @@ -4400,12 +4401,12 @@ yyreduce: break; case 278: -#line 1170 "frame/ds9parser.Y" +#line 1171 "frame/ds9parser.Y" {polylist.deleteAll();;} break; case 279: -#line 1172 "frame/ds9parser.Y" +#line 1173 "frame/ds9parser.Y" { fr->createSegmentCmd(polylist, localColor,localDash,localWidth,localFont, @@ -4414,7 +4415,7 @@ yyreduce: break; case 280: -#line 1179 "frame/ds9parser.Y" +#line 1180 "frame/ds9parser.Y" { fr->createLineCmd(Vector((yyvsp[(3) - (8)].vector)), Vector((yyvsp[(5) - (8)].vector)), @@ -4425,7 +4426,7 @@ yyreduce: break; case 281: -#line 1187 "frame/ds9parser.Y" +#line 1188 "frame/ds9parser.Y" { fr->createVectCmd(Vector((yyvsp[(3) - (10)].vector)), (yyvsp[(5) - (10)].real),(yyvsp[(7) - (10)].real), @@ -4436,7 +4437,7 @@ yyreduce: break; case 282: -#line 1195 "frame/ds9parser.Y" +#line 1196 "frame/ds9parser.Y" { fr->createTextCmd(Vector((yyvsp[(3) - (6)].vector)), localTextAngle,localTextRotate, @@ -4446,12 +4447,12 @@ yyreduce: break; case 283: -#line 1201 "frame/ds9parser.Y" +#line 1202 "frame/ds9parser.Y" {strncpy(localText,(yyvsp[(5) - (6)].str),80);;} break; case 284: -#line 1203 "frame/ds9parser.Y" +#line 1204 "frame/ds9parser.Y" { fr->createTextCmd(Vector((yyvsp[(3) - (9)].vector)), localTextAngle,localTextRotate, @@ -4461,7 +4462,7 @@ yyreduce: break; case 285: -#line 1210 "frame/ds9parser.Y" +#line 1211 "frame/ds9parser.Y" { fr->createPointCmd(Vector((yyvsp[(3) - (6)].vector)), (Point::PointShape)localPoint, localPointSize, @@ -4471,7 +4472,7 @@ yyreduce: break; case 286: -#line 1217 "frame/ds9parser.Y" +#line 1218 "frame/ds9parser.Y" { // backwards compatibility fr->createPointCmd(Vector((yyvsp[(4) - (7)].vector)), Point::CIRCLE, localPointSize, @@ -4481,7 +4482,7 @@ yyreduce: break; case 287: -#line 1224 "frame/ds9parser.Y" +#line 1225 "frame/ds9parser.Y" { // backwards compatibility fr->createPointCmd(Vector((yyvsp[(4) - (7)].vector)), Point::BOX, localPointSize, @@ -4491,7 +4492,7 @@ yyreduce: break; case 288: -#line 1231 "frame/ds9parser.Y" +#line 1232 "frame/ds9parser.Y" { // backwards compatibility fr->createPointCmd(Vector((yyvsp[(4) - (7)].vector)), Point::DIAMOND, localPointSize, @@ -4501,7 +4502,7 @@ yyreduce: break; case 289: -#line 1238 "frame/ds9parser.Y" +#line 1239 "frame/ds9parser.Y" { // backwards compatibility fr->createPointCmd(Vector((yyvsp[(4) - (7)].vector)), Point::CROSS, localPointSize, @@ -4511,7 +4512,7 @@ yyreduce: break; case 290: -#line 1245 "frame/ds9parser.Y" +#line 1246 "frame/ds9parser.Y" { // backwards compatibility fr->createPointCmd(Vector((yyvsp[(4) - (7)].vector)), Point::EX, localPointSize, @@ -4521,7 +4522,7 @@ yyreduce: break; case 291: -#line 1252 "frame/ds9parser.Y" +#line 1253 "frame/ds9parser.Y" { // backwards compatibility fr->createPointCmd(Vector((yyvsp[(4) - (7)].vector)), Point::ARROW, localPointSize, @@ -4531,7 +4532,7 @@ yyreduce: break; case 292: -#line 1259 "frame/ds9parser.Y" +#line 1260 "frame/ds9parser.Y" { // backwards compatibility fr->createPointCmd(Vector((yyvsp[(4) - (7)].vector)), Point::BOXCIRCLE, localPointSize, @@ -4541,7 +4542,7 @@ yyreduce: break; case 293: -#line 1266 "frame/ds9parser.Y" +#line 1267 "frame/ds9parser.Y" { fr->createRulerCmd(Vector((yyvsp[(3) - (8)].vector)), Vector((yyvsp[(5) - (8)].vector)), @@ -4553,7 +4554,7 @@ yyreduce: break; case 294: -#line 1275 "frame/ds9parser.Y" +#line 1276 "frame/ds9parser.Y" { fr->createCompassCmd(Vector((yyvsp[(3) - (8)].vector)), (yyvsp[(5) - (8)].real), @@ -4566,7 +4567,7 @@ yyreduce: break; case 295: -#line 1285 "frame/ds9parser.Y" +#line 1286 "frame/ds9parser.Y" { fr->createProjectionCmd(Vector((yyvsp[(3) - (10)].vector)), Vector((yyvsp[(5) - (10)].vector)), @@ -4577,7 +4578,7 @@ yyreduce: break; case 296: -#line 1293 "frame/ds9parser.Y" +#line 1294 "frame/ds9parser.Y" { fr->createAnnulusCmd(Vector((yyvsp[(3) - (10)].vector)), (yyvsp[(5) - (10)].real),(yyvsp[(7) - (10)].real),1, @@ -4587,7 +4588,7 @@ yyreduce: break; case 297: -#line 1301 "frame/ds9parser.Y" +#line 1302 "frame/ds9parser.Y" { aAnnuli[0] = (yyvsp[(5) - (12)].real); aAnnuli[1] = (yyvsp[(7) - (12)].real); @@ -4599,7 +4600,7 @@ yyreduce: break; case 298: -#line 1311 "frame/ds9parser.Y" +#line 1312 "frame/ds9parser.Y" { fr->createAnnulusCmd(Vector((yyvsp[(3) - (12)].vector)), (yyvsp[(5) - (12)].real),(yyvsp[(7) - (12)].real),(yyvsp[(9) - (12)].integer), @@ -4609,7 +4610,7 @@ yyreduce: break; case 299: -#line 1319 "frame/ds9parser.Y" +#line 1320 "frame/ds9parser.Y" { // prefered syntax fr->createEllipseAnnulusCmd(Vector((yyvsp[(3) - (12)].vector)), @@ -4621,7 +4622,7 @@ yyreduce: break; case 300: -#line 1329 "frame/ds9parser.Y" +#line 1330 "frame/ds9parser.Y" { // prefered syntax fr->createEllipseAnnulusCmd(Vector((yyvsp[(3) - (14)].vector)), @@ -4633,7 +4634,7 @@ yyreduce: break; case 301: -#line 1339 "frame/ds9parser.Y" +#line 1340 "frame/ds9parser.Y" { // prefered syntax aVector[0] = Vector((yyvsp[(5) - (14)].vector)); @@ -4647,7 +4648,7 @@ yyreduce: break; case 302: -#line 1351 "frame/ds9parser.Y" +#line 1352 "frame/ds9parser.Y" { // backwards compatibility // old saoimage syntax @@ -4657,7 +4658,7 @@ yyreduce: break; case 303: -#line 1359 "frame/ds9parser.Y" +#line 1360 "frame/ds9parser.Y" { // prefered syntax fr->createBoxAnnulusCmd(Vector((yyvsp[(3) - (12)].vector)), @@ -4669,7 +4670,7 @@ yyreduce: break; case 304: -#line 1369 "frame/ds9parser.Y" +#line 1370 "frame/ds9parser.Y" { // prefered syntax aVector[0] = Vector((yyvsp[(5) - (14)].vector)); @@ -4683,7 +4684,7 @@ yyreduce: break; case 305: -#line 1381 "frame/ds9parser.Y" +#line 1382 "frame/ds9parser.Y" { // prefered syntax fr->createBoxAnnulusCmd(Vector((yyvsp[(3) - (14)].vector)), @@ -4695,7 +4696,7 @@ yyreduce: break; case 306: -#line 1391 "frame/ds9parser.Y" +#line 1392 "frame/ds9parser.Y" { // backwards compatibility // old saoimage syntax @@ -4705,7 +4706,7 @@ yyreduce: break; case 307: -#line 1400 "frame/ds9parser.Y" +#line 1401 "frame/ds9parser.Y" { switch (localCpanda) { case 0: /* ignore it */ @@ -4729,7 +4730,7 @@ yyreduce: break; case 308: -#line 1422 "frame/ds9parser.Y" +#line 1423 "frame/ds9parser.Y" { switch (localEpanda) { case 0: /* ignore it */ @@ -4755,7 +4756,7 @@ yyreduce: break; case 309: -#line 1446 "frame/ds9parser.Y" +#line 1447 "frame/ds9parser.Y" { switch (localBpanda) { case 0: /* ignore it */ @@ -4781,7 +4782,7 @@ yyreduce: break; case 314: -#line 1476 "frame/ds9parser.Y" +#line 1477 "frame/ds9parser.Y" { fr->createCompositeCmd(Vector((yyvsp[(3) - (8)].vector)), (yyvsp[(5) - (8)].real), localComposite, @@ -4791,12 +4792,12 @@ yyreduce: break; case 317: -#line 1488 "frame/ds9parser.Y" +#line 1489 "frame/ds9parser.Y" {polylist.append(new Vertex((yyvsp[(1) - (1)].vector)));;} break; case 320: -#line 1496 "frame/ds9parser.Y" +#line 1497 "frame/ds9parser.Y" { if (aNum < MAXANNULI) aAnnuli[aNum++] = (yyvsp[(1) - (1)].real); @@ -4804,7 +4805,7 @@ yyreduce: break; case 323: -#line 1507 "frame/ds9parser.Y" +#line 1508 "frame/ds9parser.Y" { if (aAngNum < MAXANGLES) aAngles[aAngNum++] = (yyvsp[(1) - (1)].real); @@ -4812,12 +4813,12 @@ yyreduce: break; case 326: -#line 1517 "frame/ds9parser.Y" +#line 1518 "frame/ds9parser.Y" {aVector[aNum++] = Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real));;} break; case 327: -#line 1521 "frame/ds9parser.Y" +#line 1522 "frame/ds9parser.Y" { // old style annulus switch (aStatus) { @@ -4848,7 +4849,7 @@ yyreduce: /* Line 1267 of yacc.c. */ -#line 4852 "frame/ds9parser.C" +#line 4853 "frame/ds9parser.C" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -5062,7 +5063,7 @@ yyreturn: } -#line 1548 "frame/ds9parser.Y" +#line 1549 "frame/ds9parser.Y" static void setProps(unsigned short* props, unsigned short prop, int value) diff --git a/tksao/frame/ds9parser.H b/tksao/frame/ds9parser.H index e8a28ba..712d969 100644 --- a/tksao/frame/ds9parser.H +++ b/tksao/frame/ds9parser.H @@ -296,7 +296,7 @@ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 141 "frame/ds9parser.Y" +#line 142 "frame/ds9parser.Y" { #define MKBUFSIZE 2048 double real; diff --git a/tksao/frame/ds9parser.Y b/tksao/frame/ds9parser.Y index 2319f3b..5141e2a 100644 --- a/tksao/frame/ds9parser.Y +++ b/tksao/frame/ds9parser.Y @@ -17,6 +17,7 @@ #include <string.h> #include <iostream> +#include "tkutil.h" #include "base.h" #include "fitsimage.h" #include "basemarker.h" diff --git a/tksao/frame/epanda.C b/tksao/frame/epanda.C index 55fa6d2..b65965d 100644 --- a/tksao/frame/epanda.C +++ b/tksao/frame/epanda.C @@ -2,6 +2,7 @@ // Smithsonian Astrophysical Observatory, Cambridge, MA, USA // For conditions of distribution and use, see copyright notice in "copyright" +#include "tkutil.h" #include "epanda.h" #include "fitsimage.h" diff --git a/tksao/frame/fitsimage.C b/tksao/frame/fitsimage.C index e46c90b..0fef69c 100644 --- a/tksao/frame/fitsimage.C +++ b/tksao/frame/fitsimage.C @@ -5,6 +5,7 @@ #include <pthread.h> #include "util.h" +#include "tkutil.h" #include "fitsimage.h" #include "framebase.h" diff --git a/tksao/frame/fitsmap.C b/tksao/frame/fitsmap.C index 9f320ab..591a6a7 100644 --- a/tksao/frame/fitsmap.C +++ b/tksao/frame/fitsmap.C @@ -3,6 +3,7 @@ // For conditions of distribution and use, see copyright notice in "copyright" #include "util.h" +#include "tkutil.h" #include "fitsimage.h" #include "context.h" diff --git a/tksao/frame/fr3dcommand.C b/tksao/frame/fr3dcommand.C index 9d2233c..ca349f3 100644 --- a/tksao/frame/fr3dcommand.C +++ b/tksao/frame/fr3dcommand.C @@ -3,6 +3,7 @@ // For conditions of distribution and use, see copyright notice in "copyright" #include "util.h" +#include "tkutil.h" #include "frame3dbase.h" #include "fitsimage.h" #include "context.h" diff --git a/tksao/frame/frame3d.C b/tksao/frame/frame3d.C index 581659c..2a6af4b 100644 --- a/tksao/frame/frame3d.C +++ b/tksao/frame/frame3d.C @@ -3,6 +3,7 @@ // For conditions of distribution and use, see copyright notice in "copyright" #include "util.h" +#include "tkutil.h" #include "frame3d.h" #include "fitsimage.h" #include "ps.h" diff --git a/tksao/frame/frame3dbase.C b/tksao/frame/frame3dbase.C index d4eacbb..de9fc7b 100644 --- a/tksao/frame/frame3dbase.C +++ b/tksao/frame/frame3dbase.C @@ -5,6 +5,7 @@ #include <tkInt.h> #include "util.h" +#include "tkutil.h" #include "frame3dbase.h" #include "fitsimage.h" #include "marker.h" diff --git a/tksao/frame/frmap.C b/tksao/frame/frmap.C index eb5d23d..7177f3d 100644 --- a/tksao/frame/frmap.C +++ b/tksao/frame/frmap.C @@ -3,6 +3,7 @@ // For conditions of distribution and use, see copyright notice in "copyright" #include "util.h" +#include "tkutil.h" #include "context.h" #include "framebase.h" #include "fitsimage.h" diff --git a/tksao/frame/frmarker.C b/tksao/frame/frmarker.C index 6150960..04440eb 100644 --- a/tksao/frame/frmarker.C +++ b/tksao/frame/frmarker.C @@ -6,6 +6,7 @@ #include "fdstream.hpp" #include "util.h" +#include "tkutil.h" #include "context.h" #include "base.h" #include "fitsimage.h" diff --git a/tksao/frame/frmarkerxml.C b/tksao/frame/frmarkerxml.C index cf52a63..be232fd 100644 --- a/tksao/frame/frmarkerxml.C +++ b/tksao/frame/frmarkerxml.C @@ -7,6 +7,7 @@ #include <libxml/xmlreader.h> #include "util.h" +#include "tkutil.h" #include "context.h" #include "framebase.h" #include "fitsimage.h" diff --git a/tksao/frame/parser.C b/tksao/frame/parser.C index bbaf4c9..60a3019 100644 --- a/tksao/frame/parser.C +++ b/tksao/frame/parser.C @@ -793,6 +793,7 @@ #include <iostream> #include "util.h" +#include "tkutil.h" #include "base.h" #include "frame3d.h" #include "fitsimage.h" @@ -848,7 +849,7 @@ static void setProps(unsigned short* props, unsigned short prop, int value); #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 53 "frame/parser.Y" +#line 54 "frame/parser.Y" { #define FRBUFSIZE 4096 char chr; @@ -860,7 +861,7 @@ typedef union YYSTYPE int dash[2]; } /* Line 193 of yacc.c. */ -#line 864 "frame/parser.C" +#line 865 "frame/parser.C" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -873,7 +874,7 @@ typedef union YYSTYPE /* Line 216 of yacc.c. */ -#line 877 "frame/parser.C" +#line 878 "frame/parser.C" #ifdef short # undef short @@ -1782,133 +1783,133 @@ static const yytype_int16 yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 464, 464, 465, 466, 467, 468, 469, 470, 471, - 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, - 482, 483, 484, 485, 486, 487, 488, 489, 490, 491, - 492, 493, 494, 495, 496, 497, 498, 499, 500, 501, - 502, 503, 504, 505, 506, 507, 508, 509, 510, 511, - 512, 513, 514, 515, 516, 519, 520, 523, 524, 525, - 526, 527, 528, 529, 530, 531, 532, 533, 534, 537, - 539, 540, 541, 542, 544, 545, 546, 547, 550, 551, - 552, 553, 554, 557, 558, 561, 562, 563, 566, 569, - 572, 575, 587, 594, 601, 609, 610, 611, 612, 613, - 616, 617, 618, 619, 620, 621, 622, 623, 624, 625, - 626, 627, 628, 629, 630, 631, 632, 633, 634, 635, - 636, 637, 638, 639, 640, 641, 642, 643, 646, 647, - 650, 651, 652, 653, 654, 655, 658, 659, 660, 661, - 662, 665, 666, 667, 668, 669, 670, 671, 672, 675, - 676, 677, 678, 679, 682, 683, 684, 685, 686, 687, - 688, 689, 692, 693, 694, 697, 698, 699, 700, 703, - 704, 705, 708, 709, 710, 713, 714, 715, 718, 719, - 720, 721, 722, 723, 724, 725, 728, 729, 732, 733, - 734, 735, 736, 737, 740, 741, 742, 745, 746, 747, - 748, 749, 750, 753, 754, 755, 756, 757, 758, 759, - 760, 764, 765, 768, 769, 772, 773, 776, 777, 781, - 782, 783, 784, 785, 786, 787, 788, 791, 792, 795, - 796, 797, 799, 801, 802, 803, 805, 809, 810, 813, - 814, 816, 819, 821, 827, 828, 829, 832, 833, 834, - 837, 838, 839, 840, 841, 842, 843, 849, 850, 853, - 854, 855, 856, 857, 860, 861, 862, 863, 866, 867, - 872, 877, 884, 886, 888, 889, 890, 893, 895, 898, - 899, 902, 903, 904, 905, 906, 909, 911, 913, 918, - 923, 926, 927, 930, 931, 932, 939, 940, 941, 942, - 945, 946, 949, 950, 953, 954, 957, 959, 963, 964, - 967, 969, 970, 971, 972, 975, 976, 978, 979, 980, - 983, 985, 987, 988, 990, 992, 994, 996, 1000, 1003, - 1004, 1005, 1008, 1011, 1012, 1013, 1014, 1015, 1016, 1017, - 1018, 1019, 1020, 1021, 1022, 1023, 1024, 1025, 1026, 1027, - 1028, 1029, 1031, 1032, 1033, 1034, 1035, 1036, 1037, 1038, - 1039, 1040, 1042, 1043, 1044, 1045, 1046, 1047, 1048, 1050, - 1052, 1053, 1056, 1057, 1058, 1059, 1060, 1061, 1062, 1063, - 1066, 1067, 1068, 1071, 1074, 1075, 1077, 1079, 1080, 1081, - 1082, 1083, 1084, 1091, 1092, 1095, 1096, 1097, 1100, 1101, - 1104, 1107, 1108, 1110, 1114, 1115, 1116, 1119, 1123, 1125, - 1126, 1127, 1128, 1129, 1130, 1131, 1132, 1133, 1136, 1137, - 1138, 1141, 1142, 1145, 1147, 1155, 1157, 1159, 1163, 1164, - 1166, 1169, 1172, 1173, 1177, 1179, 1182, 1187, 1188, 1189, - 1193, 1194, 1195, 1198, 1199, 1200, 1203, 1204, 1206, 1207, - 1208, 1209, 1210, 1211, 1212, 1213, 1214, 1215, 1217, 1218, - 1221, 1222, 1225, 1226, 1227, 1228, 1231, 1232, 1235, 1237, - 1240, 1244, 1245, 1246, 1248, 1250, 1254, 1255, 1256, 1259, - 1260, 1261, 1262, 1263, 1264, 1265, 1268, 1271, 1272, 1273, - 1276, 1277, 1278, 1279, 1280, 1281, 1284, 1285, 1286, 1287, - 1288, 1289, 1290, 1293, 1294, 1297, 1298, 1301, 1302, 1305, - 1306, 1309, 1310, 1311, 1314, 1315, 1318, 1319, 1322, 1325, - 1333, 1334, 1337, 1338, 1339, 1340, 1341, 1342, 1343, 1344, - 1345, 1346, 1347, 1348, 1349, 1350, 1351, 1352, 1353, 1356, - 1359, 1360, 1363, 1364, 1365, 1366, 1369, 1370, 1371, 1372, - 1375, 1376, 1377, 1378, 1379, 1380, 1383, 1384, 1385, 1386, - 1387, 1388, 1390, 1391, 1396, 1397, 1400, 1402, 1404, 1407, - 1408, 1409, 1410, 1411, 1412, 1415, 1417, 1419, 1421, 1422, - 1424, 1426, 1428, 1430, 1432, 1435, 1436, 1437, 1438, 1439, - 1440, 1442, 1443, 1444, 1447, 1450, 1452, 1454, 1456, 1458, - 1460, 1462, 1464, 1467, 1469, 1471, 1473, 1474, 1475, 1476, - 1477, 1480, 1481, 1482, 1483, 1484, 1485, 1486, 1488, 1490, - 1491, 1492, 1495, 1496, 1497, 1498, 1499, 1500, 1502, 1503, - 1504, 1507, 1508, 1509, 1510, 1511, 1514, 1517, 1520, 1523, - 1526, 1529, 1532, 1535, 1538, 1543, 1546, 1549, 1552, 1555, - 1558, 1561, 1564, 1567, 1570, 1573, 1578, 1581, 1584, 1587, - 1590, 1593, 1596, 1599, 1602, 1607, 1609, 1611, 1613, 1615, - 1617, 1622, 1624, 1626, 1630, 1633, 1636, 1639, 1642, 1645, - 1648, 1651, 1654, 1657, 1660, 1665, 1666, 1667, 1668, 1669, - 1670, 1671, 1673, 1675, 1676, 1677, 1680, 1681, 1682, 1683, - 1684, 1685, 1687, 1688, 1689, 1692, 1694, 1696, 1697, 1699, - 1701, 1705, 1706, 1709, 1710, 1711, 1714, 1721, 1722, 1723, - 1724, 1725, 1726, 1727, 1730, 1738, 1739, 1740, 1741, 1743, - 1745, 1746, 1746, 1747, 1748, 1749, 1750, 1751, 1752, 1754, - 1755, 1757, 1760, 1763, 1764, 1765, 1768, 1771, 1774, 1775, - 1779, 1782, 1785, 1788, 1792, 1797, 1802, 1804, 1805, 1807, - 1808, 1810, 1812, 1814, 1816, 1817, 1819, 1821, 1825, 1830, - 1832, 1834, 1836, 1838, 1840, 1842, 1844, 1846, 1848, 1850, - 1853, 1854, 1856, 1858, 1859, 1861, 1863, 1864, 1865, 1867, - 1869, 1870, 1871, 1873, 1874, 1875, 1878, 1882, 1885, 1888, - 1892, 1897, 1903, 1904, 1905, 1907, 1908, 1912, 1914, 1915, - 1916, 1919, 1922, 1925, 1927, 1929, 1930, 1935, 1938, 1939, - 1940, 1943, 1947, 1948, 1950, 1951, 1952, 1954, 1955, 1957, - 1958, 1963, 1965, 1966, 1968, 1969, 1970, 1971, 1972, 1973, - 1975, 1977, 1979, 1980, 1982, 1983, 1985, 1987, 1988, 1989, - 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2001, - 2002, 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2012, 2013, - 2014, 2015, 2016, 2017, 2020, 2021, 2022, 2023, 2024, 2025, - 2026, 2027, 2028, 2029, 2030, 2031, 2032, 2033, 2034, 2035, - 2036, 2037, 2038, 2039, 2040, 2043, 2044, 2045, 2046, 2047, - 2048, 2056, 2063, 2072, 2081, 2088, 2095, 2103, 2111, 2118, - 2123, 2128, 2133, 2138, 2143, 2148, 2154, 2164, 2174, 2184, - 2191, 2201, 2211, 2220, 2232, 2245, 2250, 2253, 2255, 2257, - 2262, 2266, 2269, 2271, 2273, 2276, 2277, 2278, 2279, 2280, - 2281, 2282, 2285, 2286, 2287, 2288, 2289, 2290, 2292, 2294, - 2296, 2298, 2300, 2302, 2305, 2306, 2307, 2308, 2310, 2313, - 2314, 2316, 2318, 2319, 2320, 2322, 2325, 2328, 2329, 2331, - 2332, 2333, 2334, 2336, 2337, 2338, 2339, 2340, 2342, 2344, - 2345, 2347, 2350, 2351, 2352, 2354, 2356, 2357, 2358, 2359, - 2361, 2364, 2368, 2369, 2370, 2371, 2374, 2377, 2379, 2380, - 2381, 2382, 2384, 2387, 2388, 2390, 2391, 2392, 2393, 2394, - 2396, 2397, 2399, 2402, 2403, 2404, 2405, 2406, 2408, 2410, - 2411, 2412, 2413, 2415, 2417, 2418, 2419, 2420, 2421, 2422, - 2424, 2425, 2427, 2430, 2431, 2432, 2433, 2436, 2437, 2440, - 2441, 2444, 2445, 2448, 2461, 2462, 2466, 2467, 2471, 2472, - 2475, 2480, 2487, 2489, 2492, 2494, 2497, 2501, 2502, 2503, - 2504, 2505, 2506, 2507, 2511, 2512, 2515, 2516, 2517, 2518, - 2519, 2520, 2521, 2522, 2525, 2526, 2527, 2528, 2529, 2530, - 2531, 2532, 2533, 2534, 2535, 2538, 2539, 2542, 2543, 2543, - 2546, 2547, 2548, 2549, 2552, 2553, 2556, 2557, 2560, 2564, - 2565, 2565, 2568, 2569, 2572, 2575, 2579, 2580, 2581, 2582, - 2583, 2584, 2585, 2586, 2592, 2593, 2594, 2595, 2598, 2600, - 2601, 2606, 2608, 2609, 2610, 2611, 2614, 2615, 2620, 2624, - 2625, 2626, 2629, 2630, 2635, 2636, 2639, 2641, 2642, 2643, - 2648, 2650, 2656, 2657, 2658, 2659, 2662, 2663, 2666, 2668, - 2670, 2671, 2674, 2676, 2677, 2678, 2681, 2682, 2685, 2686, - 2687, 2690, 2691, 2692, 2695, 2696, 2697, 2698, 2699, 2702, - 2703, 2704, 2707, 2708, 2709, 2710, 2711, 2714, 2716, 2718, - 2720, 2723, 2725, 2727, 2730, 2731, 2732, 2733, 2734, 2735, - 2736, 2737, 2738, 2741, 2742, 2743, 2746, 2747, 2748, 2751, - 2752, 2753, 2756, 2757, 2758, 2761, 2762, 2763, 2764, 2767, - 2768, 2769, 2772, 2773, 2774, 2777, 2778, 2779, 2782, 2783, - 2784, 2787, 2789, 2791, 2795, 2799, 2801, 2806, 2809, 2810, - 2811, 2812, 2815, 2816, 2818, 2819, 2821, 2824, 2825, 2826, - 2829, 2830, 2833, 2835, 2836, 2837, 2838, 2841, 2842, 2843, - 2846, 2847, 2848, 2851, 2852, 2857, 2861, 2868, 2869, 2871, - 2876, 2878, 2881, 2882, 2883, 2884, 2886, 2891 + 0, 465, 465, 466, 467, 468, 469, 470, 471, 472, + 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, + 483, 484, 485, 486, 487, 488, 489, 490, 491, 492, + 493, 494, 495, 496, 497, 498, 499, 500, 501, 502, + 503, 504, 505, 506, 507, 508, 509, 510, 511, 512, + 513, 514, 515, 516, 517, 520, 521, 524, 525, 526, + 527, 528, 529, 530, 531, 532, 533, 534, 535, 538, + 540, 541, 542, 543, 545, 546, 547, 548, 551, 552, + 553, 554, 555, 558, 559, 562, 563, 564, 567, 570, + 573, 576, 588, 595, 602, 610, 611, 612, 613, 614, + 617, 618, 619, 620, 621, 622, 623, 624, 625, 626, + 627, 628, 629, 630, 631, 632, 633, 634, 635, 636, + 637, 638, 639, 640, 641, 642, 643, 644, 647, 648, + 651, 652, 653, 654, 655, 656, 659, 660, 661, 662, + 663, 666, 667, 668, 669, 670, 671, 672, 673, 676, + 677, 678, 679, 680, 683, 684, 685, 686, 687, 688, + 689, 690, 693, 694, 695, 698, 699, 700, 701, 704, + 705, 706, 709, 710, 711, 714, 715, 716, 719, 720, + 721, 722, 723, 724, 725, 726, 729, 730, 733, 734, + 735, 736, 737, 738, 741, 742, 743, 746, 747, 748, + 749, 750, 751, 754, 755, 756, 757, 758, 759, 760, + 761, 765, 766, 769, 770, 773, 774, 777, 778, 782, + 783, 784, 785, 786, 787, 788, 789, 792, 793, 796, + 797, 798, 800, 802, 803, 804, 806, 810, 811, 814, + 815, 817, 820, 822, 828, 829, 830, 833, 834, 835, + 838, 839, 840, 841, 842, 843, 844, 850, 851, 854, + 855, 856, 857, 858, 861, 862, 863, 864, 867, 868, + 873, 878, 885, 887, 889, 890, 891, 894, 896, 899, + 900, 903, 904, 905, 906, 907, 910, 912, 914, 919, + 924, 927, 928, 931, 932, 933, 940, 941, 942, 943, + 946, 947, 950, 951, 954, 955, 958, 960, 964, 965, + 968, 970, 971, 972, 973, 976, 977, 979, 980, 981, + 984, 986, 988, 989, 991, 993, 995, 997, 1001, 1004, + 1005, 1006, 1009, 1012, 1013, 1014, 1015, 1016, 1017, 1018, + 1019, 1020, 1021, 1022, 1023, 1024, 1025, 1026, 1027, 1028, + 1029, 1030, 1032, 1033, 1034, 1035, 1036, 1037, 1038, 1039, + 1040, 1041, 1043, 1044, 1045, 1046, 1047, 1048, 1049, 1051, + 1053, 1054, 1057, 1058, 1059, 1060, 1061, 1062, 1063, 1064, + 1067, 1068, 1069, 1072, 1075, 1076, 1078, 1080, 1081, 1082, + 1083, 1084, 1085, 1092, 1093, 1096, 1097, 1098, 1101, 1102, + 1105, 1108, 1109, 1111, 1115, 1116, 1117, 1120, 1124, 1126, + 1127, 1128, 1129, 1130, 1131, 1132, 1133, 1134, 1137, 1138, + 1139, 1142, 1143, 1146, 1148, 1156, 1158, 1160, 1164, 1165, + 1167, 1170, 1173, 1174, 1178, 1180, 1183, 1188, 1189, 1190, + 1194, 1195, 1196, 1199, 1200, 1201, 1204, 1205, 1207, 1208, + 1209, 1210, 1211, 1212, 1213, 1214, 1215, 1216, 1218, 1219, + 1222, 1223, 1226, 1227, 1228, 1229, 1232, 1233, 1236, 1238, + 1241, 1245, 1246, 1247, 1249, 1251, 1255, 1256, 1257, 1260, + 1261, 1262, 1263, 1264, 1265, 1266, 1269, 1272, 1273, 1274, + 1277, 1278, 1279, 1280, 1281, 1282, 1285, 1286, 1287, 1288, + 1289, 1290, 1291, 1294, 1295, 1298, 1299, 1302, 1303, 1306, + 1307, 1310, 1311, 1312, 1315, 1316, 1319, 1320, 1323, 1326, + 1334, 1335, 1338, 1339, 1340, 1341, 1342, 1343, 1344, 1345, + 1346, 1347, 1348, 1349, 1350, 1351, 1352, 1353, 1354, 1357, + 1360, 1361, 1364, 1365, 1366, 1367, 1370, 1371, 1372, 1373, + 1376, 1377, 1378, 1379, 1380, 1381, 1384, 1385, 1386, 1387, + 1388, 1389, 1391, 1392, 1397, 1398, 1401, 1403, 1405, 1408, + 1409, 1410, 1411, 1412, 1413, 1416, 1418, 1420, 1422, 1423, + 1425, 1427, 1429, 1431, 1433, 1436, 1437, 1438, 1439, 1440, + 1441, 1443, 1444, 1445, 1448, 1451, 1453, 1455, 1457, 1459, + 1461, 1463, 1465, 1468, 1470, 1472, 1474, 1475, 1476, 1477, + 1478, 1481, 1482, 1483, 1484, 1485, 1486, 1487, 1489, 1491, + 1492, 1493, 1496, 1497, 1498, 1499, 1500, 1501, 1503, 1504, + 1505, 1508, 1509, 1510, 1511, 1512, 1515, 1518, 1521, 1524, + 1527, 1530, 1533, 1536, 1539, 1544, 1547, 1550, 1553, 1556, + 1559, 1562, 1565, 1568, 1571, 1574, 1579, 1582, 1585, 1588, + 1591, 1594, 1597, 1600, 1603, 1608, 1610, 1612, 1614, 1616, + 1618, 1623, 1625, 1627, 1631, 1634, 1637, 1640, 1643, 1646, + 1649, 1652, 1655, 1658, 1661, 1666, 1667, 1668, 1669, 1670, + 1671, 1672, 1674, 1676, 1677, 1678, 1681, 1682, 1683, 1684, + 1685, 1686, 1688, 1689, 1690, 1693, 1695, 1697, 1698, 1700, + 1702, 1706, 1707, 1710, 1711, 1712, 1715, 1722, 1723, 1724, + 1725, 1726, 1727, 1728, 1731, 1739, 1740, 1741, 1742, 1744, + 1746, 1747, 1747, 1748, 1749, 1750, 1751, 1752, 1753, 1755, + 1756, 1758, 1761, 1764, 1765, 1766, 1769, 1772, 1775, 1776, + 1780, 1783, 1786, 1789, 1793, 1798, 1803, 1805, 1806, 1808, + 1809, 1811, 1813, 1815, 1817, 1818, 1820, 1822, 1826, 1831, + 1833, 1835, 1837, 1839, 1841, 1843, 1845, 1847, 1849, 1851, + 1854, 1855, 1857, 1859, 1860, 1862, 1864, 1865, 1866, 1868, + 1870, 1871, 1872, 1874, 1875, 1876, 1879, 1883, 1886, 1889, + 1893, 1898, 1904, 1905, 1906, 1908, 1909, 1913, 1915, 1916, + 1917, 1920, 1923, 1926, 1928, 1930, 1931, 1936, 1939, 1940, + 1941, 1944, 1948, 1949, 1951, 1952, 1953, 1955, 1956, 1958, + 1959, 1964, 1966, 1967, 1969, 1970, 1971, 1972, 1973, 1974, + 1976, 1978, 1980, 1981, 1983, 1984, 1986, 1988, 1989, 1990, + 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2002, + 2003, 2004, 2005, 2007, 2008, 2009, 2010, 2011, 2013, 2014, + 2015, 2016, 2017, 2018, 2021, 2022, 2023, 2024, 2025, 2026, + 2027, 2028, 2029, 2030, 2031, 2032, 2033, 2034, 2035, 2036, + 2037, 2038, 2039, 2040, 2041, 2044, 2045, 2046, 2047, 2048, + 2049, 2057, 2064, 2073, 2082, 2089, 2096, 2104, 2112, 2119, + 2124, 2129, 2134, 2139, 2144, 2149, 2155, 2165, 2175, 2185, + 2192, 2202, 2212, 2221, 2233, 2246, 2251, 2254, 2256, 2258, + 2263, 2267, 2270, 2272, 2274, 2277, 2278, 2279, 2280, 2281, + 2282, 2283, 2286, 2287, 2288, 2289, 2290, 2291, 2293, 2295, + 2297, 2299, 2301, 2303, 2306, 2307, 2308, 2309, 2311, 2314, + 2315, 2317, 2319, 2320, 2321, 2323, 2326, 2329, 2330, 2332, + 2333, 2334, 2335, 2337, 2338, 2339, 2340, 2341, 2343, 2345, + 2346, 2348, 2351, 2352, 2353, 2355, 2357, 2358, 2359, 2360, + 2362, 2365, 2369, 2370, 2371, 2372, 2375, 2378, 2380, 2381, + 2382, 2383, 2385, 2388, 2389, 2391, 2392, 2393, 2394, 2395, + 2397, 2398, 2400, 2403, 2404, 2405, 2406, 2407, 2409, 2411, + 2412, 2413, 2414, 2416, 2418, 2419, 2420, 2421, 2422, 2423, + 2425, 2426, 2428, 2431, 2432, 2433, 2434, 2437, 2438, 2441, + 2442, 2445, 2446, 2449, 2462, 2463, 2467, 2468, 2472, 2473, + 2476, 2481, 2488, 2490, 2493, 2495, 2498, 2502, 2503, 2504, + 2505, 2506, 2507, 2508, 2512, 2513, 2516, 2517, 2518, 2519, + 2520, 2521, 2522, 2523, 2526, 2527, 2528, 2529, 2530, 2531, + 2532, 2533, 2534, 2535, 2536, 2539, 2540, 2543, 2544, 2544, + 2547, 2548, 2549, 2550, 2553, 2554, 2557, 2558, 2561, 2565, + 2566, 2566, 2569, 2570, 2573, 2576, 2580, 2581, 2582, 2583, + 2584, 2585, 2586, 2587, 2593, 2594, 2595, 2596, 2599, 2601, + 2602, 2607, 2609, 2610, 2611, 2612, 2615, 2616, 2621, 2625, + 2626, 2627, 2630, 2631, 2636, 2637, 2640, 2642, 2643, 2644, + 2649, 2651, 2657, 2658, 2659, 2660, 2663, 2664, 2667, 2669, + 2671, 2672, 2675, 2677, 2678, 2679, 2682, 2683, 2686, 2687, + 2688, 2691, 2692, 2693, 2696, 2697, 2698, 2699, 2700, 2703, + 2704, 2705, 2708, 2709, 2710, 2711, 2712, 2715, 2717, 2719, + 2721, 2724, 2726, 2728, 2731, 2732, 2733, 2734, 2735, 2736, + 2737, 2738, 2739, 2742, 2743, 2744, 2747, 2748, 2749, 2752, + 2753, 2754, 2757, 2758, 2759, 2762, 2763, 2764, 2765, 2768, + 2769, 2770, 2773, 2774, 2775, 2778, 2779, 2780, 2783, 2784, + 2785, 2788, 2790, 2792, 2796, 2800, 2802, 2807, 2810, 2811, + 2812, 2813, 2816, 2817, 2819, 2820, 2822, 2825, 2826, 2827, + 2830, 2831, 2834, 2836, 2837, 2838, 2839, 2842, 2843, 2844, + 2847, 2848, 2849, 2852, 2853, 2858, 2862, 2869, 2870, 2872, + 2877, 2879, 2882, 2883, 2884, 2885, 2887, 2892 }; #endif @@ -5133,267 +5134,267 @@ yyreduce: switch (yyn) { case 4: -#line 466 "frame/parser.Y" +#line 467 "frame/parser.Y" {fr->bgColorCmd((yyvsp[(3) - (3)].str));;} break; case 5: -#line 467 "frame/parser.Y" +#line 468 "frame/parser.Y" {fr->bgColorCmd("gray");;} break; case 7: -#line 469 "frame/parser.Y" +#line 470 "frame/parser.Y" {fr->centerCmd();;} break; case 8: -#line 470 "frame/parser.Y" +#line 471 "frame/parser.Y" {fr->clearCmd();;} break; case 10: -#line 472 "frame/parser.Y" +#line 473 "frame/parser.Y" {fr->colorbarTagCmd((yyvsp[(3) - (3)].str));;} break; case 17: -#line 479 "frame/parser.Y" +#line 480 "frame/parser.Y" {fr->DATASECCmd((yyvsp[(2) - (2)].integer));;} break; case 22: -#line 484 "frame/parser.Y" +#line 485 "frame/parser.Y" {fr->hideCmd();;} break; case 23: -#line 485 "frame/parser.Y" +#line 486 "frame/parser.Y" {fr->highliteCmd((yyvsp[(2) - (2)].integer));;} break; case 25: -#line 487 "frame/parser.Y" +#line 488 "frame/parser.Y" {fr->irafAlignCmd((yyvsp[(3) - (3)].integer));;} break; case 32: -#line 494 "frame/parser.Y" +#line 495 "frame/parser.Y" {fr->nanColorCmd((yyvsp[(3) - (3)].str));;} break; case 36: -#line 498 "frame/parser.Y" +#line 499 "frame/parser.Y" {fr->queryCursorCmd();;} break; case 39: -#line 501 "frame/parser.Y" +#line 502 "frame/parser.Y" {fr->resetCmd();;} break; case 44: -#line 506 "frame/parser.Y" +#line 507 "frame/parser.Y" {fr->showCmd();;} break; case 46: -#line 508 "frame/parser.Y" +#line 509 "frame/parser.Y" {fr->threadsCmd((yyvsp[(2) - (2)].integer));;} break; case 48: -#line 510 "frame/parser.Y" +#line 511 "frame/parser.Y" {fr->unloadFitsCmd();;} break; case 50: -#line 512 "frame/parser.Y" +#line 513 "frame/parser.Y" {fr->msg("Frame 1.0");;} break; case 55: -#line 519 "frame/parser.Y" +#line 520 "frame/parser.Y" {(yyval.real)=(yyvsp[(1) - (1)].real);;} break; case 56: -#line 520 "frame/parser.Y" +#line 521 "frame/parser.Y" {(yyval.real)=(yyvsp[(1) - (1)].integer);;} break; case 57: -#line 523 "frame/parser.Y" +#line 524 "frame/parser.Y" {yydebug=1;;} break; case 58: -#line 524 "frame/parser.Y" +#line 525 "frame/parser.Y" {yydebug=0;;} break; case 59: -#line 525 "frame/parser.Y" +#line 526 "frame/parser.Y" {DebugMosaic=(yyvsp[(2) - (2)].integer);;} break; case 60: -#line 526 "frame/parser.Y" +#line 527 "frame/parser.Y" {yydebug=(yyvsp[(2) - (2)].integer);;} break; case 61: -#line 527 "frame/parser.Y" +#line 528 "frame/parser.Y" {DebugPerf=(yyvsp[(2) - (2)].integer);;} break; case 62: -#line 528 "frame/parser.Y" +#line 529 "frame/parser.Y" {DebugWCS=(yyvsp[(2) - (2)].integer);;} break; case 63: -#line 529 "frame/parser.Y" +#line 530 "frame/parser.Y" {DebugBin=(yyvsp[(2) - (2)].integer);;} break; case 64: -#line 530 "frame/parser.Y" +#line 531 "frame/parser.Y" {DebugBlock=(yyvsp[(2) - (2)].integer);;} break; case 65: -#line 531 "frame/parser.Y" +#line 532 "frame/parser.Y" {DebugCompress=(yyvsp[(2) - (2)].integer);;} break; case 66: -#line 532 "frame/parser.Y" +#line 533 "frame/parser.Y" {DebugCrop=(yyvsp[(2) - (2)].integer);;} break; case 67: -#line 533 "frame/parser.Y" +#line 534 "frame/parser.Y" {DebugGZ=(yyvsp[(2) - (2)].integer);;} break; case 68: -#line 534 "frame/parser.Y" +#line 535 "frame/parser.Y" {DebugRGB=(yyvsp[(2) - (2)].integer);;} break; case 69: -#line 537 "frame/parser.Y" +#line 538 "frame/parser.Y" {(yyval.integer)=((yyvsp[(1) - (1)].integer) ? 1 : 0);;} break; case 70: -#line 539 "frame/parser.Y" +#line 540 "frame/parser.Y" {(yyval.integer)=1;;} break; case 71: -#line 540 "frame/parser.Y" +#line 541 "frame/parser.Y" {(yyval.integer)=1;;} break; case 72: -#line 541 "frame/parser.Y" +#line 542 "frame/parser.Y" {(yyval.integer)=1;;} break; case 73: -#line 542 "frame/parser.Y" +#line 543 "frame/parser.Y" {(yyval.integer)=1;;} break; case 74: -#line 544 "frame/parser.Y" +#line 545 "frame/parser.Y" {(yyval.integer)=0;;} break; case 75: -#line 545 "frame/parser.Y" +#line 546 "frame/parser.Y" {(yyval.integer)=0;;} break; case 76: -#line 546 "frame/parser.Y" +#line 547 "frame/parser.Y" {(yyval.integer)=0;;} break; case 77: -#line 547 "frame/parser.Y" +#line 548 "frame/parser.Y" {(yyval.integer)=0;;} break; case 78: -#line 550 "frame/parser.Y" +#line 551 "frame/parser.Y" {(yyval.integer) = Base::ROOTBASE;;} break; case 79: -#line 551 "frame/parser.Y" +#line 552 "frame/parser.Y" {(yyval.integer) = Base::ROOTBASE;;} break; case 80: -#line 552 "frame/parser.Y" +#line 553 "frame/parser.Y" {(yyval.integer) = Base::FULLBASE;;} break; case 81: -#line 553 "frame/parser.Y" +#line 554 "frame/parser.Y" {(yyval.integer) = Base::ROOT;;} break; case 82: -#line 554 "frame/parser.Y" +#line 555 "frame/parser.Y" {(yyval.integer) = Base::FULL;;} break; case 83: -#line 557 "frame/parser.Y" +#line 558 "frame/parser.Y" {(yyval.real) = 0;;} break; case 84: -#line 558 "frame/parser.Y" +#line 559 "frame/parser.Y" {(yyval.real) = (yyvsp[(1) - (1)].real);;} break; case 85: -#line 561 "frame/parser.Y" +#line 562 "frame/parser.Y" {(yyval.real) = zeroTWOPI(degToRad((yyvsp[(1) - (1)].real)));;} break; case 86: -#line 562 "frame/parser.Y" +#line 563 "frame/parser.Y" {(yyval.real) = zeroTWOPI(degToRad((yyvsp[(1) - (1)].real)));;} break; case 87: -#line 563 "frame/parser.Y" +#line 564 "frame/parser.Y" {(yyval.real)=(yyvsp[(1) - (1)].real);;} break; case 88: -#line 566 "frame/parser.Y" +#line 567 "frame/parser.Y" {(yyval.real) = parseSEXStr((yyvsp[(1) - (1)].str));;} break; case 89: -#line 569 "frame/parser.Y" +#line 570 "frame/parser.Y" {(yyval.real) = parseHMSStr((yyvsp[(1) - (1)].str));;} break; case 90: -#line 572 "frame/parser.Y" +#line 573 "frame/parser.Y" {(yyval.real) = parseDMSStr((yyvsp[(1) - (1)].str));;} break; case 91: -#line 576 "frame/parser.Y" +#line 577 "frame/parser.Y" { Vector r; if (currentSky == Coord::GALACTIC || currentSky == Coord::ECLIPTIC) @@ -5408,7 +5409,7 @@ yyreduce: break; case 92: -#line 588 "frame/parser.Y" +#line 589 "frame/parser.Y" { Vector r = Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)); (yyval.vector)[0] = r[0]; @@ -5418,7 +5419,7 @@ yyreduce: break; case 93: -#line 595 "frame/parser.Y" +#line 596 "frame/parser.Y" { Vector r = Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)); (yyval.vector)[0] = r[0]; @@ -5428,7 +5429,7 @@ yyreduce: break; case 94: -#line 602 "frame/parser.Y" +#line 603 "frame/parser.Y" { (yyval.vector)[0] = (yyvsp[(1) - (2)].real); (yyval.vector)[1] = (yyvsp[(2) - (2)].real); @@ -5437,815 +5438,815 @@ yyreduce: break; case 95: -#line 609 "frame/parser.Y" +#line 610 "frame/parser.Y" {(yyval.integer) = currentCoord = Coord::IMAGE;;} break; case 96: -#line 610 "frame/parser.Y" +#line 611 "frame/parser.Y" {(yyval.integer) = currentCoord = Coord::PHYSICAL;;} break; case 97: -#line 611 "frame/parser.Y" +#line 612 "frame/parser.Y" {(yyval.integer) = currentCoord = Coord::DETECTOR;;} break; case 98: -#line 612 "frame/parser.Y" +#line 613 "frame/parser.Y" {(yyval.integer) = currentCoord = Coord::AMPLIFIER;;} break; case 99: -#line 613 "frame/parser.Y" +#line 614 "frame/parser.Y" {(yyval.integer) = (Coord::CoordSystem)(yyvsp[(1) - (1)].integer);;} break; case 100: -#line 616 "frame/parser.Y" +#line 617 "frame/parser.Y" {(yyval.integer) = currentCoord = Coord::WCS;;} break; case 101: -#line 617 "frame/parser.Y" +#line 618 "frame/parser.Y" {(yyval.integer) = currentCoord = Coord::WCSA;;} break; case 102: -#line 618 "frame/parser.Y" +#line 619 "frame/parser.Y" {(yyval.integer) = currentCoord = Coord::WCSB;;} break; case 103: -#line 619 "frame/parser.Y" +#line 620 "frame/parser.Y" {(yyval.integer) = currentCoord = Coord::WCSC;;} break; case 104: -#line 620 "frame/parser.Y" +#line 621 "frame/parser.Y" {(yyval.integer) = currentCoord = Coord::WCSD;;} break; case 105: -#line 621 "frame/parser.Y" +#line 622 "frame/parser.Y" {(yyval.integer) = currentCoord = Coord::WCSE;;} break; case 106: -#line 622 "frame/parser.Y" +#line 623 "frame/parser.Y" {(yyval.integer) = currentCoord = Coord::WCSF;;} break; case 107: -#line 623 "frame/parser.Y" +#line 624 "frame/parser.Y" {(yyval.integer) = currentCoord = Coord::WCSG;;} break; case 108: -#line 624 "frame/parser.Y" +#line 625 "frame/parser.Y" {(yyval.integer) = currentCoord = Coord::WCSH;;} break; case 109: -#line 625 "frame/parser.Y" +#line 626 "frame/parser.Y" {(yyval.integer) = currentCoord = Coord::WCSI;;} break; case 110: -#line 626 "frame/parser.Y" +#line 627 "frame/parser.Y" {(yyval.integer) = currentCoord = Coord::WCSJ;;} break; case 111: -#line 627 "frame/parser.Y" +#line 628 "frame/parser.Y" {(yyval.integer) = currentCoord = Coord::WCSK;;} break; case 112: -#line 628 "frame/parser.Y" +#line 629 "frame/parser.Y" {(yyval.integer) = currentCoord = Coord::WCSL;;} break; case 113: -#line 629 "frame/parser.Y" +#line 630 "frame/parser.Y" {(yyval.integer) = currentCoord = Coord::WCSM;;} break; case 114: -#line 630 "frame/parser.Y" +#line 631 "frame/parser.Y" {(yyval.integer) = currentCoord = Coord::WCSN;;} break; case 115: -#line 631 "frame/parser.Y" +#line 632 "frame/parser.Y" {(yyval.integer) = currentCoord = Coord::WCSO;;} break; case 116: -#line 632 "frame/parser.Y" +#line 633 "frame/parser.Y" {(yyval.integer) = currentCoord = Coord::WCSP;;} break; case 117: -#line 633 "frame/parser.Y" +#line 634 "frame/parser.Y" {(yyval.integer) = currentCoord = Coord::WCSQ;;} break; case 118: -#line 634 "frame/parser.Y" +#line 635 "frame/parser.Y" {(yyval.integer) = currentCoord = Coord::WCSR;;} break; case 119: -#line 635 "frame/parser.Y" +#line 636 "frame/parser.Y" {(yyval.integer) = currentCoord = Coord::WCSS;;} break; case 120: -#line 636 "frame/parser.Y" +#line 637 "frame/parser.Y" {(yyval.integer) = currentCoord = Coord::WCST;;} break; case 121: -#line 637 "frame/parser.Y" +#line 638 "frame/parser.Y" {(yyval.integer) = currentCoord = Coord::WCSU;;} break; case 122: -#line 638 "frame/parser.Y" +#line 639 "frame/parser.Y" {(yyval.integer) = currentCoord = Coord::WCSV;;} break; case 123: -#line 639 "frame/parser.Y" +#line 640 "frame/parser.Y" {(yyval.integer) = currentCoord = Coord::WCSW;;} break; case 124: -#line 640 "frame/parser.Y" +#line 641 "frame/parser.Y" {(yyval.integer) = currentCoord = Coord::WCSX;;} break; case 125: -#line 641 "frame/parser.Y" +#line 642 "frame/parser.Y" {(yyval.integer) = currentCoord = Coord::WCSY;;} break; case 126: -#line 642 "frame/parser.Y" +#line 643 "frame/parser.Y" {(yyval.integer) = currentCoord = Coord::WCSZ;;} break; case 127: -#line 643 "frame/parser.Y" +#line 644 "frame/parser.Y" {(yyval.integer) = currentCoord = Coord::WCS0;;} break; case 128: -#line 646 "frame/parser.Y" +#line 647 "frame/parser.Y" {(yyval.integer) = Coord::CANVAS;;} break; case 129: -#line 647 "frame/parser.Y" +#line 648 "frame/parser.Y" {(yyval.integer) = Coord::PANNER;;} break; case 130: -#line 650 "frame/parser.Y" +#line 651 "frame/parser.Y" {(yyval.integer) = FitsMask::NONZERO;;} break; case 131: -#line 651 "frame/parser.Y" +#line 652 "frame/parser.Y" {(yyval.integer) = FitsMask::ZERO;;} break; case 132: -#line 652 "frame/parser.Y" +#line 653 "frame/parser.Y" {(yyval.integer) = FitsMask::NONZERO;;} break; case 133: -#line 653 "frame/parser.Y" +#line 654 "frame/parser.Y" {(yyval.integer) = FitsMask::NaN;;} break; case 134: -#line 654 "frame/parser.Y" +#line 655 "frame/parser.Y" {(yyval.integer) = FitsMask::NONNaN;;} break; case 135: -#line 655 "frame/parser.Y" +#line 656 "frame/parser.Y" {(yyval.integer) = FitsMask::RANGE;;} break; case 136: -#line 658 "frame/parser.Y" +#line 659 "frame/parser.Y" {(yyval.integer) = FitsMask::SOURCE;;} break; case 137: -#line 659 "frame/parser.Y" +#line 660 "frame/parser.Y" {(yyval.integer) = FitsMask::SOURCE;;} break; case 138: -#line 660 "frame/parser.Y" +#line 661 "frame/parser.Y" {(yyval.integer) = FitsMask::SCREEN;;} break; case 139: -#line 661 "frame/parser.Y" +#line 662 "frame/parser.Y" {(yyval.integer) = FitsMask::DARKEN;;} break; case 140: -#line 662 "frame/parser.Y" +#line 663 "frame/parser.Y" {(yyval.integer) = FitsMask::LIGHTEN;;} break; case 141: -#line 665 "frame/parser.Y" +#line 666 "frame/parser.Y" {(yyval.integer) = FrScale::LINEARSCALE;;} break; case 142: -#line 666 "frame/parser.Y" +#line 667 "frame/parser.Y" {(yyval.integer) = FrScale::LOGSCALE;;} break; case 143: -#line 667 "frame/parser.Y" +#line 668 "frame/parser.Y" {(yyval.integer) = FrScale::POWSCALE;;} break; case 144: -#line 668 "frame/parser.Y" +#line 669 "frame/parser.Y" {(yyval.integer) = FrScale::SQRTSCALE;;} break; case 145: -#line 669 "frame/parser.Y" +#line 670 "frame/parser.Y" {(yyval.integer) = FrScale::SQUAREDSCALE;;} break; case 146: -#line 670 "frame/parser.Y" +#line 671 "frame/parser.Y" {(yyval.integer) = FrScale::ASINHSCALE;;} break; case 147: -#line 671 "frame/parser.Y" +#line 672 "frame/parser.Y" {(yyval.integer) = FrScale::SINHSCALE;;} break; case 148: -#line 672 "frame/parser.Y" +#line 673 "frame/parser.Y" {(yyval.integer) = FrScale::HISTEQUSCALE;;} break; case 149: -#line 675 "frame/parser.Y" +#line 676 "frame/parser.Y" {(yyval.integer)=FrScale::SCAN;;} break; case 150: -#line 676 "frame/parser.Y" +#line 677 "frame/parser.Y" {(yyval.integer)=FrScale::SCAN;;} break; case 151: -#line 677 "frame/parser.Y" +#line 678 "frame/parser.Y" {(yyval.integer)=FrScale::SAMPLE;;} break; case 152: -#line 678 "frame/parser.Y" +#line 679 "frame/parser.Y" {(yyval.integer)=FrScale::DATAMIN;;} break; case 153: -#line 679 "frame/parser.Y" +#line 680 "frame/parser.Y" {(yyval.integer)=FrScale::IRAFMIN;;} break; case 154: -#line 682 "frame/parser.Y" +#line 683 "frame/parser.Y" {(yyval.integer) = currentSky = Coord::FK5;;} break; case 155: -#line 683 "frame/parser.Y" +#line 684 "frame/parser.Y" {(yyval.integer) = currentSky = Coord::FK4;;} break; case 156: -#line 684 "frame/parser.Y" +#line 685 "frame/parser.Y" {(yyval.integer) = currentSky = Coord::FK4;;} break; case 157: -#line 685 "frame/parser.Y" +#line 686 "frame/parser.Y" {(yyval.integer) = currentSky = Coord::FK5;;} break; case 158: -#line 686 "frame/parser.Y" +#line 687 "frame/parser.Y" {(yyval.integer) = currentSky = Coord::FK5;;} break; case 159: -#line 687 "frame/parser.Y" +#line 688 "frame/parser.Y" {(yyval.integer) = currentSky = Coord::ICRS;;} break; case 160: -#line 688 "frame/parser.Y" +#line 689 "frame/parser.Y" {(yyval.integer) = currentSky = Coord::GALACTIC;;} break; case 161: -#line 689 "frame/parser.Y" +#line 690 "frame/parser.Y" {(yyval.integer) = currentSky = Coord::ECLIPTIC;;} break; case 162: -#line 692 "frame/parser.Y" +#line 693 "frame/parser.Y" {(yyval.integer)=Coord::DEGREES;;} break; case 163: -#line 693 "frame/parser.Y" +#line 694 "frame/parser.Y" {(yyval.integer)=Coord::DEGREES;;} break; case 164: -#line 694 "frame/parser.Y" +#line 695 "frame/parser.Y" {(yyval.integer)=Coord::SEXAGESIMAL;;} break; case 165: -#line 697 "frame/parser.Y" +#line 698 "frame/parser.Y" {(yyval.integer)=Coord::DEGREE;;} break; case 166: -#line 698 "frame/parser.Y" +#line 699 "frame/parser.Y" {(yyval.integer)=Coord::DEGREE;;} break; case 167: -#line 699 "frame/parser.Y" +#line 700 "frame/parser.Y" {(yyval.integer)=Coord::ARCMIN;;} break; case 168: -#line 700 "frame/parser.Y" +#line 701 "frame/parser.Y" {(yyval.integer)=Coord::ARCSEC;;} break; case 169: -#line 703 "frame/parser.Y" +#line 704 "frame/parser.Y" {(yyval.integer) = Base::SHMID;;} break; case 170: -#line 704 "frame/parser.Y" +#line 705 "frame/parser.Y" {(yyval.integer) = Base::SHMID;;} break; case 171: -#line 705 "frame/parser.Y" +#line 706 "frame/parser.Y" {(yyval.integer) = Base::KEY;;} break; case 172: -#line 708 "frame/parser.Y" +#line 709 "frame/parser.Y" {;} break; case 173: -#line 709 "frame/parser.Y" +#line 710 "frame/parser.Y" {;} break; case 174: -#line 710 "frame/parser.Y" +#line 711 "frame/parser.Y" {;} break; case 175: -#line 713 "frame/parser.Y" +#line 714 "frame/parser.Y" {(yyval.integer) = Base::IMG;;} break; case 176: -#line 714 "frame/parser.Y" +#line 715 "frame/parser.Y" {(yyval.integer) = Base::IMG;;} break; case 177: -#line 715 "frame/parser.Y" +#line 716 "frame/parser.Y" {(yyval.integer) = Base::MASK;;} break; case 178: -#line 718 "frame/parser.Y" +#line 719 "frame/parser.Y" {(yyval.integer) = Point::CIRCLE;;} break; case 179: -#line 719 "frame/parser.Y" +#line 720 "frame/parser.Y" {(yyval.integer) = Point::CIRCLE;;} break; case 180: -#line 720 "frame/parser.Y" +#line 721 "frame/parser.Y" {(yyval.integer) = Point::BOX;;} break; case 181: -#line 721 "frame/parser.Y" +#line 722 "frame/parser.Y" {(yyval.integer) = Point::DIAMOND;;} break; case 182: -#line 722 "frame/parser.Y" +#line 723 "frame/parser.Y" {(yyval.integer) = Point::CROSS;;} break; case 183: -#line 723 "frame/parser.Y" +#line 724 "frame/parser.Y" {(yyval.integer) = Point::EX;;} break; case 184: -#line 724 "frame/parser.Y" +#line 725 "frame/parser.Y" {(yyval.integer) = Point::ARROW;;} break; case 185: -#line 725 "frame/parser.Y" +#line 726 "frame/parser.Y" {(yyval.integer) = Point::BOXCIRCLE;;} break; case 186: -#line 728 "frame/parser.Y" +#line 729 "frame/parser.Y" {(yyval.integer) = POINTSIZE;;} break; case 187: -#line 729 "frame/parser.Y" +#line 730 "frame/parser.Y" {(yyval.integer) = (yyvsp[(1) - (1)].integer);;} break; case 188: -#line 732 "frame/parser.Y" +#line 733 "frame/parser.Y" {(yyval.integer) = Marker::PANDA;;} break; case 189: -#line 733 "frame/parser.Y" +#line 734 "frame/parser.Y" {(yyval.integer) = Marker::HISTOGRAM;;} break; case 190: -#line 734 "frame/parser.Y" +#line 735 "frame/parser.Y" {(yyval.integer) = Marker::PLOT2D;;} break; case 191: -#line 735 "frame/parser.Y" +#line 736 "frame/parser.Y" {(yyval.integer) = Marker::PLOT3D;;} break; case 192: -#line 736 "frame/parser.Y" +#line 737 "frame/parser.Y" {(yyval.integer) = Marker::RADIAL;;} break; case 193: -#line 737 "frame/parser.Y" +#line 738 "frame/parser.Y" {(yyval.integer) = Marker::STATS;;} break; case 194: -#line 740 "frame/parser.Y" +#line 741 "frame/parser.Y" {(yyval.integer) = Marker::AVERAGE;;} break; case 195: -#line 741 "frame/parser.Y" +#line 742 "frame/parser.Y" {(yyval.integer) = Marker::AVERAGE;;} break; case 196: -#line 742 "frame/parser.Y" +#line 743 "frame/parser.Y" {(yyval.integer) = Marker::SUM;;} break; case 197: -#line 745 "frame/parser.Y" +#line 746 "frame/parser.Y" {(yyval.integer) = FitsFile::NATIVE;;} break; case 198: -#line 746 "frame/parser.Y" +#line 747 "frame/parser.Y" {(yyval.integer) = FitsFile::NATIVE;;} break; case 199: -#line 747 "frame/parser.Y" +#line 748 "frame/parser.Y" {(yyval.integer) = FitsFile::BIG;;} break; case 200: -#line 748 "frame/parser.Y" +#line 749 "frame/parser.Y" {(yyval.integer) = FitsFile::BIG;;} break; case 201: -#line 749 "frame/parser.Y" +#line 750 "frame/parser.Y" {(yyval.integer) = FitsFile::LITTLE;;} break; case 202: -#line 750 "frame/parser.Y" +#line 751 "frame/parser.Y" {(yyval.integer) = FitsFile::LITTLE;;} break; case 207: -#line 757 "frame/parser.Y" +#line 758 "frame/parser.Y" {fr->set3dRenderMethodCmd((yyvsp[(2) - (2)].integer));;} break; case 208: -#line 758 "frame/parser.Y" +#line 759 "frame/parser.Y" {fr->set3dRenderBackgroundCmd((yyvsp[(2) - (2)].integer));;} break; case 209: -#line 759 "frame/parser.Y" +#line 760 "frame/parser.Y" {fr->set3dScaleCmd((yyvsp[(2) - (2)].real));;} break; case 210: -#line 761 "frame/parser.Y" +#line 762 "frame/parser.Y" {/* needed for compatibility with old version of backup */;} break; case 211: -#line 764 "frame/parser.Y" +#line 765 "frame/parser.Y" {fr->set3dBorderCmd((yyvsp[(1) - (1)].integer));;} break; case 212: -#line 765 "frame/parser.Y" +#line 766 "frame/parser.Y" {fr->set3dBorderColorCmd((yyvsp[(2) - (2)].str));;} break; case 213: -#line 768 "frame/parser.Y" +#line 769 "frame/parser.Y" {fr->set3dCompassCmd((yyvsp[(1) - (1)].integer));;} break; case 214: -#line 769 "frame/parser.Y" +#line 770 "frame/parser.Y" {fr->set3dCompassColorCmd((yyvsp[(2) - (2)].str));;} break; case 215: -#line 772 "frame/parser.Y" +#line 773 "frame/parser.Y" {fr->set3dHighliteCmd((yyvsp[(1) - (1)].integer));;} break; case 216: -#line 773 "frame/parser.Y" +#line 774 "frame/parser.Y" {fr->set3dHighliteColorCmd((yyvsp[(2) - (2)].str));;} break; case 217: -#line 776 "frame/parser.Y" +#line 777 "frame/parser.Y" {fr->set3dViewCmd((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real));;} break; case 218: -#line 778 "frame/parser.Y" +#line 779 "frame/parser.Y" {fr->set3dViewPointCmd(Vector3d((yyvsp[(2) - (6)].real),(yyvsp[(3) - (6)].real),(yyvsp[(4) - (6)].real)),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;} break; case 220: -#line 782 "frame/parser.Y" +#line 783 "frame/parser.Y" {fr->binColsCmd((yyvsp[(2) - (4)].str),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));;} break; case 221: -#line 783 "frame/parser.Y" +#line 784 "frame/parser.Y" {fr->binDepthCmd((yyvsp[(2) - (2)].integer));;} break; case 224: -#line 786 "frame/parser.Y" +#line 787 "frame/parser.Y" {fr->binBufferSizeCmd((yyvsp[(3) - (3)].integer));;} break; case 226: -#line 788 "frame/parser.Y" +#line 789 "frame/parser.Y" {fr->binFilterCmd((yyvsp[(2) - (2)].str));;} break; case 227: -#line 791 "frame/parser.Y" +#line 792 "frame/parser.Y" {fr->binAboutCmd();;} break; case 228: -#line 792 "frame/parser.Y" +#line 793 "frame/parser.Y" {fr->binAboutCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;} break; case 229: -#line 795 "frame/parser.Y" +#line 796 "frame/parser.Y" {fr->binFactorCmd(Vector((yyvsp[(1) - (1)].real),(yyvsp[(1) - (1)].real)));;} break; case 230: -#line 796 "frame/parser.Y" +#line 797 "frame/parser.Y" {fr->binFactorCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;} break; case 231: -#line 798 "frame/parser.Y" +#line 799 "frame/parser.Y" {fr->binFactorAboutCmd(Vector((yyvsp[(1) - (4)].real),(yyvsp[(1) - (4)].real)), Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;} break; case 232: -#line 800 "frame/parser.Y" +#line 801 "frame/parser.Y" {fr->binFactorAboutCmd(Vector((yyvsp[(1) - (5)].real),(yyvsp[(2) - (5)].real)), Vector((yyvsp[(4) - (5)].real),(yyvsp[(5) - (5)].real)));;} break; case 233: -#line 801 "frame/parser.Y" +#line 802 "frame/parser.Y" {fr->binFactorToCmd(Vector((yyvsp[(2) - (2)].real),(yyvsp[(2) - (2)].real)));;} break; case 234: -#line 802 "frame/parser.Y" +#line 803 "frame/parser.Y" {fr->binFactorToCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} break; case 235: -#line 804 "frame/parser.Y" +#line 805 "frame/parser.Y" {fr->binFactorToAboutCmd(Vector((yyvsp[(2) - (5)].real),(yyvsp[(2) - (5)].real)), Vector((yyvsp[(4) - (5)].real),(yyvsp[(5) - (5)].real)));;} break; case 236: -#line 806 "frame/parser.Y" +#line 807 "frame/parser.Y" {fr->binFactorToAboutCmd(Vector((yyvsp[(2) - (6)].real),(yyvsp[(3) - (6)].real)), Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;} break; case 237: -#line 809 "frame/parser.Y" +#line 810 "frame/parser.Y" {fr->binFunctionCmd(FitsHist::AVERAGE);;} break; case 238: -#line 810 "frame/parser.Y" +#line 811 "frame/parser.Y" {fr->binFunctionCmd(FitsHist::SUM);;} break; case 239: -#line 813 "frame/parser.Y" +#line 814 "frame/parser.Y" {fr->binToFitCmd();;} break; case 240: -#line 815 "frame/parser.Y" +#line 816 "frame/parser.Y" {fr->binCmd(Vector((yyvsp[(1) - (7)].real),(yyvsp[(2) - (7)].real)), (yyvsp[(5) - (7)].str), (yyvsp[(6) - (7)].str), (yyvsp[(7) - (7)].str));;} break; case 241: -#line 818 "frame/parser.Y" +#line 819 "frame/parser.Y" {fr->binCmd(Vector((yyvsp[(1) - (11)].real),(yyvsp[(2) - (11)].real)), (yyvsp[(3) - (11)].integer), Vector((yyvsp[(4) - (11)].real),(yyvsp[(5) - (11)].real)), (yyvsp[(8) - (11)].str), (yyvsp[(9) - (11)].str), (yyvsp[(10) - (11)].str), (yyvsp[(11) - (11)].str));;} break; case 242: -#line 820 "frame/parser.Y" +#line 821 "frame/parser.Y" {fr->binCmd(Vector((yyvsp[(1) - (8)].real),(yyvsp[(2) - (8)].real)), Vector((yyvsp[(4) - (8)].real),(yyvsp[(5) - (8)].real)), (yyvsp[(6) - (8)].str), (yyvsp[(7) - (8)].str), (yyvsp[(8) - (8)].str));;} break; case 243: -#line 823 "frame/parser.Y" +#line 824 "frame/parser.Y" {fr->binCmd(Vector((yyvsp[(1) - (12)].real),(yyvsp[(2) - (12)].real)), (yyvsp[(3) - (12)].integer), Vector((yyvsp[(4) - (12)].real),(yyvsp[(5) - (12)].real)), Vector((yyvsp[(7) - (12)].real),(yyvsp[(8) - (12)].real)), (yyvsp[(9) - (12)].str), (yyvsp[(10) - (12)].str), (yyvsp[(11) - (12)].str), (yyvsp[(12) - (12)].str));;} break; case 244: -#line 827 "frame/parser.Y" +#line 828 "frame/parser.Y" {fr->blockCmd(Vector((yyvsp[(1) - (1)].real),(yyvsp[(1) - (1)].real)));;} break; case 245: -#line 828 "frame/parser.Y" +#line 829 "frame/parser.Y" {fr->blockCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;} break; case 247: -#line 832 "frame/parser.Y" +#line 833 "frame/parser.Y" {fr->blockToFitCmd();;} break; case 248: -#line 833 "frame/parser.Y" +#line 834 "frame/parser.Y" {fr->blockToCmd(Vector((yyvsp[(1) - (1)].real),(yyvsp[(1) - (1)].real)));;} break; case 249: -#line 834 "frame/parser.Y" +#line 835 "frame/parser.Y" {fr->blockToCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;} break; case 253: -#line 840 "frame/parser.Y" +#line 841 "frame/parser.Y" {fr->clipUserCmd((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real));;} break; case 254: -#line 841 "frame/parser.Y" +#line 842 "frame/parser.Y" {fr->clipUserCmd(NAN,NAN);;} break; case 256: -#line 844 "frame/parser.Y" +#line 845 "frame/parser.Y" { // backward compatibility with backup ;} break; case 257: -#line 849 "frame/parser.Y" +#line 850 "frame/parser.Y" {fr->clipScopeCmd(FrScale::GLOBAL);;} break; case 258: -#line 850 "frame/parser.Y" +#line 851 "frame/parser.Y" {fr->clipScopeCmd(FrScale::LOCAL);;} break; case 259: -#line 853 "frame/parser.Y" +#line 854 "frame/parser.Y" {fr->clipModeCmd((yyvsp[(1) - (1)].real));;} break; case 260: -#line 854 "frame/parser.Y" +#line 855 "frame/parser.Y" {fr->clipModeCmd(FrScale::MINMAX);;} break; case 261: -#line 855 "frame/parser.Y" +#line 856 "frame/parser.Y" {fr->clipModeCmd(FrScale::ZSCALE);;} break; case 262: -#line 856 "frame/parser.Y" +#line 857 "frame/parser.Y" {fr->clipModeCmd(FrScale::ZMAX);;} break; case 263: -#line 857 "frame/parser.Y" +#line 858 "frame/parser.Y" {fr->clipModeCmd(FrScale::USERCLIP);;} break; case 264: -#line 860 "frame/parser.Y" +#line 861 "frame/parser.Y" {fr->clipMinMaxCmd((FrScale::MinMaxMode)(yyvsp[(2) - (2)].integer),(yyvsp[(1) - (2)].integer));;} break; case 265: -#line 861 "frame/parser.Y" +#line 862 "frame/parser.Y" {fr->clipMinMaxModeCmd((FrScale::MinMaxMode)(yyvsp[(2) - (2)].integer));;} break; case 266: -#line 862 "frame/parser.Y" +#line 863 "frame/parser.Y" {fr->clipMinMaxSampleCmd((yyvsp[(2) - (2)].integer));;} break; case 267: -#line 863 "frame/parser.Y" +#line 864 "frame/parser.Y" {fr->clipMinMaxRescanCmd();;} break; case 268: -#line 866 "frame/parser.Y" +#line 867 "frame/parser.Y" {fr->clipZScaleCmd((yyvsp[(1) - (3)].real),(yyvsp[(2) - (3)].integer),(yyvsp[(3) - (3)].integer));;} break; case 269: -#line 868 "frame/parser.Y" +#line 869 "frame/parser.Y" { // backward compatibility with backup fr->clipZScaleContrastCmd((yyvsp[(2) - (2)].real)); @@ -6253,7 +6254,7 @@ yyreduce: break; case 270: -#line 873 "frame/parser.Y" +#line 874 "frame/parser.Y" { // backward compatibility with backup fr->clipZScaleSampleCmd((yyvsp[(2) - (2)].integer)); @@ -6261,7 +6262,7 @@ yyreduce: break; case 271: -#line 878 "frame/parser.Y" +#line 879 "frame/parser.Y" { // backward compatibility with backup fr->clipZScaleLineCmd((yyvsp[(2) - (2)].integer)); @@ -6269,57 +6270,57 @@ yyreduce: break; case 272: -#line 885 "frame/parser.Y" +#line 886 "frame/parser.Y" {fr->colormapCmd((yyvsp[(1) - (6)].integer), (yyvsp[(2) - (6)].real), (yyvsp[(3) - (6)].real), (yyvsp[(4) - (6)].integer), (unsigned char*)(yyvsp[(5) - (6)].ptr), (yyvsp[(6) - (6)].integer));;} break; case 273: -#line 887 "frame/parser.Y" +#line 888 "frame/parser.Y" {fr->colormapCmd((yyvsp[(2) - (10)].real),(yyvsp[(3) - (10)].real),(yyvsp[(4) - (10)].real),(yyvsp[(5) - (10)].real),(yyvsp[(6) - (10)].real),(yyvsp[(7) - (10)].real),(yyvsp[(8) - (10)].integer),(unsigned char*)(yyvsp[(9) - (10)].ptr),(yyvsp[(10) - (10)].integer));;} break; case 274: -#line 888 "frame/parser.Y" +#line 889 "frame/parser.Y" {fr->colormapBeginCmd();;} break; case 276: -#line 890 "frame/parser.Y" +#line 891 "frame/parser.Y" {fr->colormapEndCmd();;} break; case 277: -#line 894 "frame/parser.Y" +#line 895 "frame/parser.Y" {fr->colormapMotionCmd((yyvsp[(1) - (6)].integer), (yyvsp[(2) - (6)].real), (yyvsp[(3) - (6)].real), (yyvsp[(4) - (6)].integer), (unsigned char*)(yyvsp[(5) - (6)].ptr), (yyvsp[(6) - (6)].integer));;} break; case 278: -#line 896 "frame/parser.Y" +#line 897 "frame/parser.Y" {fr->colormapMotionCmd((yyvsp[(2) - (10)].real),(yyvsp[(3) - (10)].real),(yyvsp[(4) - (10)].real),(yyvsp[(5) - (10)].real),(yyvsp[(6) - (10)].real),(yyvsp[(7) - (10)].real),(yyvsp[(8) - (10)].integer),(unsigned char*)(yyvsp[(9) - (10)].ptr),(yyvsp[(10) - (10)].integer));;} break; case 279: -#line 898 "frame/parser.Y" +#line 899 "frame/parser.Y" {fr->colorScaleCmd((FrScale::ColorScaleType)(yyvsp[(1) - (1)].integer));;} break; case 280: -#line 899 "frame/parser.Y" +#line 900 "frame/parser.Y" {fr->colorScaleLogCmd((yyvsp[(2) - (2)].real));;} break; case 286: -#line 910 "frame/parser.Y" +#line 911 "frame/parser.Y" {fr->contourCreateCmd((yyvsp[(1) - (13)].str),(yyvsp[(2) - (13)].integer),(yyvsp[(3) - (13)].integer),(FVContour::Method)(yyvsp[(4) - (13)].integer),(yyvsp[(5) - (13)].integer),(yyvsp[(6) - (13)].integer),(FrScale::ColorScaleType)(yyvsp[(7) - (13)].integer),(yyvsp[(8) - (13)].real),(FrScale::ClipMode)(yyvsp[(9) - (13)].integer),100,(FrScale::ClipScope)(yyvsp[(10) - (13)].integer),(yyvsp[(11) - (13)].real),(yyvsp[(12) - (13)].real),(yyvsp[(13) - (13)].str));;} break; case 287: -#line 912 "frame/parser.Y" +#line 913 "frame/parser.Y" {fr->contourCreateCmd((yyvsp[(1) - (13)].str),(yyvsp[(2) - (13)].integer),(yyvsp[(3) - (13)].integer),(FVContour::Method)(yyvsp[(4) - (13)].integer),(yyvsp[(5) - (13)].integer),(yyvsp[(6) - (13)].integer),(FrScale::ColorScaleType)(yyvsp[(7) - (13)].integer),(yyvsp[(8) - (13)].real),FrScale::AUTOCUT,(yyvsp[(9) - (13)].real),(FrScale::ClipScope)(yyvsp[(10) - (13)].integer),(yyvsp[(11) - (13)].real),(yyvsp[(12) - (13)].real),(yyvsp[(13) - (13)].str));;} break; case 288: -#line 914 "frame/parser.Y" +#line 915 "frame/parser.Y" { // backward compatibility with backup fr->contourCreateCmd((yyvsp[(1) - (12)].str),(yyvsp[(2) - (12)].integer),(yyvsp[(3) - (12)].integer),(FVContour::Method)(yyvsp[(4) - (12)].integer),(yyvsp[(5) - (12)].integer),(yyvsp[(6) - (12)].integer),(FrScale::ColorScaleType)(yyvsp[(7) - (12)].integer),(yyvsp[(8) - (12)].real),(FrScale::ClipMode)(yyvsp[(9) - (12)].integer),100,FrScale::LOCAL,(yyvsp[(10) - (12)].real),(yyvsp[(11) - (12)].real),(yyvsp[(12) - (12)].str)); @@ -6327,7 +6328,7 @@ yyreduce: break; case 289: -#line 919 "frame/parser.Y" +#line 920 "frame/parser.Y" { // backward compatibility with backup fr->contourCreateCmd((yyvsp[(1) - (12)].str),(yyvsp[(2) - (12)].integer),(yyvsp[(3) - (12)].integer),(FVContour::Method)(yyvsp[(4) - (12)].integer),(yyvsp[(5) - (12)].integer),(yyvsp[(6) - (12)].integer),(FrScale::ColorScaleType)(yyvsp[(7) - (12)].integer),(yyvsp[(8) - (12)].real),FrScale::AUTOCUT,(yyvsp[(9) - (12)].real),FrScale::LOCAL,(yyvsp[(10) - (12)].real),(yyvsp[(11) - (12)].real),(yyvsp[(12) - (12)].str)); @@ -6335,32 +6336,32 @@ yyreduce: break; case 290: -#line 923 "frame/parser.Y" +#line 924 "frame/parser.Y" {fr->contourCreatePolygonCmd();;} break; case 291: -#line 926 "frame/parser.Y" +#line 927 "frame/parser.Y" {fr->contourDeleteCmd();;} break; case 292: -#line 927 "frame/parser.Y" +#line 928 "frame/parser.Y" {fr->contourDeleteAuxCmd();;} break; case 293: -#line 930 "frame/parser.Y" +#line 931 "frame/parser.Y" {fr->contourLoadCmd((yyvsp[(1) - (1)].str));;} break; case 294: -#line 931 "frame/parser.Y" +#line 932 "frame/parser.Y" {fr->contourLoadCmd((yyvsp[(1) - (4)].str),(yyvsp[(2) - (4)].str),(yyvsp[(3) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 295: -#line 933 "frame/parser.Y" +#line 934 "frame/parser.Y" { // backward compatibility with backup fr->contourLoadCmd((yyvsp[(4) - (6)].str),(Coord::CoordSystem)(yyvsp[(5) - (6)].integer),(Coord::SkyFrame)(yyvsp[(6) - (6)].integer),(yyvsp[(1) - (6)].str),(yyvsp[(2) - (6)].integer),(yyvsp[(3) - (6)].integer)); @@ -6368,348 +6369,348 @@ yyreduce: break; case 296: -#line 939 "frame/parser.Y" +#line 940 "frame/parser.Y" {(yyval.integer) = FrScale::MINMAX;;} break; case 297: -#line 940 "frame/parser.Y" +#line 941 "frame/parser.Y" {(yyval.integer) = FrScale::ZSCALE;;} break; case 298: -#line 941 "frame/parser.Y" +#line 942 "frame/parser.Y" {(yyval.integer) = FrScale::ZMAX;;} break; case 299: -#line 942 "frame/parser.Y" +#line 943 "frame/parser.Y" {(yyval.integer) = FrScale::USERCLIP;;} break; case 300: -#line 945 "frame/parser.Y" +#line 946 "frame/parser.Y" {(yyval.integer) = FrScale::GLOBAL;;} break; case 301: -#line 946 "frame/parser.Y" +#line 947 "frame/parser.Y" {(yyval.integer) = FrScale::LOCAL;;} break; case 302: -#line 949 "frame/parser.Y" +#line 950 "frame/parser.Y" {(yyval.integer) = FVContour::SMOOTH;;} break; case 303: -#line 950 "frame/parser.Y" +#line 951 "frame/parser.Y" {(yyval.integer) = FVContour::BLOCK;;} break; case 304: -#line 953 "frame/parser.Y" +#line 954 "frame/parser.Y" {fr->contourPasteCmd((yyvsp[(1) - (1)].str));;} break; case 305: -#line 954 "frame/parser.Y" +#line 955 "frame/parser.Y" {fr->contourPasteCmd((yyvsp[(1) - (4)].str),(yyvsp[(2) - (4)].str),(yyvsp[(3) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 306: -#line 958 "frame/parser.Y" +#line 959 "frame/parser.Y" {fr->contourSaveCmd((yyvsp[(1) - (3)].str), (Coord::CoordSystem)(yyvsp[(2) - (3)].integer), (Coord::SkyFrame)(yyvsp[(3) - (3)].integer));;} break; case 307: -#line 960 "frame/parser.Y" +#line 961 "frame/parser.Y" {fr->contourSaveAuxCmd((yyvsp[(2) - (4)].str),(Coord::CoordSystem)(yyvsp[(3) - (4)].integer),(Coord::SkyFrame)(yyvsp[(4) - (4)].integer));;} break; case 308: -#line 963 "frame/parser.Y" +#line 964 "frame/parser.Y" {fr->cropCmd();;} break; case 309: -#line 965 "frame/parser.Y" +#line 966 "frame/parser.Y" {fr->cropCmd(Vector((yyvsp[(1) - (6)].real),(yyvsp[(2) - (6)].real)), Vector((yyvsp[(3) - (6)].real),(yyvsp[(4) - (6)].real)), (Coord::CoordSystem)(yyvsp[(5) - (6)].integer), (Coord::SkyFrame)(yyvsp[(6) - (6)].integer));;} break; case 310: -#line 968 "frame/parser.Y" +#line 969 "frame/parser.Y" {fr->cropCenterCmd(Vector((yyvsp[(2) - (8)].vector)), (Coord::CoordSystem)(yyvsp[(3) - (8)].integer), (Coord::SkyFrame)(yyvsp[(4) - (8)].integer), Vector((yyvsp[(5) - (8)].real),(yyvsp[(6) - (8)].real)), (Coord::CoordSystem)(yyvsp[(7) - (8)].integer), (Coord::DistFormat)(yyvsp[(8) - (8)].integer));;} break; case 312: -#line 970 "frame/parser.Y" +#line 971 "frame/parser.Y" {fr->cropBeginCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} break; case 313: -#line 971 "frame/parser.Y" +#line 972 "frame/parser.Y" {fr->cropMotionCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} break; case 314: -#line 972 "frame/parser.Y" +#line 973 "frame/parser.Y" {fr->cropEndCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} break; case 315: -#line 975 "frame/parser.Y" +#line 976 "frame/parser.Y" {fr->crop3dCmd();;} break; case 316: -#line 977 "frame/parser.Y" +#line 978 "frame/parser.Y" {fr->crop3dCmd((yyvsp[(1) - (4)].real), (yyvsp[(2) - (4)].real), (Coord::CoordSystem)(yyvsp[(3) - (4)].integer), (Coord::SkyFrame)(yyvsp[(4) - (4)].integer));;} break; case 317: -#line 978 "frame/parser.Y" +#line 979 "frame/parser.Y" {fr->crop3dBeginCmd(Vector((yyvsp[(2) - (4)].real),(yyvsp[(3) - (4)].real)),(yyvsp[(4) - (4)].integer));;} break; case 318: -#line 979 "frame/parser.Y" +#line 980 "frame/parser.Y" {fr->crop3dMotionCmd(Vector((yyvsp[(2) - (4)].real),(yyvsp[(3) - (4)].real)),(yyvsp[(4) - (4)].integer));;} break; case 319: -#line 980 "frame/parser.Y" +#line 981 "frame/parser.Y" {fr->crop3dEndCmd(Vector((yyvsp[(2) - (4)].real),(yyvsp[(3) - (4)].real)),(yyvsp[(4) - (4)].integer));;} break; case 320: -#line 984 "frame/parser.Y" +#line 985 "frame/parser.Y" {fr->crosshairCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)), (Coord::InternalSystem)(yyvsp[(1) - (3)].integer));;} break; case 321: -#line 986 "frame/parser.Y" +#line 987 "frame/parser.Y" {fr->crosshairCmd(Vector((yyvsp[(3) - (3)].vector)), (Coord::CoordSystem)(yyvsp[(1) - (3)].integer), (Coord::SkyFrame)(yyvsp[(2) - (3)].integer));;} break; case 322: -#line 987 "frame/parser.Y" +#line 988 "frame/parser.Y" {fr->crosshairCmd((yyvsp[(1) - (1)].integer));;} break; case 323: -#line 988 "frame/parser.Y" +#line 989 "frame/parser.Y" {fr->crosshairWarpCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} break; case 324: -#line 991 "frame/parser.Y" +#line 992 "frame/parser.Y" {fr->crosshairCmd(Vector((yyvsp[(4) - (5)].real),(yyvsp[(5) - (5)].real)), (Coord::InternalSystem)(yyvsp[(3) - (5)].integer));;} break; case 325: -#line 993 "frame/parser.Y" +#line 994 "frame/parser.Y" {fr->crosshairCmd(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)), (Coord::InternalSystem)(yyvsp[(2) - (4)].integer));;} break; case 326: -#line 995 "frame/parser.Y" +#line 996 "frame/parser.Y" {fr->crosshairCmd(Vector((yyvsp[(4) - (4)].vector)), (Coord::CoordSystem)(yyvsp[(3) - (4)].integer));;} break; case 327: -#line 997 "frame/parser.Y" +#line 998 "frame/parser.Y" {fr->crosshairCmd(Vector((yyvsp[(3) - (3)].vector)), (Coord::CoordSystem)(yyvsp[(2) - (3)].integer));;} break; case 328: -#line 1000 "frame/parser.Y" +#line 1001 "frame/parser.Y" {fr->axesOrderCmd((yyvsp[(2) - (2)].integer));;} break; case 329: -#line 1003 "frame/parser.Y" +#line 1004 "frame/parser.Y" {(yyval.integer) = Base::AVERAGE;;} break; case 330: -#line 1004 "frame/parser.Y" +#line 1005 "frame/parser.Y" {(yyval.integer) = Base::AVERAGE;;} break; case 331: -#line 1005 "frame/parser.Y" +#line 1006 "frame/parser.Y" {(yyval.integer) = Base::SUM;;} break; case 332: -#line 1008 "frame/parser.Y" +#line 1009 "frame/parser.Y" {fr->fitsyHasExtCmd((yyvsp[(3) - (3)].str));;} break; case 333: -#line 1011 "frame/parser.Y" +#line 1012 "frame/parser.Y" {fr->getBgColorCmd();;} break; case 347: -#line 1025 "frame/parser.Y" +#line 1026 "frame/parser.Y" {fr->getDATASECCmd();;} break; case 350: -#line 1028 "frame/parser.Y" +#line 1029 "frame/parser.Y" {fr->getHistogramCmd((yyvsp[(2) - (4)].str),(yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].integer));;} break; case 351: -#line 1030 "frame/parser.Y" +#line 1031 "frame/parser.Y" {fr->getHorzCutCmd((yyvsp[(3) - (9)].str),(yyvsp[(4) - (9)].str),Vector((yyvsp[(5) - (9)].real),(yyvsp[(6) - (9)].real)),(Coord::InternalSystem)(yyvsp[(7) - (9)].integer),(yyvsp[(8) - (9)].integer),(Base::CutMethod)(yyvsp[(9) - (9)].integer));;} break; case 354: -#line 1033 "frame/parser.Y" +#line 1034 "frame/parser.Y" {fr->getIRAFAlignCmd();;} break; case 355: -#line 1034 "frame/parser.Y" +#line 1035 "frame/parser.Y" {fr->getMinMaxCmd();;} break; case 358: -#line 1037 "frame/parser.Y" +#line 1038 "frame/parser.Y" {fr->getNANColorCmd();;} break; case 359: -#line 1038 "frame/parser.Y" +#line 1039 "frame/parser.Y" {fr->getOrientCmd();;} break; case 361: -#line 1041 "frame/parser.Y" +#line 1042 "frame/parser.Y" {fr->getPixelTableCmd(Vector((yyvsp[(4) - (8)].real),(yyvsp[(5) - (8)].real)), (Coord::InternalSystem)(yyvsp[(3) - (8)].integer), (yyvsp[(6) - (8)].integer), (yyvsp[(7) - (8)].integer), (yyvsp[(8) - (8)].str));;} break; case 363: -#line 1043 "frame/parser.Y" +#line 1044 "frame/parser.Y" {fr->getRotateCmd();;} break; case 365: -#line 1045 "frame/parser.Y" +#line 1046 "frame/parser.Y" {fr->getThreadsCmd();;} break; case 367: -#line 1047 "frame/parser.Y" +#line 1048 "frame/parser.Y" {fr->getTypeCmd();;} break; case 368: -#line 1049 "frame/parser.Y" +#line 1050 "frame/parser.Y" {fr->getValueCmd(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)),(Coord::InternalSystem)(yyvsp[(2) - (4)].integer));;} break; case 369: -#line 1051 "frame/parser.Y" +#line 1052 "frame/parser.Y" {fr->getVertCutCmd((yyvsp[(3) - (9)].str),(yyvsp[(4) - (9)].str),Vector((yyvsp[(5) - (9)].real),(yyvsp[(6) - (9)].real)),(Coord::InternalSystem)(yyvsp[(7) - (9)].integer),(yyvsp[(8) - (9)].integer),(Base::CutMethod)(yyvsp[(9) - (9)].integer));;} break; case 371: -#line 1053 "frame/parser.Y" +#line 1054 "frame/parser.Y" {fr->getZoomCmd();;} break; case 372: -#line 1056 "frame/parser.Y" +#line 1057 "frame/parser.Y" {fr->getBinDepthCmd();;} break; case 373: -#line 1057 "frame/parser.Y" +#line 1058 "frame/parser.Y" {fr->getBinFactorCmd();;} break; case 374: -#line 1058 "frame/parser.Y" +#line 1059 "frame/parser.Y" {fr->getBinFunctionCmd();;} break; case 375: -#line 1059 "frame/parser.Y" +#line 1060 "frame/parser.Y" {fr->getBinBufferSizeCmd();;} break; case 376: -#line 1060 "frame/parser.Y" +#line 1061 "frame/parser.Y" {fr->getBinCursorCmd();;} break; case 377: -#line 1061 "frame/parser.Y" +#line 1062 "frame/parser.Y" {fr->getBinFilterCmd();;} break; case 379: -#line 1063 "frame/parser.Y" +#line 1064 "frame/parser.Y" {fr->getBinListCmd();;} break; case 380: -#line 1066 "frame/parser.Y" +#line 1067 "frame/parser.Y" {fr->getBinColsCmd();;} break; case 381: -#line 1067 "frame/parser.Y" +#line 1068 "frame/parser.Y" {fr->getBinColsMinMaxCmd((yyvsp[(2) - (2)].str));;} break; case 382: -#line 1068 "frame/parser.Y" +#line 1069 "frame/parser.Y" {fr->getBinColsDimCmd((yyvsp[(2) - (2)].str));;} break; case 383: -#line 1071 "frame/parser.Y" +#line 1072 "frame/parser.Y" {fr->getBlockCmd();;} break; case 384: -#line 1074 "frame/parser.Y" +#line 1075 "frame/parser.Y" {fr->getClipCmd();;} break; case 385: -#line 1076 "frame/parser.Y" +#line 1077 "frame/parser.Y" {fr->getClipCmd((FrScale::ClipMode)(yyvsp[(1) - (2)].integer), (FrScale::ClipScope)(yyvsp[(2) - (2)].integer));;} break; case 386: -#line 1078 "frame/parser.Y" +#line 1079 "frame/parser.Y" {fr->getClipCmd((yyvsp[(1) - (2)].real), (FrScale::ClipScope)(yyvsp[(2) - (2)].integer));;} break; case 387: -#line 1079 "frame/parser.Y" +#line 1080 "frame/parser.Y" {fr->getClipScopeCmd();;} break; case 388: -#line 1080 "frame/parser.Y" +#line 1081 "frame/parser.Y" {fr->getClipModeCmd();;} break; case 390: -#line 1082 "frame/parser.Y" +#line 1083 "frame/parser.Y" {fr->getClipUserCmd();;} break; case 392: -#line 1085 "frame/parser.Y" +#line 1086 "frame/parser.Y" { // backward compatibility with backup fr->getClipPreserveCmd(); @@ -6717,142 +6718,142 @@ yyreduce: break; case 393: -#line 1091 "frame/parser.Y" +#line 1092 "frame/parser.Y" {fr->getClipMinMaxModeCmd();;} break; case 394: -#line 1092 "frame/parser.Y" +#line 1093 "frame/parser.Y" {fr->getClipMinMaxSampleCmd();;} break; case 395: -#line 1095 "frame/parser.Y" +#line 1096 "frame/parser.Y" {fr->getClipZScaleContrastCmd();;} break; case 396: -#line 1096 "frame/parser.Y" +#line 1097 "frame/parser.Y" {fr->getClipZScaleSampleCmd();;} break; case 397: -#line 1097 "frame/parser.Y" +#line 1098 "frame/parser.Y" {fr->getClipZScaleLineCmd();;} break; case 398: -#line 1100 "frame/parser.Y" +#line 1101 "frame/parser.Y" {fr->getColorbarCmd();;} break; case 399: -#line 1101 "frame/parser.Y" +#line 1102 "frame/parser.Y" {fr->getColorbarTagCmd();;} break; case 401: -#line 1107 "frame/parser.Y" +#line 1108 "frame/parser.Y" {fr->getColorMapLevelCmd((yyvsp[(1) - (1)].integer));;} break; case 402: -#line 1109 "frame/parser.Y" +#line 1110 "frame/parser.Y" {fr->getColorMapLevelCmd((yyvsp[(1) - (4)].integer),Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)),(Coord::InternalSystem)(yyvsp[(2) - (4)].integer));;} break; case 403: -#line 1111 "frame/parser.Y" +#line 1112 "frame/parser.Y" {fr->getColorMapLevelCmd((yyvsp[(1) - (5)].integer),(yyvsp[(2) - (5)].real),(yyvsp[(3) - (5)].real),(FrScale::ColorScaleType)(yyvsp[(4) - (5)].integer),(yyvsp[(5) - (5)].real));;} break; case 404: -#line 1114 "frame/parser.Y" +#line 1115 "frame/parser.Y" {fr->getColorScaleCmd();;} break; case 406: -#line 1116 "frame/parser.Y" +#line 1117 "frame/parser.Y" {fr->getColorScaleLogCmd();;} break; case 407: -#line 1120 "frame/parser.Y" +#line 1121 "frame/parser.Y" {fr->getColorScaleLevelCmd((yyvsp[(1) - (5)].integer),(yyvsp[(2) - (5)].real),(yyvsp[(3) - (5)].real),(FrScale::ColorScaleType)(yyvsp[(4) - (5)].integer),(yyvsp[(5) - (5)].real));;} break; case 408: -#line 1124 "frame/parser.Y" +#line 1125 "frame/parser.Y" {fr->getContourCmd((Coord::CoordSystem)(yyvsp[(1) - (2)].integer),(Coord::SkyFrame)(yyvsp[(2) - (2)].integer));;} break; case 410: -#line 1126 "frame/parser.Y" +#line 1127 "frame/parser.Y" {fr->getContourColorNameCmd();;} break; case 411: -#line 1127 "frame/parser.Y" +#line 1128 "frame/parser.Y" {fr->getContourDashCmd();;} break; case 412: -#line 1128 "frame/parser.Y" +#line 1129 "frame/parser.Y" {fr->getContourLevelCmd();;} break; case 413: -#line 1129 "frame/parser.Y" +#line 1130 "frame/parser.Y" {fr->getContourNumLevelCmd();;} break; case 414: -#line 1130 "frame/parser.Y" +#line 1131 "frame/parser.Y" {fr->getContourMethodCmd();;} break; case 416: -#line 1132 "frame/parser.Y" +#line 1133 "frame/parser.Y" {fr->getContourSmoothCmd();;} break; case 417: -#line 1133 "frame/parser.Y" +#line 1134 "frame/parser.Y" {fr->getContourLineWidthCmd();;} break; case 418: -#line 1136 "frame/parser.Y" +#line 1137 "frame/parser.Y" {fr->getContourClipCmd();;} break; case 419: -#line 1137 "frame/parser.Y" +#line 1138 "frame/parser.Y" {fr->getContourClipModeCmd();;} break; case 420: -#line 1138 "frame/parser.Y" +#line 1139 "frame/parser.Y" {fr->getContourClipScopeCmd();;} break; case 421: -#line 1141 "frame/parser.Y" +#line 1142 "frame/parser.Y" {fr->getContourScaleCmd();;} break; case 422: -#line 1142 "frame/parser.Y" +#line 1143 "frame/parser.Y" {fr->getContourScaleLogCmd();;} break; case 423: -#line 1146 "frame/parser.Y" +#line 1147 "frame/parser.Y" {fr->getCoordCmd(Vector((yyvsp[(1) - (5)].real),(yyvsp[(2) - (5)].real)), (Coord::CoordSystem)(yyvsp[(3) - (5)].integer), (Coord::SkyFrame)(yyvsp[(4) - (5)].integer), (Coord::SkyFormat)(yyvsp[(5) - (5)].integer));;} break; case 424: -#line 1148 "frame/parser.Y" +#line 1149 "frame/parser.Y" { // backward compatibility fr->getCoordCmd(Vector((yyvsp[(2) - (6)].real),(yyvsp[(3) - (6)].real)), (Coord::CoordSystem)(yyvsp[(4) - (6)].integer), (Coord::SkyFrame)(yyvsp[(5) - (6)].integer), @@ -6861,421 +6862,421 @@ yyreduce: break; case 425: -#line 1156 "frame/parser.Y" +#line 1157 "frame/parser.Y" {fr->getCropCmd((Coord::CoordSystem)(yyvsp[(1) - (3)].integer), (Coord::SkyFrame)(yyvsp[(2) - (3)].integer), (Coord::SkyFormat)(yyvsp[(3) - (3)].integer));;} break; case 426: -#line 1158 "frame/parser.Y" +#line 1159 "frame/parser.Y" {fr->getCropCenterCmd((Coord::CoordSystem)(yyvsp[(2) - (6)].integer), (Coord::SkyFrame)(yyvsp[(3) - (6)].integer), (Coord::SkyFormat)(yyvsp[(4) - (6)].integer), (Coord::CoordSystem)(yyvsp[(5) - (6)].integer), (Coord::DistFormat)(yyvsp[(6) - (6)].integer));;} break; case 427: -#line 1160 "frame/parser.Y" +#line 1161 "frame/parser.Y" {fr->getCrop3dCmd((Coord::CoordSystem)(yyvsp[(2) - (3)].integer), (Coord::SkyFrame)(yyvsp[(3) - (3)].integer));;} break; case 428: -#line 1163 "frame/parser.Y" +#line 1164 "frame/parser.Y" {fr->getCrosshairCmd((Coord::InternalSystem)(yyvsp[(1) - (1)].integer));;} break; case 429: -#line 1165 "frame/parser.Y" +#line 1166 "frame/parser.Y" {fr->getCrosshairCmd((Coord::CoordSystem)(yyvsp[(1) - (3)].integer), (Coord::SkyFrame)(yyvsp[(2) - (3)].integer), (Coord::SkyFormat)(yyvsp[(3) - (3)].integer));;} break; case 430: -#line 1166 "frame/parser.Y" +#line 1167 "frame/parser.Y" {fr->getCrosshairStatusCmd();;} break; case 431: -#line 1169 "frame/parser.Y" +#line 1170 "frame/parser.Y" {fr->getAxesOrderCmd();;} break; case 432: -#line 1172 "frame/parser.Y" +#line 1173 "frame/parser.Y" {fr->getCursorCmd((Coord::InternalSystem)(yyvsp[(1) - (1)].integer));;} break; case 433: -#line 1174 "frame/parser.Y" +#line 1175 "frame/parser.Y" {fr->getCursorCmd((Coord::CoordSystem)(yyvsp[(1) - (3)].integer), (Coord::SkyFrame)(yyvsp[(2) - (3)].integer), (Coord::SkyFormat)(yyvsp[(3) - (3)].integer));;} break; case 434: -#line 1178 "frame/parser.Y" +#line 1179 "frame/parser.Y" {fr->getDataValuesCmd(1, Vector((yyvsp[(3) - (6)].vector)), (Coord::CoordSystem)(yyvsp[(1) - (6)].integer), (Coord::SkyFrame)(yyvsp[(2) - (6)].integer), Vector((yyvsp[(4) - (6)].real),(yyvsp[(5) - (6)].real)), (yyvsp[(6) - (6)].str));;} break; case 435: -#line 1180 "frame/parser.Y" +#line 1181 "frame/parser.Y" {fr->getDataValuesCmd((yyvsp[(1) - (7)].integer), Vector((yyvsp[(4) - (7)].vector)), (Coord::CoordSystem)(yyvsp[(2) - (7)].integer), (Coord::SkyFrame)(yyvsp[(3) - (7)].integer), Vector((yyvsp[(5) - (7)].real),(yyvsp[(6) - (7)].real)), (yyvsp[(7) - (7)].str));;} break; case 436: -#line 1183 "frame/parser.Y" +#line 1184 "frame/parser.Y" {fr->getDataValuesCmd(Vector((yyvsp[(2) - (5)].real),(yyvsp[(3) - (5)].real)),(Coord::InternalSystem)(yyvsp[(1) - (5)].integer), Vector((yyvsp[(4) - (5)].integer),(yyvsp[(5) - (5)].integer)));;} break; case 437: -#line 1187 "frame/parser.Y" +#line 1188 "frame/parser.Y" {fr->getInfoCmd((yyvsp[(1) - (1)].str));;} break; case 438: -#line 1188 "frame/parser.Y" +#line 1189 "frame/parser.Y" {fr->getInfoClipCmd();;} break; case 439: -#line 1190 "frame/parser.Y" +#line 1191 "frame/parser.Y" {fr->getInfoCmd(Vector((yyvsp[(2) - (4)].real),(yyvsp[(3) - (4)].real)), (Coord::InternalSystem)(yyvsp[(1) - (4)].integer), (yyvsp[(4) - (4)].str));;} break; case 440: -#line 1193 "frame/parser.Y" +#line 1194 "frame/parser.Y" {fr->iisGetCmd((char*)(yyvsp[(1) - (5)].ptr),(yyvsp[(2) - (5)].integer),(yyvsp[(3) - (5)].integer),(yyvsp[(4) - (5)].integer),(yyvsp[(5) - (5)].integer));;} break; case 441: -#line 1194 "frame/parser.Y" +#line 1195 "frame/parser.Y" {fr->iisGetCursorCmd();;} break; case 443: -#line 1198 "frame/parser.Y" +#line 1199 "frame/parser.Y" {fr->iisGetFileNameCmd();;} break; case 444: -#line 1199 "frame/parser.Y" +#line 1200 "frame/parser.Y" {fr->iisGetFileNameCmd((yyvsp[(1) - (1)].integer));;} break; case 445: -#line 1200 "frame/parser.Y" +#line 1201 "frame/parser.Y" {fr->iisGetFileNameCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;} break; case 446: -#line 1203 "frame/parser.Y" +#line 1204 "frame/parser.Y" {fr->getFitsNAxesCmd();;} break; case 447: -#line 1205 "frame/parser.Y" +#line 1206 "frame/parser.Y" {fr->getFitsCenterCmd((Coord::CoordSystem)(yyvsp[(2) - (4)].integer),(Coord::SkyFrame)(yyvsp[(3) - (4)].integer),(Coord::SkyFormat)(yyvsp[(4) - (4)].integer));;} break; case 448: -#line 1206 "frame/parser.Y" +#line 1207 "frame/parser.Y" {fr->getFitsCountCmd();;} break; case 450: -#line 1208 "frame/parser.Y" +#line 1209 "frame/parser.Y" {fr->getBitpixCmd();;} break; case 454: -#line 1212 "frame/parser.Y" +#line 1213 "frame/parser.Y" {fr->getFitsHeightCmd();;} break; case 455: -#line 1213 "frame/parser.Y" +#line 1214 "frame/parser.Y" {fr->getFitsObjectNameCmd();;} break; case 456: -#line 1214 "frame/parser.Y" +#line 1215 "frame/parser.Y" {fr->getFitsSizeCmd();;} break; case 457: -#line 1216 "frame/parser.Y" +#line 1217 "frame/parser.Y" {fr->getFitsSizeCmd((Coord::CoordSystem)(yyvsp[(2) - (4)].integer),(Coord::SkyFrame)(yyvsp[(3) - (4)].integer),(Coord::DistFormat)(yyvsp[(4) - (4)].integer));;} break; case 459: -#line 1218 "frame/parser.Y" +#line 1219 "frame/parser.Y" {fr->getFitsWidthCmd();;} break; case 460: -#line 1221 "frame/parser.Y" +#line 1222 "frame/parser.Y" {fr->getFitsExtCmd((yyvsp[(1) - (1)].integer));;} break; case 461: -#line 1223 "frame/parser.Y" +#line 1224 "frame/parser.Y" {fr->getFitsExtCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)),(Coord::InternalSystem)(yyvsp[(1) - (3)].integer));;} break; case 462: -#line 1225 "frame/parser.Y" +#line 1226 "frame/parser.Y" {fr->getFitsHeaderCmd((yyvsp[(1) - (1)].integer));;} break; case 463: -#line 1226 "frame/parser.Y" +#line 1227 "frame/parser.Y" {fr->getFitsHeaderKeywordCmd(1,(yyvsp[(2) - (2)].str));;} break; case 464: -#line 1227 "frame/parser.Y" +#line 1228 "frame/parser.Y" {fr->getFitsHeaderKeywordCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].str));;} break; case 465: -#line 1228 "frame/parser.Y" +#line 1229 "frame/parser.Y" {fr->getFitsHeaderWCSCmd((yyvsp[(2) - (2)].integer));;} break; case 466: -#line 1231 "frame/parser.Y" +#line 1232 "frame/parser.Y" {fr->getFitsDepthCmd(2);;} break; case 467: -#line 1232 "frame/parser.Y" +#line 1233 "frame/parser.Y" {fr->getFitsDepthCmd((yyvsp[(1) - (1)].integer));;} break; case 468: -#line 1236 "frame/parser.Y" +#line 1237 "frame/parser.Y" {fr->getFitsFileNameCmd((Base::FileNameType)(yyvsp[(1) - (1)].integer));;} break; case 469: -#line 1238 "frame/parser.Y" +#line 1239 "frame/parser.Y" {fr->getFitsFileNameCmd(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)), (Coord::InternalSystem)(yyvsp[(2) - (4)].integer), (Base::FileNameType)(yyvsp[(1) - (4)].integer));;} break; case 470: -#line 1241 "frame/parser.Y" +#line 1242 "frame/parser.Y" {fr->getFitsFileNameCmd((yyvsp[(2) - (2)].integer), (Base::FileNameType)(yyvsp[(1) - (2)].integer));;} break; case 471: -#line 1244 "frame/parser.Y" +#line 1245 "frame/parser.Y" {fr->getFitsSliceCmd(2);;} break; case 472: -#line 1245 "frame/parser.Y" +#line 1246 "frame/parser.Y" {fr->getFitsSliceCmd((yyvsp[(1) - (1)].integer));;} break; case 473: -#line 1247 "frame/parser.Y" +#line 1248 "frame/parser.Y" {fr->getFitsSliceFromImageCmd((Coord::CoordSystem)(yyvsp[(3) - (3)].integer));;} break; case 474: -#line 1249 "frame/parser.Y" +#line 1250 "frame/parser.Y" {fr->getFitsSliceFromImageCmd((yyvsp[(3) - (4)].integer), (Coord::CoordSystem)(yyvsp[(4) - (4)].integer));;} break; case 475: -#line 1251 "frame/parser.Y" +#line 1252 "frame/parser.Y" {fr->getFitsSliceToImageCmd((yyvsp[(3) - (4)].real), (Coord::CoordSystem)(yyvsp[(4) - (4)].integer));;} break; case 476: -#line 1254 "frame/parser.Y" +#line 1255 "frame/parser.Y" {fr->getGridCmd();;} break; case 477: -#line 1255 "frame/parser.Y" +#line 1256 "frame/parser.Y" {fr->getGridOptionCmd();;} break; case 478: -#line 1256 "frame/parser.Y" +#line 1257 "frame/parser.Y" {fr->getGridVarsCmd();;} break; case 479: -#line 1259 "frame/parser.Y" +#line 1260 "frame/parser.Y" {fr->getMaskColorCmd();;} break; case 480: -#line 1260 "frame/parser.Y" +#line 1261 "frame/parser.Y" {fr->getMaskMarkCmd();;} break; case 481: -#line 1261 "frame/parser.Y" +#line 1262 "frame/parser.Y" {fr->getMaskRangeCmd();;} break; case 482: -#line 1262 "frame/parser.Y" +#line 1263 "frame/parser.Y" {fr->getMaskSystemCmd();;} break; case 483: -#line 1263 "frame/parser.Y" +#line 1264 "frame/parser.Y" {fr->getMaskTransparencyCmd();;} break; case 484: -#line 1264 "frame/parser.Y" +#line 1265 "frame/parser.Y" {fr->getMaskCountCmd();;} break; case 485: -#line 1265 "frame/parser.Y" +#line 1266 "frame/parser.Y" {fr->getMaskBlendCmd();;} break; case 486: -#line 1268 "frame/parser.Y" +#line 1269 "frame/parser.Y" {fr->getPanPreserveCmd();;} break; case 487: -#line 1271 "frame/parser.Y" +#line 1272 "frame/parser.Y" {fr->getRGBChannelCmd();;} break; case 488: -#line 1272 "frame/parser.Y" +#line 1273 "frame/parser.Y" {fr->getRGBSystemCmd();;} break; case 489: -#line 1273 "frame/parser.Y" +#line 1274 "frame/parser.Y" {fr->getRGBViewCmd();;} break; case 490: -#line 1276 "frame/parser.Y" +#line 1277 "frame/parser.Y" {fr->getSmoothFunctionCmd();;} break; case 491: -#line 1277 "frame/parser.Y" +#line 1278 "frame/parser.Y" {fr->getSmoothRadiusCmd();;} break; case 492: -#line 1278 "frame/parser.Y" +#line 1279 "frame/parser.Y" {fr->getSmoothRadiusMinorCmd();;} break; case 493: -#line 1279 "frame/parser.Y" +#line 1280 "frame/parser.Y" {fr->getSmoothSigmaCmd();;} break; case 494: -#line 1280 "frame/parser.Y" +#line 1281 "frame/parser.Y" {fr->getSmoothSigmaMinorCmd();;} break; case 495: -#line 1281 "frame/parser.Y" +#line 1282 "frame/parser.Y" {fr->getSmoothAngleCmd();;} break; case 500: -#line 1288 "frame/parser.Y" +#line 1289 "frame/parser.Y" {fr->get3dRenderMethodCmd();;} break; case 501: -#line 1289 "frame/parser.Y" +#line 1290 "frame/parser.Y" {fr->get3dRenderBackgroundCmd();;} break; case 502: -#line 1290 "frame/parser.Y" +#line 1291 "frame/parser.Y" {fr->get3dScaleCmd();;} break; case 503: -#line 1293 "frame/parser.Y" +#line 1294 "frame/parser.Y" {fr->get3dBorderCmd();;} break; case 504: -#line 1294 "frame/parser.Y" +#line 1295 "frame/parser.Y" {fr->get3dBorderColorCmd();;} break; case 505: -#line 1297 "frame/parser.Y" +#line 1298 "frame/parser.Y" {fr->get3dCompassCmd();;} break; case 506: -#line 1298 "frame/parser.Y" +#line 1299 "frame/parser.Y" {fr->get3dCompassColorCmd();;} break; case 507: -#line 1301 "frame/parser.Y" +#line 1302 "frame/parser.Y" {fr->get3dHighliteCmd();;} break; case 508: -#line 1302 "frame/parser.Y" +#line 1303 "frame/parser.Y" {fr->get3dHighliteColorCmd();;} break; case 509: -#line 1305 "frame/parser.Y" +#line 1306 "frame/parser.Y" {fr->get3dViewCmd();;} break; case 510: -#line 1306 "frame/parser.Y" +#line 1307 "frame/parser.Y" {fr->get3dViewPointCmd();;} break; case 511: -#line 1309 "frame/parser.Y" +#line 1310 "frame/parser.Y" {fr->getWCSCmd();;} break; case 513: -#line 1311 "frame/parser.Y" +#line 1312 "frame/parser.Y" {fr->getWCSNameCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;} break; case 514: -#line 1314 "frame/parser.Y" +#line 1315 "frame/parser.Y" {fr->getWCSAlignCmd();;} break; case 515: -#line 1315 "frame/parser.Y" +#line 1316 "frame/parser.Y" {fr->getWCSAlignPointerCmd();;} break; case 517: -#line 1319 "frame/parser.Y" +#line 1320 "frame/parser.Y" {fr->gridDeleteCmd();;} break; case 518: -#line 1323 "frame/parser.Y" +#line 1324 "frame/parser.Y" {fr->gridCmd((Coord::CoordSystem)(yyvsp[(1) - (6)].integer), (Coord::SkyFrame)(yyvsp[(2) - (6)].integer), (Coord::SkyFormat)(yyvsp[(3) - (6)].integer), (Grid2d::GridType)(yyvsp[(4) - (6)].integer), (yyvsp[(5) - (6)].str), (yyvsp[(6) - (6)].str));;} break; case 519: -#line 1326 "frame/parser.Y" +#line 1327 "frame/parser.Y" { // backward compatibility with backup fr->gridCmd((Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (Coord::SkyFrame)(yyvsp[(2) - (5)].integer), @@ -7284,667 +7285,667 @@ yyreduce: break; case 520: -#line 1333 "frame/parser.Y" +#line 1334 "frame/parser.Y" {(yyval.integer)=Grid2d::ANALYSIS;;} break; case 521: -#line 1334 "frame/parser.Y" +#line 1335 "frame/parser.Y" {(yyval.integer)=Grid2d::PUBLICATION;;} break; case 522: -#line 1337 "frame/parser.Y" +#line 1338 "frame/parser.Y" {fr->hasAmplifierCmd();;} break; case 525: -#line 1340 "frame/parser.Y" +#line 1341 "frame/parser.Y" {fr->hasCropCmd();;} break; case 526: -#line 1341 "frame/parser.Y" +#line 1342 "frame/parser.Y" {fr->hasDATAMINCmd();;} break; case 527: -#line 1342 "frame/parser.Y" +#line 1343 "frame/parser.Y" {fr->hasDATASECCmd();;} break; case 528: -#line 1343 "frame/parser.Y" +#line 1344 "frame/parser.Y" {fr->hasDetectorCmd();;} break; case 530: -#line 1345 "frame/parser.Y" +#line 1346 "frame/parser.Y" {fr->hasGridCmd();;} break; case 531: -#line 1346 "frame/parser.Y" +#line 1347 "frame/parser.Y" {fr->hasIISCmd();;} break; case 532: -#line 1347 "frame/parser.Y" +#line 1348 "frame/parser.Y" {fr->hasIRAFMINCmd();;} break; case 534: -#line 1349 "frame/parser.Y" +#line 1350 "frame/parser.Y" {fr->hasPhysicalCmd();;} break; case 535: -#line 1350 "frame/parser.Y" +#line 1351 "frame/parser.Y" {fr->hasImageCmd();;} break; case 536: -#line 1351 "frame/parser.Y" +#line 1352 "frame/parser.Y" {fr->hasSmoothCmd();;} break; case 537: -#line 1352 "frame/parser.Y" +#line 1353 "frame/parser.Y" {fr->hasSystemCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;} break; case 539: -#line 1356 "frame/parser.Y" +#line 1357 "frame/parser.Y" {fr->hasBinColCmd((yyvsp[(2) - (2)].str));;} break; case 540: -#line 1359 "frame/parser.Y" +#line 1360 "frame/parser.Y" {fr->hasContourCmd();;} break; case 541: -#line 1360 "frame/parser.Y" +#line 1361 "frame/parser.Y" {fr->hasContourAuxCmd();;} break; case 542: -#line 1363 "frame/parser.Y" +#line 1364 "frame/parser.Y" {fr->hasFitsCmd();;} break; case 543: -#line 1364 "frame/parser.Y" +#line 1365 "frame/parser.Y" {fr->hasFitsBinCmd();;} break; case 544: -#line 1365 "frame/parser.Y" +#line 1366 "frame/parser.Y" {fr->hasFitsCubeCmd();;} break; case 545: -#line 1366 "frame/parser.Y" +#line 1367 "frame/parser.Y" {fr->hasFitsMosaicCmd();;} break; case 546: -#line 1369 "frame/parser.Y" +#line 1370 "frame/parser.Y" {fr->hasMarkerHighlitedCmd();;} break; case 547: -#line 1370 "frame/parser.Y" +#line 1371 "frame/parser.Y" {fr->hasMarkerSelectedCmd();;} break; case 548: -#line 1371 "frame/parser.Y" +#line 1372 "frame/parser.Y" {fr->hasMarkerPasteCmd();;} break; case 549: -#line 1372 "frame/parser.Y" +#line 1373 "frame/parser.Y" {fr->hasMarkerUndoCmd();;} break; case 550: -#line 1375 "frame/parser.Y" +#line 1376 "frame/parser.Y" {fr->hasWCSCmd((Coord::CoordSystem)(yyvsp[(1) - (1)].integer));;} break; case 551: -#line 1376 "frame/parser.Y" +#line 1377 "frame/parser.Y" {fr->hasWCSCelCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;} break; case 552: -#line 1377 "frame/parser.Y" +#line 1378 "frame/parser.Y" {fr->hasWCSEquCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;} break; case 553: -#line 1378 "frame/parser.Y" +#line 1379 "frame/parser.Y" {fr->hasWCSLinearCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;} break; case 554: -#line 1379 "frame/parser.Y" +#line 1380 "frame/parser.Y" {fr->hasWCSAltCmd();;} break; case 555: -#line 1380 "frame/parser.Y" +#line 1381 "frame/parser.Y" {fr->hasWCS3DCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;} break; case 556: -#line 1383 "frame/parser.Y" +#line 1384 "frame/parser.Y" {fr->iisCmd((yyvsp[(2) - (3)].integer),(yyvsp[(3) - (3)].integer));;} break; case 557: -#line 1384 "frame/parser.Y" +#line 1385 "frame/parser.Y" {fr->iisEraseCmd();;} break; case 558: -#line 1385 "frame/parser.Y" +#line 1386 "frame/parser.Y" {fr->iisMessageCmd((yyvsp[(2) - (2)].str));;} break; case 561: -#line 1389 "frame/parser.Y" +#line 1390 "frame/parser.Y" {fr->iisSetCmd((const char*)(yyvsp[(2) - (6)].ptr),(yyvsp[(3) - (6)].integer),(yyvsp[(4) - (6)].integer),(yyvsp[(5) - (6)].integer),(yyvsp[(6) - (6)].integer));;} break; case 562: -#line 1390 "frame/parser.Y" +#line 1391 "frame/parser.Y" {fr->iisUpdateCmd();;} break; case 563: -#line 1393 "frame/parser.Y" +#line 1394 "frame/parser.Y" {fr->iisWCSCmd(Matrix((yyvsp[(2) - (10)].real),(yyvsp[(3) - (10)].real),(yyvsp[(4) - (10)].real),(yyvsp[(5) - (10)].real),(yyvsp[(6) - (10)].real),(yyvsp[(7) - (10)].real)),Vector((yyvsp[(8) - (10)].real),(yyvsp[(9) - (10)].real)),(yyvsp[(10) - (10)].integer));;} break; case 564: -#line 1396 "frame/parser.Y" +#line 1397 "frame/parser.Y" {fr->iisSetFileNameCmd((yyvsp[(1) - (1)].str));;} break; case 565: -#line 1397 "frame/parser.Y" +#line 1398 "frame/parser.Y" {fr->iisSetFileNameCmd((yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].integer));;} break; case 566: -#line 1401 "frame/parser.Y" +#line 1402 "frame/parser.Y" {fr->iisSetCursorCmd(Vector((yyvsp[(1) - (3)].integer),(yyvsp[(2) - (3)].integer)),Coord::CANVAS);;} break; case 567: -#line 1403 "frame/parser.Y" +#line 1404 "frame/parser.Y" {fr->iisSetCursorCmd(Vector((yyvsp[(1) - (3)].integer),(yyvsp[(2) - (3)].integer)),(Coord::CoordSystem)(yyvsp[(3) - (3)].integer));;} break; case 568: -#line 1404 "frame/parser.Y" +#line 1405 "frame/parser.Y" {fr->iisCursorModeCmd((yyvsp[(2) - (2)].integer));;} break; case 575: -#line 1416 "frame/parser.Y" +#line 1417 "frame/parser.Y" {fr->loadArrAllocCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 576: -#line 1418 "frame/parser.Y" +#line 1419 "frame/parser.Y" {fr->loadArrAllocGZCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 577: -#line 1420 "frame/parser.Y" +#line 1421 "frame/parser.Y" {fr->loadArrChannelCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 578: -#line 1421 "frame/parser.Y" +#line 1422 "frame/parser.Y" {fr->loadArrMMapCmd((yyvsp[(1) - (3)].str), (Base::LayerType)(yyvsp[(3) - (3)].integer));;} break; case 579: -#line 1423 "frame/parser.Y" +#line 1424 "frame/parser.Y" {fr->loadArrMMapIncrCmd((yyvsp[(1) - (3)].str), (Base::LayerType)(yyvsp[(3) - (3)].integer));;} break; case 580: -#line 1425 "frame/parser.Y" +#line 1426 "frame/parser.Y" {fr->loadArrShareCmd((Base::ShmType)(yyvsp[(3) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(1) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; case 581: -#line 1427 "frame/parser.Y" +#line 1428 "frame/parser.Y" {fr->loadArrSocketCmd((yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 582: -#line 1429 "frame/parser.Y" +#line 1430 "frame/parser.Y" {fr->loadArrSocketGZCmd((yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 583: -#line 1431 "frame/parser.Y" +#line 1432 "frame/parser.Y" {fr->loadArrVarCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 585: -#line 1435 "frame/parser.Y" +#line 1436 "frame/parser.Y" {fr->loadArrayRGBCubeAllocCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 586: -#line 1436 "frame/parser.Y" +#line 1437 "frame/parser.Y" {fr->loadArrayRGBCubeAllocGZCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 587: -#line 1437 "frame/parser.Y" +#line 1438 "frame/parser.Y" {fr->loadArrayRGBCubeChannelCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 588: -#line 1438 "frame/parser.Y" +#line 1439 "frame/parser.Y" {fr->loadArrayRGBCubeMMapCmd((yyvsp[(1) - (2)].str));;} break; case 589: -#line 1439 "frame/parser.Y" +#line 1440 "frame/parser.Y" {fr->loadArrayRGBCubeMMapIncrCmd((yyvsp[(1) - (2)].str));;} break; case 590: -#line 1441 "frame/parser.Y" +#line 1442 "frame/parser.Y" {fr->loadArrayRGBCubeShareCmd((Base::ShmType)(yyvsp[(3) - (4)].integer), (yyvsp[(4) - (4)].integer), (yyvsp[(1) - (4)].str));;} break; case 591: -#line 1442 "frame/parser.Y" +#line 1443 "frame/parser.Y" {fr->loadArrayRGBCubeSocketCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;} break; case 592: -#line 1443 "frame/parser.Y" +#line 1444 "frame/parser.Y" {fr->loadArrayRGBCubeSocketGZCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;} break; case 593: -#line 1444 "frame/parser.Y" +#line 1445 "frame/parser.Y" {fr->loadArrayRGBCubeVarCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 594: -#line 1447 "frame/parser.Y" +#line 1448 "frame/parser.Y" {fr->loadENVISMMapCmd((yyvsp[(1) - (3)].str),(yyvsp[(2) - (3)].str));;} break; case 595: -#line 1451 "frame/parser.Y" +#line 1452 "frame/parser.Y" {fr->loadFitsAllocCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 596: -#line 1453 "frame/parser.Y" +#line 1454 "frame/parser.Y" {fr->loadFitsAllocGZCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 597: -#line 1455 "frame/parser.Y" +#line 1456 "frame/parser.Y" {fr->loadFitsChannelCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 598: -#line 1457 "frame/parser.Y" +#line 1458 "frame/parser.Y" {fr->loadFitsMMapCmd((yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 599: -#line 1459 "frame/parser.Y" +#line 1460 "frame/parser.Y" {fr->loadFitsSMMapCmd((yyvsp[(1) - (5)].str), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; case 600: -#line 1461 "frame/parser.Y" +#line 1462 "frame/parser.Y" {fr->loadFitsMMapIncrCmd((yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 601: -#line 1463 "frame/parser.Y" +#line 1464 "frame/parser.Y" {fr->loadFitsShareCmd((Base::ShmType)(yyvsp[(3) - (6)].integer), (yyvsp[(4) - (6)].integer), (yyvsp[(1) - (6)].str), (Base::LayerType)(yyvsp[(6) - (6)].integer));;} break; case 602: -#line 1465 "frame/parser.Y" +#line 1466 "frame/parser.Y" {fr->loadFitsSShareCmd((Base::ShmType)(yyvsp[(3) - (7)].integer), (yyvsp[(4) - (7)].integer), (yyvsp[(5) - (7)].integer), (yyvsp[(1) - (7)].str), (Base::LayerType)(yyvsp[(7) - (7)].integer));;} break; case 603: -#line 1468 "frame/parser.Y" +#line 1469 "frame/parser.Y" {fr->loadFitsSocketCmd((yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 604: -#line 1470 "frame/parser.Y" +#line 1471 "frame/parser.Y" {fr->loadFitsSocketGZCmd((yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 605: -#line 1472 "frame/parser.Y" +#line 1473 "frame/parser.Y" {fr->loadFitsVarCmd((yyvsp[(3) - (5)].str), (yyvsp[(1) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; case 611: -#line 1480 "frame/parser.Y" +#line 1481 "frame/parser.Y" {fr->loadSliceAllocCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 612: -#line 1481 "frame/parser.Y" +#line 1482 "frame/parser.Y" {fr->loadSliceAllocGZCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 613: -#line 1482 "frame/parser.Y" +#line 1483 "frame/parser.Y" {fr->loadSliceChannelCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 614: -#line 1483 "frame/parser.Y" +#line 1484 "frame/parser.Y" {fr->loadSliceMMapCmd((yyvsp[(1) - (3)].str));;} break; case 615: -#line 1484 "frame/parser.Y" +#line 1485 "frame/parser.Y" {fr->loadSliceSMMapCmd((yyvsp[(1) - (4)].str), (yyvsp[(2) - (4)].str));;} break; case 616: -#line 1485 "frame/parser.Y" +#line 1486 "frame/parser.Y" {fr->loadSliceMMapIncrCmd((yyvsp[(1) - (3)].str));;} break; case 617: -#line 1487 "frame/parser.Y" +#line 1488 "frame/parser.Y" {fr->loadSliceShareCmd((Base::ShmType)(yyvsp[(3) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(1) - (5)].str));;} break; case 618: -#line 1489 "frame/parser.Y" +#line 1490 "frame/parser.Y" {fr->loadSliceSShareCmd((Base::ShmType)(yyvsp[(3) - (6)].integer), (yyvsp[(4) - (6)].integer), (yyvsp[(5) - (6)].integer), (yyvsp[(1) - (6)].str));;} break; case 619: -#line 1490 "frame/parser.Y" +#line 1491 "frame/parser.Y" {fr->loadSliceSocketCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;} break; case 620: -#line 1491 "frame/parser.Y" +#line 1492 "frame/parser.Y" {fr->loadSliceSocketGZCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;} break; case 621: -#line 1492 "frame/parser.Y" +#line 1493 "frame/parser.Y" {fr->loadSliceVarCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str));;} break; case 622: -#line 1495 "frame/parser.Y" +#line 1496 "frame/parser.Y" {fr->loadExtCubeAllocCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 623: -#line 1496 "frame/parser.Y" +#line 1497 "frame/parser.Y" {fr->loadExtCubeAllocGZCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 624: -#line 1497 "frame/parser.Y" +#line 1498 "frame/parser.Y" {fr->loadExtCubeChannelCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 625: -#line 1498 "frame/parser.Y" +#line 1499 "frame/parser.Y" {fr->loadExtCubeMMapCmd((yyvsp[(1) - (3)].str));;} break; case 626: -#line 1499 "frame/parser.Y" +#line 1500 "frame/parser.Y" {fr->loadExtCubeMMapIncrCmd((yyvsp[(1) - (3)].str));;} break; case 627: -#line 1501 "frame/parser.Y" +#line 1502 "frame/parser.Y" {fr->loadExtCubeShareCmd((Base::ShmType)(yyvsp[(3) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(1) - (5)].str));;} break; case 628: -#line 1502 "frame/parser.Y" +#line 1503 "frame/parser.Y" {fr->loadExtCubeSocketCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;} break; case 629: -#line 1503 "frame/parser.Y" +#line 1504 "frame/parser.Y" {fr->loadExtCubeSocketGZCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;} break; case 630: -#line 1504 "frame/parser.Y" +#line 1505 "frame/parser.Y" {fr->loadExtCubeVarCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str));;} break; case 636: -#line 1515 "frame/parser.Y" +#line 1516 "frame/parser.Y" {fr->loadMosaicImageAllocCmd(Base::IRAF, Coord::WCS, (yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 637: -#line 1518 "frame/parser.Y" +#line 1519 "frame/parser.Y" {fr->loadMosaicImageAllocGZCmd(Base::IRAF, Coord::WCS, (yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str),(Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 638: -#line 1521 "frame/parser.Y" +#line 1522 "frame/parser.Y" {fr->loadMosaicImageChannelCmd(Base::IRAF, Coord::WCS, (yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str),(Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 639: -#line 1524 "frame/parser.Y" +#line 1525 "frame/parser.Y" {fr->loadMosaicImageMMapCmd(Base::IRAF, Coord::WCS, (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 640: -#line 1527 "frame/parser.Y" +#line 1528 "frame/parser.Y" {fr->loadMosaicImageMMapIncrCmd(Base::IRAF, Coord::WCS, (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 641: -#line 1530 "frame/parser.Y" +#line 1531 "frame/parser.Y" {fr->loadMosaicImageShareCmd(Base::IRAF, Coord::WCS, (Base::ShmType)(yyvsp[(3) - (6)].integer), (yyvsp[(4) - (6)].integer), (yyvsp[(1) - (6)].str), (Base::LayerType)(yyvsp[(6) - (6)].integer));;} break; case 642: -#line 1533 "frame/parser.Y" +#line 1534 "frame/parser.Y" {fr->loadMosaicImageSocketCmd(Base::IRAF, Coord::WCS, (yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 643: -#line 1536 "frame/parser.Y" +#line 1537 "frame/parser.Y" {fr->loadMosaicImageSocketGZCmd(Base::IRAF, Coord::WCS, (yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 644: -#line 1539 "frame/parser.Y" +#line 1540 "frame/parser.Y" {fr->loadMosaicImageVarCmd(Base::IRAF, Coord::WCS, (yyvsp[(3) - (5)].str), (yyvsp[(1) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; case 645: -#line 1544 "frame/parser.Y" +#line 1545 "frame/parser.Y" {fr->loadMosaicAllocCmd(Base::IRAF, Coord::WCS, (yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 646: -#line 1547 "frame/parser.Y" +#line 1548 "frame/parser.Y" {fr->loadMosaicAllocGZCmd(Base::IRAF, Coord::WCS, (yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 647: -#line 1550 "frame/parser.Y" +#line 1551 "frame/parser.Y" {fr->loadMosaicChannelCmd(Base::IRAF, Coord::WCS, (yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 648: -#line 1553 "frame/parser.Y" +#line 1554 "frame/parser.Y" {fr->loadMosaicMMapCmd(Base::IRAF, Coord::WCS, (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 649: -#line 1556 "frame/parser.Y" +#line 1557 "frame/parser.Y" {fr->loadMosaicSMMapCmd(Base::IRAF, Coord::WCS, (yyvsp[(1) - (5)].str), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; case 650: -#line 1559 "frame/parser.Y" +#line 1560 "frame/parser.Y" {fr->loadMosaicMMapIncrCmd(Base::IRAF, Coord::WCS, (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 651: -#line 1562 "frame/parser.Y" +#line 1563 "frame/parser.Y" {fr->loadMosaicShareCmd(Base::IRAF, Coord::WCS, (Base::ShmType)(yyvsp[(3) - (6)].integer), (yyvsp[(4) - (6)].integer), (yyvsp[(1) - (6)].str), (Base::LayerType)(yyvsp[(6) - (6)].integer));;} break; case 652: -#line 1565 "frame/parser.Y" +#line 1566 "frame/parser.Y" {fr->loadMosaicSShareCmd(Base::IRAF, Coord::WCS, (Base::ShmType)(yyvsp[(3) - (7)].integer), (yyvsp[(4) - (7)].integer), (yyvsp[(5) - (7)].integer), (yyvsp[(1) - (7)].str), (Base::LayerType)(yyvsp[(7) - (7)].integer));;} break; case 653: -#line 1568 "frame/parser.Y" +#line 1569 "frame/parser.Y" {fr->loadMosaicSocketCmd(Base::IRAF, Coord::WCS, (yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 654: -#line 1571 "frame/parser.Y" +#line 1572 "frame/parser.Y" {fr->loadMosaicSocketGZCmd(Base::IRAF, Coord::WCS, (yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 655: -#line 1574 "frame/parser.Y" +#line 1575 "frame/parser.Y" {fr->loadMosaicVarCmd(Base::IRAF, Coord::WCS, (yyvsp[(3) - (5)].str), (yyvsp[(1) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; case 656: -#line 1579 "frame/parser.Y" +#line 1580 "frame/parser.Y" {fr->loadMosaicImageAllocCmd(Base::WCSMOSAIC, (Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (yyvsp[(4) - (5)].str), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; case 657: -#line 1582 "frame/parser.Y" +#line 1583 "frame/parser.Y" {fr->loadMosaicImageAllocGZCmd(Base::WCSMOSAIC, (Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (yyvsp[(4) - (5)].str), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; case 658: -#line 1585 "frame/parser.Y" +#line 1586 "frame/parser.Y" {fr->loadMosaicImageChannelCmd(Base::WCSMOSAIC, (Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (yyvsp[(4) - (5)].str), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; case 659: -#line 1588 "frame/parser.Y" +#line 1589 "frame/parser.Y" {fr->loadMosaicImageMMapCmd(Base::WCSMOSAIC, (Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; case 660: -#line 1591 "frame/parser.Y" +#line 1592 "frame/parser.Y" {fr->loadMosaicImageMMapIncrCmd(Base::WCSMOSAIC, (Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; case 661: -#line 1594 "frame/parser.Y" +#line 1595 "frame/parser.Y" {fr->loadMosaicImageShareCmd(Base::WCSMOSAIC, (Coord::CoordSystem)(yyvsp[(1) - (7)].integer), (Base::ShmType)(yyvsp[(4) - (7)].integer), (yyvsp[(5) - (7)].integer), (yyvsp[(2) - (7)].str), (Base::LayerType)(yyvsp[(7) - (7)].integer));;} break; case 662: -#line 1597 "frame/parser.Y" +#line 1598 "frame/parser.Y" {fr->loadMosaicImageSocketCmd(Base::WCSMOSAIC, (Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; case 663: -#line 1600 "frame/parser.Y" +#line 1601 "frame/parser.Y" {fr->loadMosaicImageSocketGZCmd(Base::WCSMOSAIC, (Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; case 664: -#line 1603 "frame/parser.Y" +#line 1604 "frame/parser.Y" {fr->loadMosaicImageVarCmd(Base::WCSMOSAIC, (Coord::CoordSystem)(yyvsp[(1) - (6)].integer), (yyvsp[(4) - (6)].str), (yyvsp[(2) - (6)].str), (Base::LayerType)(yyvsp[(6) - (6)].integer));;} break; case 665: -#line 1608 "frame/parser.Y" +#line 1609 "frame/parser.Y" {fr->loadMosaicImageWFPC2AllocCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 666: -#line 1610 "frame/parser.Y" +#line 1611 "frame/parser.Y" {fr->loadMosaicImageWFPC2AllocGZCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 667: -#line 1612 "frame/parser.Y" +#line 1613 "frame/parser.Y" {fr->loadMosaicImageWFPC2ChannelCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 668: -#line 1614 "frame/parser.Y" +#line 1615 "frame/parser.Y" {fr->loadMosaicImageWFPC2MMapCmd((yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 669: -#line 1616 "frame/parser.Y" +#line 1617 "frame/parser.Y" {fr->loadMosaicImageWFPC2MMapIncrCmd((yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 670: -#line 1618 "frame/parser.Y" +#line 1619 "frame/parser.Y" { fr->loadMosaicImageWFPC2ShareCmd((Base::ShmType)(yyvsp[(3) - (6)].integer), (yyvsp[(4) - (6)].integer), (yyvsp[(1) - (6)].str), (Base::LayerType)(yyvsp[(6) - (6)].integer)); @@ -7952,243 +7953,243 @@ yyreduce: break; case 671: -#line 1623 "frame/parser.Y" +#line 1624 "frame/parser.Y" {fr->loadMosaicImageWFPC2SocketCmd((yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 672: -#line 1625 "frame/parser.Y" +#line 1626 "frame/parser.Y" {fr->loadMosaicImageWFPC2SocketGZCmd((yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 673: -#line 1627 "frame/parser.Y" +#line 1628 "frame/parser.Y" {fr->loadMosaicImageWFPC2VarCmd((yyvsp[(3) - (5)].str), (yyvsp[(1) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; case 674: -#line 1631 "frame/parser.Y" +#line 1632 "frame/parser.Y" {fr->loadMosaicAllocCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (yyvsp[(4) - (5)].str), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; case 675: -#line 1634 "frame/parser.Y" +#line 1635 "frame/parser.Y" {fr->loadMosaicAllocGZCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (yyvsp[(4) - (5)].str), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; case 676: -#line 1637 "frame/parser.Y" +#line 1638 "frame/parser.Y" {fr->loadMosaicChannelCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (yyvsp[(4) - (5)].str), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; case 677: -#line 1640 "frame/parser.Y" +#line 1641 "frame/parser.Y" {fr->loadMosaicMMapCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; case 678: -#line 1643 "frame/parser.Y" +#line 1644 "frame/parser.Y" {fr->loadMosaicSMMapCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (6)].integer), (yyvsp[(2) - (6)].str), (yyvsp[(3) - (6)].str), (Base::LayerType)(yyvsp[(6) - (6)].integer));;} break; case 679: -#line 1646 "frame/parser.Y" +#line 1647 "frame/parser.Y" {fr->loadMosaicMMapIncrCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; case 680: -#line 1649 "frame/parser.Y" +#line 1650 "frame/parser.Y" {fr->loadMosaicShareCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (7)].integer), (Base::ShmType)(yyvsp[(4) - (7)].integer), (yyvsp[(5) - (7)].integer), (yyvsp[(2) - (7)].str), (Base::LayerType)(yyvsp[(7) - (7)].integer));;} break; case 681: -#line 1652 "frame/parser.Y" +#line 1653 "frame/parser.Y" {fr->loadMosaicSShareCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (8)].integer), (Base::ShmType)(yyvsp[(4) - (8)].integer), (yyvsp[(5) - (8)].integer), (yyvsp[(6) - (8)].integer), (yyvsp[(2) - (8)].str), (Base::LayerType)(yyvsp[(8) - (8)].integer));;} break; case 682: -#line 1655 "frame/parser.Y" +#line 1656 "frame/parser.Y" {fr->loadMosaicSocketCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; case 683: -#line 1658 "frame/parser.Y" +#line 1659 "frame/parser.Y" {fr->loadMosaicSocketGZCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(2) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; case 684: -#line 1661 "frame/parser.Y" +#line 1662 "frame/parser.Y" {fr->loadMosaicVarCmd((Base::WCSMOSAIC), (Coord::CoordSystem)(yyvsp[(1) - (6)].integer), (yyvsp[(4) - (6)].str), (yyvsp[(2) - (6)].str), (Base::LayerType)(yyvsp[(6) - (6)].integer));;} break; case 685: -#line 1665 "frame/parser.Y" +#line 1666 "frame/parser.Y" {fr->loadRGBCubeAllocCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 686: -#line 1666 "frame/parser.Y" +#line 1667 "frame/parser.Y" {fr->loadRGBCubeAllocGZCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 687: -#line 1667 "frame/parser.Y" +#line 1668 "frame/parser.Y" {fr->loadRGBCubeChannelCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 688: -#line 1668 "frame/parser.Y" +#line 1669 "frame/parser.Y" {fr->loadRGBCubeMMapCmd((yyvsp[(1) - (3)].str));;} break; case 689: -#line 1669 "frame/parser.Y" +#line 1670 "frame/parser.Y" {fr->loadRGBCubeSMMapCmd((yyvsp[(1) - (4)].str), (yyvsp[(2) - (4)].str));;} break; case 690: -#line 1670 "frame/parser.Y" +#line 1671 "frame/parser.Y" {fr->loadRGBCubeMMapIncrCmd((yyvsp[(1) - (3)].str));;} break; case 691: -#line 1672 "frame/parser.Y" +#line 1673 "frame/parser.Y" {fr->loadRGBCubeShareCmd((Base::ShmType)(yyvsp[(3) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(1) - (5)].str));;} break; case 692: -#line 1674 "frame/parser.Y" +#line 1675 "frame/parser.Y" {fr->loadRGBCubeSShareCmd((Base::ShmType)(yyvsp[(3) - (6)].integer), (yyvsp[(4) - (6)].integer), (yyvsp[(5) - (6)].integer), (yyvsp[(1) - (6)].str));;} break; case 693: -#line 1675 "frame/parser.Y" +#line 1676 "frame/parser.Y" {fr->loadRGBCubeSocketCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;} break; case 694: -#line 1676 "frame/parser.Y" +#line 1677 "frame/parser.Y" {fr->loadRGBCubeSocketGZCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;} break; case 695: -#line 1677 "frame/parser.Y" +#line 1678 "frame/parser.Y" {fr->loadRGBCubeVarCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str));;} break; case 696: -#line 1680 "frame/parser.Y" +#line 1681 "frame/parser.Y" {fr->loadRGBImageAllocCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 697: -#line 1681 "frame/parser.Y" +#line 1682 "frame/parser.Y" {fr->loadRGBImageAllocGZCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 698: -#line 1682 "frame/parser.Y" +#line 1683 "frame/parser.Y" {fr->loadRGBImageChannelCmd((yyvsp[(3) - (3)].str), (yyvsp[(1) - (3)].str));;} break; case 699: -#line 1683 "frame/parser.Y" +#line 1684 "frame/parser.Y" {fr->loadRGBImageMMapCmd((yyvsp[(1) - (3)].str));;} break; case 700: -#line 1684 "frame/parser.Y" +#line 1685 "frame/parser.Y" {fr->loadRGBImageMMapIncrCmd((yyvsp[(1) - (3)].str));;} break; case 701: -#line 1686 "frame/parser.Y" +#line 1687 "frame/parser.Y" {fr->loadRGBImageShareCmd((Base::ShmType)(yyvsp[(3) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(1) - (5)].str));;} break; case 702: -#line 1687 "frame/parser.Y" +#line 1688 "frame/parser.Y" {fr->loadRGBImageSocketCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;} break; case 703: -#line 1688 "frame/parser.Y" +#line 1689 "frame/parser.Y" {fr->loadRGBImageSocketGZCmd((yyvsp[(3) - (3)].integer), (yyvsp[(1) - (3)].str));;} break; case 704: -#line 1689 "frame/parser.Y" +#line 1690 "frame/parser.Y" {fr->loadRGBImageVarCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str));;} break; case 705: -#line 1693 "frame/parser.Y" +#line 1694 "frame/parser.Y" {fr->loadNRRDAllocCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 706: -#line 1695 "frame/parser.Y" +#line 1696 "frame/parser.Y" {fr->loadNRRDChannelCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 707: -#line 1696 "frame/parser.Y" +#line 1697 "frame/parser.Y" {fr->loadNRRDMMapCmd((yyvsp[(1) - (3)].str), (Base::LayerType)(yyvsp[(3) - (3)].integer));;} break; case 708: -#line 1698 "frame/parser.Y" +#line 1699 "frame/parser.Y" {fr->loadNRRDShareCmd((Base::ShmType)(yyvsp[(3) - (5)].integer), (yyvsp[(4) - (5)].integer), (yyvsp[(1) - (5)].str), (Base::LayerType)(yyvsp[(5) - (5)].integer));;} break; case 709: -#line 1700 "frame/parser.Y" +#line 1701 "frame/parser.Y" {fr->loadNRRDSocketCmd((yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 710: -#line 1702 "frame/parser.Y" +#line 1703 "frame/parser.Y" {fr->loadNRRDVarCmd((yyvsp[(3) - (4)].str), (yyvsp[(1) - (4)].str), (Base::LayerType)(yyvsp[(4) - (4)].integer));;} break; case 711: -#line 1705 "frame/parser.Y" +#line 1706 "frame/parser.Y" {fr->loadPhotoCmd((yyvsp[(1) - (2)].str),(yyvsp[(2) - (2)].str));;} break; case 712: -#line 1706 "frame/parser.Y" +#line 1707 "frame/parser.Y" {fr->loadSlicePhotoCmd((yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].str));;} break; case 713: -#line 1709 "frame/parser.Y" +#line 1710 "frame/parser.Y" {fr->loadIncrDataCmd((yyvsp[(2) - (6)].integer),(yyvsp[(3) - (6)].integer),(yyvsp[(4) - (6)].integer),(yyvsp[(5) - (6)].integer),(yyvsp[(6) - (6)].integer));;} break; case 714: -#line 1710 "frame/parser.Y" +#line 1711 "frame/parser.Y" {fr->loadIncrMinMaxCmd((yyvsp[(2) - (6)].integer),(yyvsp[(3) - (6)].integer),(yyvsp[(4) - (6)].integer),(yyvsp[(5) - (6)].integer),(yyvsp[(6) - (6)].integer));;} break; case 715: -#line 1711 "frame/parser.Y" +#line 1712 "frame/parser.Y" {fr->loadIncrEndCmd();;} break; case 716: -#line 1714 "frame/parser.Y" +#line 1715 "frame/parser.Y" { #ifdef MAC_OSX_TK fr->macosxPrintCmd(); @@ -8197,42 +8198,42 @@ yyreduce: break; case 717: -#line 1721 "frame/parser.Y" +#line 1722 "frame/parser.Y" {fr->magnifierCmd((yyvsp[(1) - (1)].integer));;} break; case 718: -#line 1722 "frame/parser.Y" +#line 1723 "frame/parser.Y" {fr->magnifierGraphicsCmd((yyvsp[(2) - (2)].integer));;} break; case 719: -#line 1723 "frame/parser.Y" +#line 1724 "frame/parser.Y" {fr->magnifierCursorCmd((yyvsp[(2) - (2)].integer));;} break; case 720: -#line 1724 "frame/parser.Y" +#line 1725 "frame/parser.Y" {fr->magnifierColorCmd((yyvsp[(2) - (2)].str));;} break; case 721: -#line 1725 "frame/parser.Y" +#line 1726 "frame/parser.Y" {fr->magnifierCmd((yyvsp[(1) - (3)].str), (yyvsp[(2) - (3)].integer), (yyvsp[(3) - (3)].integer));;} break; case 722: -#line 1726 "frame/parser.Y" +#line 1727 "frame/parser.Y" {fr->updateMagnifierCmd(Vector((yyvsp[(2) - (3)].real), (yyvsp[(3) - (3)].real)));;} break; case 723: -#line 1727 "frame/parser.Y" +#line 1728 "frame/parser.Y" {fr->magnifierZoomCmd((yyvsp[(2) - (2)].real));;} break; case 724: -#line 1731 "frame/parser.Y" +#line 1732 "frame/parser.Y" { fr->matchCmd((yyvsp[(1) - (12)].str),(yyvsp[(2) - (12)].str),(Coord::CoordSystem)(yyvsp[(3) - (12)].integer),(Coord::SkyFrame)(yyvsp[(4) - (12)].integer), (yyvsp[(5) - (12)].str),(yyvsp[(6) - (12)].str),(Coord::CoordSystem)(yyvsp[(7) - (12)].integer),(Coord::SkyFrame)(yyvsp[(8) - (12)].integer), @@ -8242,869 +8243,869 @@ yyreduce: break; case 726: -#line 1739 "frame/parser.Y" +#line 1740 "frame/parser.Y" {fr->markerColorCmd((yyvsp[(2) - (2)].str));;} break; case 727: -#line 1740 "frame/parser.Y" +#line 1741 "frame/parser.Y" {fr->markerCopyCmd();;} break; case 728: -#line 1742 "frame/parser.Y" +#line 1743 "frame/parser.Y" {fr->markerCommandCmd((Base::MarkerFormat)(yyvsp[(2) - (3)].integer),(yyvsp[(3) - (3)].str));;} break; case 729: -#line 1744 "frame/parser.Y" +#line 1745 "frame/parser.Y" {fr->markerCommandVarCmd((Base::MarkerFormat)(yyvsp[(2) - (4)].integer),(yyvsp[(4) - (4)].str));;} break; case 730: -#line 1745 "frame/parser.Y" +#line 1746 "frame/parser.Y" {fr->markerCompositeDeleteCmd();;} break; case 731: -#line 1746 "frame/parser.Y" +#line 1747 "frame/parser.Y" {maperr =0;;} break; case 733: -#line 1747 "frame/parser.Y" +#line 1748 "frame/parser.Y" {fr->markerCutCmd();;} break; case 734: -#line 1748 "frame/parser.Y" +#line 1749 "frame/parser.Y" {fr->markerDeleteCmd();;} break; case 735: -#line 1749 "frame/parser.Y" +#line 1750 "frame/parser.Y" {fr->markerDeleteAllCmd();;} break; case 737: -#line 1751 "frame/parser.Y" +#line 1752 "frame/parser.Y" {fr->markerEpsilonCmd((yyvsp[(2) - (2)].integer));;} break; case 738: -#line 1752 "frame/parser.Y" +#line 1753 "frame/parser.Y" {fr->markerFontCmd((yyvsp[(2) - (2)].str));;} break; case 739: -#line 1754 "frame/parser.Y" +#line 1755 "frame/parser.Y" {fr->markerHighliteAllCmd();;} break; case 740: -#line 1756 "frame/parser.Y" +#line 1757 "frame/parser.Y" {fr->markerHighliteOnlyCmd(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;} break; case 741: -#line 1758 "frame/parser.Y" +#line 1759 "frame/parser.Y" {fr->markerHighliteToggleCmd(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;} break; case 742: -#line 1761 "frame/parser.Y" +#line 1762 "frame/parser.Y" {fr->markerAnalysisCmd((yyvsp[(1) - (4)].integer), (Marker::AnalysisTask)(yyvsp[(3) - (4)].integer), (yyvsp[(4) - (4)].integer));;} break; case 743: -#line 1763 "frame/parser.Y" +#line 1764 "frame/parser.Y" {fr->markerAngleCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].real));;} break; case 744: -#line 1764 "frame/parser.Y" +#line 1765 "frame/parser.Y" {fr->markerAngleCmd((yyvsp[(1) - (4)].integer),(yyvsp[(3) - (4)].real));;} break; case 745: -#line 1766 "frame/parser.Y" +#line 1767 "frame/parser.Y" {fr->markerAngleCmd((yyvsp[(1) - (5)].integer),(yyvsp[(3) - (5)].real),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyFrame)(yyvsp[(5) - (5)].integer));;} break; case 746: -#line 1769 "frame/parser.Y" +#line 1770 "frame/parser.Y" {fr->markerAnnulusRadiusCmd((yyvsp[(1) - (8)].integer), (yyvsp[(4) - (8)].real), (yyvsp[(5) - (8)].real), (yyvsp[(6) - (8)].integer), (Coord::CoordSystem)(yyvsp[(7) - (8)].integer), (Coord::DistFormat)(yyvsp[(8) - (8)].integer));;} break; case 747: -#line 1772 "frame/parser.Y" +#line 1773 "frame/parser.Y" {fr->markerAnnulusRadiusCmd((yyvsp[(1) - (6)].integer), (yyvsp[(4) - (6)].str),(Coord::CoordSystem)(yyvsp[(5) - (6)].integer),(Coord::DistFormat)(yyvsp[(6) - (6)].integer));;} break; case 748: -#line 1774 "frame/parser.Y" +#line 1775 "frame/parser.Y" {fr->markerBoxFillCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 749: -#line 1777 "frame/parser.Y" +#line 1778 "frame/parser.Y" {fr->markerBoxAnnulusRadiusCmd((yyvsp[(1) - (9)].integer), Vector((yyvsp[(4) - (9)].real), (yyvsp[(5) - (9)].real)), Vector((yyvsp[(6) - (9)].real), (yyvsp[(6) - (9)].real)*(yyvsp[(5) - (9)].real)/(yyvsp[(4) - (9)].real)), (yyvsp[(7) - (9)].integer), (Coord::CoordSystem)(yyvsp[(8) - (9)].integer), (Coord::DistFormat)(yyvsp[(9) - (9)].integer));;} break; case 750: -#line 1780 "frame/parser.Y" +#line 1781 "frame/parser.Y" {fr->markerBoxAnnulusRadiusCmd((yyvsp[(1) - (6)].integer),(yyvsp[(4) - (6)].str),(Coord::CoordSystem)(yyvsp[(5) - (6)].integer),(Coord::DistFormat)(yyvsp[(6) - (6)].integer));;} break; case 751: -#line 1783 "frame/parser.Y" +#line 1784 "frame/parser.Y" {fr->markerBoxRadiusCmd((yyvsp[(1) - (7)].integer), Vector((yyvsp[(4) - (7)].real),(yyvsp[(5) - (7)].real)), (Coord::CoordSystem)(yyvsp[(6) - (7)].integer), (Coord::DistFormat)(yyvsp[(7) - (7)].integer));;} break; case 752: -#line 1786 "frame/parser.Y" +#line 1787 "frame/parser.Y" {fr->markerBpandaEditCmd((yyvsp[(1) - (10)].integer), (yyvsp[(4) - (10)].real), (yyvsp[(5) - (10)].real), (yyvsp[(6) - (10)].integer), Vector((yyvsp[(7) - (10)].real),(yyvsp[(8) - (10)].real)), Vector((yyvsp[(9) - (10)].real),(yyvsp[(9) - (10)].real)*(yyvsp[(8) - (10)].real)/(yyvsp[(7) - (10)].real)), (yyvsp[(10) - (10)].integer));;} break; case 753: -#line 1790 "frame/parser.Y" +#line 1791 "frame/parser.Y" {fr->markerBpandaEditCmd((yyvsp[(1) - (11)].integer), (yyvsp[(4) - (11)].real), (yyvsp[(5) - (11)].real), (yyvsp[(6) - (11)].integer), Vector((yyvsp[(7) - (11)].real),(yyvsp[(8) - (11)].real)), Vector((yyvsp[(9) - (11)].real),(yyvsp[(9) - (11)].real)*(yyvsp[(8) - (11)].real)/(yyvsp[(7) - (11)].real)), (yyvsp[(10) - (11)].integer));;} break; case 754: -#line 1794 "frame/parser.Y" +#line 1795 "frame/parser.Y" {fr->markerBpandaEditCmd((yyvsp[(1) - (12)].integer), (yyvsp[(4) - (12)].real), (yyvsp[(5) - (12)].real), (yyvsp[(6) - (12)].integer), Vector((yyvsp[(7) - (12)].real),(yyvsp[(8) - (12)].real)), Vector((yyvsp[(9) - (12)].real),(yyvsp[(9) - (12)].real)*(yyvsp[(8) - (12)].real)/(yyvsp[(7) - (12)].real)), (yyvsp[(10) - (12)].integer), (Coord::CoordSystem)(yyvsp[(11) - (12)].integer), (Coord::SkyFrame)(yyvsp[(12) - (12)].integer));;} break; case 755: -#line 1799 "frame/parser.Y" +#line 1800 "frame/parser.Y" {fr->markerBpandaEditCmd((yyvsp[(1) - (9)].integer), (yyvsp[(4) - (9)].str), (yyvsp[(5) - (9)].str), (Coord::CoordSystem)(yyvsp[(6) - (9)].integer), (Coord::SkyFrame)(yyvsp[(7) - (9)].integer), (Coord::CoordSystem)(yyvsp[(8) - (9)].integer), (Coord::DistFormat)(yyvsp[(9) - (9)].integer));;} break; case 756: -#line 1803 "frame/parser.Y" +#line 1804 "frame/parser.Y" {fr->markerCallBackCmd((yyvsp[(1) - (5)].integer),(CallBack::Type)(yyvsp[(3) - (5)].integer),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));;} break; case 757: -#line 1804 "frame/parser.Y" +#line 1805 "frame/parser.Y" {fr->markerCircleFillCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 758: -#line 1806 "frame/parser.Y" +#line 1807 "frame/parser.Y" {fr->markerCircleRadiusCmd((yyvsp[(1) - (6)].integer), (yyvsp[(4) - (6)].real), (Coord::CoordSystem)(yyvsp[(5) - (6)].integer), (Coord::DistFormat)(yyvsp[(6) - (6)].integer));;} break; case 759: -#line 1807 "frame/parser.Y" +#line 1808 "frame/parser.Y" {fr->markerColorCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].str));;} break; case 760: -#line 1809 "frame/parser.Y" +#line 1810 "frame/parser.Y" {fr->markerCompassArrowCmd((yyvsp[(1) - (5)].integer),(yyvsp[(4) - (5)].integer),(yyvsp[(5) - (5)].integer));;} break; case 761: -#line 1811 "frame/parser.Y" +#line 1812 "frame/parser.Y" {fr->markerCompassLabelCmd((yyvsp[(1) - (5)].integer),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str));;} break; case 762: -#line 1813 "frame/parser.Y" +#line 1814 "frame/parser.Y" {fr->markerCompassRadiusCmd((yyvsp[(1) - (6)].integer),(yyvsp[(4) - (6)].real),(Coord::CoordSystem)(yyvsp[(5) - (6)].integer),(Coord::DistFormat)(yyvsp[(6) - (6)].integer));;} break; case 763: -#line 1815 "frame/parser.Y" +#line 1816 "frame/parser.Y" {fr->markerCompassSystemCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyFrame)(yyvsp[(5) - (5)].integer));;} break; case 764: -#line 1816 "frame/parser.Y" +#line 1817 "frame/parser.Y" {fr->markerCompositeCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 765: -#line 1818 "frame/parser.Y" +#line 1819 "frame/parser.Y" {fr->markerCpandaEditCmd((yyvsp[(1) - (9)].integer), (yyvsp[(4) - (9)].real), (yyvsp[(5) - (9)].real), (yyvsp[(6) - (9)].integer), (yyvsp[(7) - (9)].real), (yyvsp[(8) - (9)].real), (yyvsp[(9) - (9)].integer));;} break; case 766: -#line 1820 "frame/parser.Y" +#line 1821 "frame/parser.Y" {fr->markerCpandaEditCmd((yyvsp[(1) - (10)].integer), (yyvsp[(4) - (10)].real), (yyvsp[(5) - (10)].real), (yyvsp[(6) - (10)].integer), (yyvsp[(7) - (10)].real), (yyvsp[(8) - (10)].real), (yyvsp[(9) - (10)].integer));;} break; case 767: -#line 1823 "frame/parser.Y" +#line 1824 "frame/parser.Y" {fr->markerCpandaEditCmd((yyvsp[(1) - (11)].integer), (yyvsp[(4) - (11)].real), (yyvsp[(5) - (11)].real), (yyvsp[(6) - (11)].integer), (yyvsp[(7) - (11)].real), (yyvsp[(8) - (11)].real), (yyvsp[(9) - (11)].integer), (Coord::CoordSystem)(yyvsp[(10) - (11)].integer), (Coord::SkyFrame)(yyvsp[(11) - (11)].integer));;} break; case 768: -#line 1827 "frame/parser.Y" +#line 1828 "frame/parser.Y" {fr->markerCpandaEditCmd((yyvsp[(1) - (9)].integer), (yyvsp[(4) - (9)].str), (yyvsp[(5) - (9)].str), (Coord::CoordSystem)(yyvsp[(6) - (9)].integer), (Coord::SkyFrame)(yyvsp[(7) - (9)].integer), (Coord::CoordSystem)(yyvsp[(8) - (9)].integer), (Coord::DistFormat)(yyvsp[(9) - (9)].integer));;} break; case 769: -#line 1831 "frame/parser.Y" +#line 1832 "frame/parser.Y" {fr->markerAnnulusCreateRadiusCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;} break; case 770: -#line 1833 "frame/parser.Y" +#line 1834 "frame/parser.Y" {fr->markerBoxAnnulusCreateRadiusCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;} break; case 771: -#line 1835 "frame/parser.Y" +#line 1836 "frame/parser.Y" {fr->markerBpandaCreateAnglesCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;} break; case 772: -#line 1837 "frame/parser.Y" +#line 1838 "frame/parser.Y" {fr->markerBpandaCreateRadiusCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;} break; case 773: -#line 1839 "frame/parser.Y" +#line 1840 "frame/parser.Y" {fr->markerEllipseAnnulusCreateRadiusCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;} break; case 774: -#line 1841 "frame/parser.Y" +#line 1842 "frame/parser.Y" {fr->markerEpandaCreateAnglesCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;} break; case 775: -#line 1843 "frame/parser.Y" +#line 1844 "frame/parser.Y" {fr->markerEpandaCreateRadiusCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;} break; case 776: -#line 1845 "frame/parser.Y" +#line 1846 "frame/parser.Y" {fr->markerCpandaCreateAnglesCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;} break; case 777: -#line 1847 "frame/parser.Y" +#line 1848 "frame/parser.Y" {fr->markerCpandaCreateRadiusCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)));;} break; case 778: -#line 1849 "frame/parser.Y" +#line 1850 "frame/parser.Y" {fr->markerPolygonCreateVertexCmd((yyvsp[(1) - (7)].integer),(yyvsp[(5) - (7)].integer),Vector((yyvsp[(6) - (7)].real),(yyvsp[(7) - (7)].real)));;} break; case 779: -#line 1851 "frame/parser.Y" +#line 1852 "frame/parser.Y" {fr->markerSegmentCreateVertexCmd((yyvsp[(1) - (7)].integer),(yyvsp[(5) - (7)].integer),Vector((yyvsp[(6) - (7)].real),(yyvsp[(7) - (7)].real)));;} break; case 780: -#line 1853 "frame/parser.Y" +#line 1854 "frame/parser.Y" {fr->markerDeleteCmd((yyvsp[(1) - (2)].integer));;} break; case 781: -#line 1855 "frame/parser.Y" +#line 1856 "frame/parser.Y" {fr->markerAnnulusDeleteRadiusCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 782: -#line 1857 "frame/parser.Y" +#line 1858 "frame/parser.Y" {fr->markerBoxAnnulusDeleteRadiusCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 783: -#line 1858 "frame/parser.Y" +#line 1859 "frame/parser.Y" {fr->markerBpandaDeleteCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 784: -#line 1860 "frame/parser.Y" +#line 1861 "frame/parser.Y" {fr->markerEllipseAnnulusDeleteRadiusCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 785: -#line 1862 "frame/parser.Y" +#line 1863 "frame/parser.Y" {fr->markerDeleteCallBackCmd((yyvsp[(1) - (5)].integer),(CallBack::Type)(yyvsp[(4) - (5)].integer),(yyvsp[(5) - (5)].str));;} break; case 786: -#line 1863 "frame/parser.Y" +#line 1864 "frame/parser.Y" {fr->markerEpandaDeleteCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 787: -#line 1864 "frame/parser.Y" +#line 1865 "frame/parser.Y" {fr->markerCpandaDeleteCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 788: -#line 1866 "frame/parser.Y" +#line 1867 "frame/parser.Y" {fr->markerPolygonDeleteVertexCmd((yyvsp[(1) - (5)].integer),(yyvsp[(5) - (5)].integer));;} break; case 789: -#line 1868 "frame/parser.Y" +#line 1869 "frame/parser.Y" {fr->markerSegmentDeleteVertexCmd((yyvsp[(1) - (5)].integer),(yyvsp[(5) - (5)].integer));;} break; case 790: -#line 1869 "frame/parser.Y" +#line 1870 "frame/parser.Y" {fr->markerDeleteTagCmd((yyvsp[(1) - (3)].integer));;} break; case 791: -#line 1870 "frame/parser.Y" +#line 1871 "frame/parser.Y" {fr->markerDeleteTagCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].str));;} break; case 792: -#line 1871 "frame/parser.Y" +#line 1872 "frame/parser.Y" {fr->markerDeleteTagCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 793: -#line 1873 "frame/parser.Y" +#line 1874 "frame/parser.Y" {fr->markerEditBeginCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 794: -#line 1874 "frame/parser.Y" +#line 1875 "frame/parser.Y" {fr->markerEllipseFillCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 795: -#line 1876 "frame/parser.Y" +#line 1877 "frame/parser.Y" {fr->markerEllipseRadiusCmd((yyvsp[(1) - (7)].integer), Vector((yyvsp[(4) - (7)].real), (yyvsp[(5) - (7)].real)), (Coord::CoordSystem)(yyvsp[(6) - (7)].integer), (Coord::DistFormat)(yyvsp[(7) - (7)].integer));;} break; case 796: -#line 1880 "frame/parser.Y" +#line 1881 "frame/parser.Y" {fr->markerEllipseAnnulusRadiusCmd((yyvsp[(1) - (9)].integer), Vector((yyvsp[(4) - (9)].real),(yyvsp[(5) - (9)].real)), Vector((yyvsp[(6) - (9)].real),(yyvsp[(6) - (9)].real)*(yyvsp[(5) - (9)].real)/(yyvsp[(4) - (9)].real)), (yyvsp[(7) - (9)].integer), (Coord::CoordSystem)(yyvsp[(8) - (9)].integer), (Coord::DistFormat)(yyvsp[(9) - (9)].integer));;} break; case 797: -#line 1883 "frame/parser.Y" +#line 1884 "frame/parser.Y" {fr->markerEllipseAnnulusRadiusCmd((yyvsp[(1) - (6)].integer), (yyvsp[(4) - (6)].str), (Coord::CoordSystem)(yyvsp[(5) - (6)].integer), (Coord::DistFormat)(yyvsp[(6) - (6)].integer));;} break; case 798: -#line 1886 "frame/parser.Y" +#line 1887 "frame/parser.Y" {fr->markerEpandaEditCmd((yyvsp[(1) - (10)].integer), (yyvsp[(4) - (10)].real), (yyvsp[(5) - (10)].real), (yyvsp[(6) - (10)].integer), Vector((yyvsp[(7) - (10)].real),(yyvsp[(8) - (10)].real)), Vector((yyvsp[(9) - (10)].real),(yyvsp[(9) - (10)].real)*(yyvsp[(8) - (10)].real)/(yyvsp[(7) - (10)].real)), (yyvsp[(10) - (10)].integer));;} break; case 799: -#line 1890 "frame/parser.Y" +#line 1891 "frame/parser.Y" {fr->markerEpandaEditCmd((yyvsp[(1) - (11)].integer), (yyvsp[(4) - (11)].real), (yyvsp[(5) - (11)].real), (yyvsp[(6) - (11)].integer), Vector((yyvsp[(7) - (11)].real),(yyvsp[(8) - (11)].real)), Vector((yyvsp[(9) - (11)].real),(yyvsp[(9) - (11)].real)*(yyvsp[(8) - (11)].real)/(yyvsp[(7) - (11)].real)), (yyvsp[(10) - (11)].integer));;} break; case 800: -#line 1894 "frame/parser.Y" +#line 1895 "frame/parser.Y" {fr->markerEpandaEditCmd((yyvsp[(1) - (12)].integer), (yyvsp[(4) - (12)].real), (yyvsp[(5) - (12)].real), (yyvsp[(6) - (12)].integer), Vector((yyvsp[(7) - (12)].real),(yyvsp[(8) - (12)].real)), Vector((yyvsp[(9) - (12)].real),(yyvsp[(9) - (12)].real)*(yyvsp[(8) - (12)].real)/(yyvsp[(7) - (12)].real)), (yyvsp[(10) - (12)].integer), (Coord::CoordSystem)(yyvsp[(11) - (12)].integer), (Coord::SkyFrame)(yyvsp[(12) - (12)].integer));;} break; case 801: -#line 1899 "frame/parser.Y" +#line 1900 "frame/parser.Y" {fr->markerEpandaEditCmd((yyvsp[(1) - (9)].integer), (yyvsp[(4) - (9)].str), (yyvsp[(5) - (9)].str), (Coord::CoordSystem)(yyvsp[(6) - (9)].integer), (Coord::SkyFrame)(yyvsp[(7) - (9)].integer), (Coord::CoordSystem)(yyvsp[(8) - (9)].integer), (Coord::DistFormat)(yyvsp[(9) - (9)].integer));;} break; case 802: -#line 1903 "frame/parser.Y" +#line 1904 "frame/parser.Y" {fr->markerFontCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].str));;} break; case 803: -#line 1904 "frame/parser.Y" +#line 1905 "frame/parser.Y" {fr->markerHighliteCmd((yyvsp[(1) - (2)].integer));;} break; case 804: -#line 1905 "frame/parser.Y" +#line 1906 "frame/parser.Y" {fr->markerHighliteOnlyCmd((yyvsp[(1) - (3)].integer));;} break; case 805: -#line 1907 "frame/parser.Y" +#line 1908 "frame/parser.Y" {fr->markerLineArrowCmd((yyvsp[(1) - (5)].integer),(yyvsp[(4) - (5)].integer),(yyvsp[(5) - (5)].integer));;} break; case 806: -#line 1909 "frame/parser.Y" +#line 1910 "frame/parser.Y" {fr->markerLineCmd((yyvsp[(1) - (7)].integer), Vector((yyvsp[(6) - (7)].vector)), Vector((yyvsp[(7) - (7)].vector)), (Coord::CoordSystem)(yyvsp[(4) - (7)].integer), (Coord::SkyFrame)(yyvsp[(5) - (7)].integer));;} break; case 807: -#line 1913 "frame/parser.Y" +#line 1914 "frame/parser.Y" {fr->markerMoveCmd((yyvsp[(1) - (4)].integer), Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;} break; case 808: -#line 1914 "frame/parser.Y" +#line 1915 "frame/parser.Y" {fr->markerFrontCmd((yyvsp[(1) - (3)].integer));;} break; case 809: -#line 1915 "frame/parser.Y" +#line 1916 "frame/parser.Y" {fr->markerBackCmd((yyvsp[(1) - (3)].integer));;} break; case 810: -#line 1917 "frame/parser.Y" +#line 1918 "frame/parser.Y" {fr->markerMoveToCmd((yyvsp[(1) - (6)].integer),Vector((yyvsp[(6) - (6)].vector)),(Coord::CoordSystem)(yyvsp[(4) - (6)].integer),(Coord::SkyFrame)(yyvsp[(5) - (6)].integer));;} break; case 811: -#line 1920 "frame/parser.Y" +#line 1921 "frame/parser.Y" {fr->markerPolygonResetCmd((yyvsp[(1) - (7)].integer), Vector((yyvsp[(4) - (7)].real),(yyvsp[(5) - (7)].real)), (Coord::CoordSystem)(yyvsp[(6) - (7)].integer), (Coord::DistFormat)(yyvsp[(7) - (7)].integer));;} break; case 812: -#line 1923 "frame/parser.Y" +#line 1924 "frame/parser.Y" {fr->markerSegmentResetCmd((yyvsp[(1) - (7)].integer), Vector((yyvsp[(4) - (7)].real),(yyvsp[(5) - (7)].real)), (Coord::CoordSystem)(yyvsp[(6) - (7)].integer), (Coord::DistFormat)(yyvsp[(7) - (7)].integer));;} break; case 813: -#line 1926 "frame/parser.Y" +#line 1927 "frame/parser.Y" {fr->markerPointShapeCmd((yyvsp[(1) - (4)].integer),(Point::PointShape)(yyvsp[(4) - (4)].integer));;} break; case 814: -#line 1927 "frame/parser.Y" +#line 1928 "frame/parser.Y" {fr->markerPointSizeCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 815: -#line 1929 "frame/parser.Y" +#line 1930 "frame/parser.Y" {fr->markerPolygonFillCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 816: -#line 1932 "frame/parser.Y" +#line 1933 "frame/parser.Y" {fr->markerProjectionCmd((yyvsp[(1) - (9)].integer), Vector((yyvsp[(5) - (9)].vector)), Vector((yyvsp[(6) - (9)].vector)), (Coord::CoordSystem)(yyvsp[(3) - (9)].integer), (Coord::SkyFrame)(yyvsp[(4) - (9)].integer), (yyvsp[(7) - (9)].real), (Coord::CoordSystem)(yyvsp[(8) - (9)].integer), (Coord::DistFormat)(yyvsp[(9) - (9)].integer));;} break; case 817: -#line 1936 "frame/parser.Y" +#line 1937 "frame/parser.Y" {fr->markerPropertyCmd((yyvsp[(1) - (4)].integer),(yyvsp[(3) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 818: -#line 1938 "frame/parser.Y" +#line 1939 "frame/parser.Y" {fr->markerRotateBeginCmd((yyvsp[(1) - (3)].integer));;} break; case 819: -#line 1939 "frame/parser.Y" +#line 1940 "frame/parser.Y" {fr->markerRulerDistSpecCmd((yyvsp[(1) - (4)].integer), (yyvsp[(4) - (4)].str));;} break; case 820: -#line 1941 "frame/parser.Y" +#line 1942 "frame/parser.Y" {fr->markerRulerPointCmd((yyvsp[(1) - (7)].integer), Vector((yyvsp[(6) - (7)].vector)), Vector((yyvsp[(7) - (7)].vector)), (Coord::CoordSystem)(yyvsp[(4) - (7)].integer), (Coord::SkyFrame)(yyvsp[(5) - (7)].integer));;} break; case 821: -#line 1944 "frame/parser.Y" +#line 1945 "frame/parser.Y" {fr->markerRulerSystemCmd((yyvsp[(1) - (7)].integer), (Coord::CoordSystem)(yyvsp[(4) - (7)].integer), (Coord::SkyFrame)(yyvsp[(5) - (7)].integer), (Coord::CoordSystem)(yyvsp[(6) - (7)].integer), (Coord::DistFormat)(yyvsp[(7) - (7)].integer));;} break; case 822: -#line 1947 "frame/parser.Y" +#line 1948 "frame/parser.Y" {fr->markerSelectCmd((yyvsp[(1) - (2)].integer));;} break; case 823: -#line 1948 "frame/parser.Y" +#line 1949 "frame/parser.Y" {fr->markerSelectOnlyCmd((yyvsp[(1) - (3)].integer));;} break; case 824: -#line 1950 "frame/parser.Y" +#line 1951 "frame/parser.Y" {fr->markerTagCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].str));;} break; case 825: -#line 1951 "frame/parser.Y" +#line 1952 "frame/parser.Y" {fr->markerTextCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].str));;} break; case 826: -#line 1952 "frame/parser.Y" +#line 1953 "frame/parser.Y" {fr->markerTextRotateCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 827: -#line 1954 "frame/parser.Y" +#line 1955 "frame/parser.Y" {fr->markerUnhighliteCmd((yyvsp[(1) - (2)].integer));;} break; case 828: -#line 1955 "frame/parser.Y" +#line 1956 "frame/parser.Y" {fr->markerUnselectCmd((yyvsp[(1) - (2)].integer));;} break; case 829: -#line 1957 "frame/parser.Y" +#line 1958 "frame/parser.Y" {fr->markerVectorArrowCmd((yyvsp[(1) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 830: -#line 1960 "frame/parser.Y" +#line 1961 "frame/parser.Y" {fr->markerVectorCmd((yyvsp[(1) - (10)].integer), Vector((yyvsp[(6) - (10)].vector)), (Coord::CoordSystem)(yyvsp[(4) - (10)].integer), (Coord::SkyFrame)(yyvsp[(5) - (10)].integer), (yyvsp[(9) - (10)].real), (Coord::CoordSystem)(yyvsp[(7) - (10)].integer), (Coord::DistFormat)(yyvsp[(8) - (10)].integer), (yyvsp[(10) - (10)].real));;} break; case 831: -#line 1963 "frame/parser.Y" +#line 1964 "frame/parser.Y" {fr->markerLineWidthCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].integer));;} break; case 832: -#line 1965 "frame/parser.Y" +#line 1966 "frame/parser.Y" {fr->markerKeyCmd();;} break; case 833: -#line 1966 "frame/parser.Y" +#line 1967 "frame/parser.Y" {fr->markerKeyCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} break; case 837: -#line 1971 "frame/parser.Y" +#line 1972 "frame/parser.Y" {fr->markerPreserveCmd((yyvsp[(2) - (2)].integer));;} break; case 838: -#line 1972 "frame/parser.Y" +#line 1973 "frame/parser.Y" {fr->markerPropertyCmd((yyvsp[(2) - (3)].integer),(yyvsp[(3) - (3)].integer));;} break; case 839: -#line 1974 "frame/parser.Y" +#line 1975 "frame/parser.Y" {fr->markerPropertyCmd((yyvsp[(2) - (5)].integer),(yyvsp[(3) - (5)].integer),Vector((yyvsp[(4) - (5)].real),(yyvsp[(5) - (5)].real)));;} break; case 840: -#line 1976 "frame/parser.Y" +#line 1977 "frame/parser.Y" {fr->markerRotateBeginCmd(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;} break; case 841: -#line 1978 "frame/parser.Y" +#line 1979 "frame/parser.Y" {fr->markerRotateMotionCmd(Vector((yyvsp[(3) - (5)].real),(yyvsp[(4) - (5)].real)),(yyvsp[(5) - (5)].integer));;} break; case 842: -#line 1979 "frame/parser.Y" +#line 1980 "frame/parser.Y" {fr->markerRotateEndCmd();;} break; case 843: -#line 1981 "frame/parser.Y" +#line 1982 "frame/parser.Y" {fr->markerSaveCmd((yyvsp[(2) - (7)].str), (Base::MarkerFormat)(yyvsp[(3) - (7)].integer), (Coord::CoordSystem)(yyvsp[(4) - (7)].integer), (Coord::SkyFrame)(yyvsp[(5) - (7)].integer), (Coord::SkyFormat)(yyvsp[(6) - (7)].integer), (yyvsp[(7) - (7)].integer));;} break; case 844: -#line 1982 "frame/parser.Y" +#line 1983 "frame/parser.Y" {fr->markerSaveTemplateCmd((yyvsp[(3) - (3)].str));;} break; case 847: -#line 1987 "frame/parser.Y" +#line 1988 "frame/parser.Y" {fr->markerColorCmd((yyvsp[(1) - (3)].str),(yyvsp[(3) - (3)].str));;} break; case 848: -#line 1988 "frame/parser.Y" +#line 1989 "frame/parser.Y" {fr->markerCopyCmd((yyvsp[(1) - (2)].str));;} break; case 849: -#line 1989 "frame/parser.Y" +#line 1990 "frame/parser.Y" {fr->markerDeleteCmd((yyvsp[(1) - (2)].str));;} break; case 850: -#line 1990 "frame/parser.Y" +#line 1991 "frame/parser.Y" {fr->markerCutCmd((yyvsp[(1) - (2)].str));;} break; case 851: -#line 1991 "frame/parser.Y" +#line 1992 "frame/parser.Y" {fr->markerFontCmd((yyvsp[(1) - (3)].str),(yyvsp[(3) - (3)].str));;} break; case 852: -#line 1992 "frame/parser.Y" +#line 1993 "frame/parser.Y" {fr->markerHighliteCmd((yyvsp[(1) - (2)].str));;} break; case 853: -#line 1993 "frame/parser.Y" +#line 1994 "frame/parser.Y" {fr->markerHighliteOnlyCmd((yyvsp[(1) - (3)].str));;} break; case 854: -#line 1994 "frame/parser.Y" +#line 1995 "frame/parser.Y" {fr->markerMoveCmd((yyvsp[(1) - (4)].str),Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;} break; case 855: -#line 1995 "frame/parser.Y" +#line 1996 "frame/parser.Y" {fr->markerFrontCmd((yyvsp[(1) - (3)].str));;} break; case 856: -#line 1996 "frame/parser.Y" +#line 1997 "frame/parser.Y" {fr->markerBackCmd((yyvsp[(1) - (3)].str));;} break; case 857: -#line 1998 "frame/parser.Y" +#line 1999 "frame/parser.Y" {fr->markerMoveToCmd((yyvsp[(1) - (6)].str),Vector((yyvsp[(6) - (6)].vector)),(Coord::CoordSystem)(yyvsp[(4) - (6)].integer),(Coord::SkyFrame)(yyvsp[(5) - (6)].integer));;} break; case 858: -#line 2000 "frame/parser.Y" +#line 2001 "frame/parser.Y" {fr->markerPropertyCmd((yyvsp[(1) - (4)].str),(yyvsp[(3) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 859: -#line 2001 "frame/parser.Y" +#line 2002 "frame/parser.Y" {fr->markerSelectCmd((yyvsp[(1) - (2)].str));;} break; case 860: -#line 2002 "frame/parser.Y" +#line 2003 "frame/parser.Y" {fr->markerSelectOnlyCmd((yyvsp[(1) - (3)].str));;} break; case 861: -#line 2003 "frame/parser.Y" +#line 2004 "frame/parser.Y" {fr->markerUnhighliteCmd((yyvsp[(1) - (2)].str));;} break; case 862: -#line 2004 "frame/parser.Y" +#line 2005 "frame/parser.Y" {fr->markerUnselectCmd((yyvsp[(1) - (2)].str));;} break; case 863: -#line 2006 "frame/parser.Y" +#line 2007 "frame/parser.Y" {fr->markerTagEditCmd((yyvsp[(3) - (4)].str),(yyvsp[(4) - (4)].str));;} break; case 864: -#line 2007 "frame/parser.Y" +#line 2008 "frame/parser.Y" {fr->markerTagDeleteCmd((yyvsp[(3) - (3)].str));;} break; case 865: -#line 2008 "frame/parser.Y" +#line 2009 "frame/parser.Y" {fr->markerTagDeleteAllCmd();;} break; case 866: -#line 2009 "frame/parser.Y" +#line 2010 "frame/parser.Y" {fr->markerTagCmd((yyvsp[(2) - (2)].str));;} break; case 867: -#line 2010 "frame/parser.Y" +#line 2011 "frame/parser.Y" {fr->markerTagUpdateCmd((yyvsp[(3) - (3)].str));;} break; case 868: -#line 2012 "frame/parser.Y" +#line 2013 "frame/parser.Y" {fr->markerPasteCmd();;} break; case 869: -#line 2013 "frame/parser.Y" +#line 2014 "frame/parser.Y" {fr->markerPasteCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;} break; case 870: -#line 2014 "frame/parser.Y" +#line 2015 "frame/parser.Y" {fr->markerUndoCmd();;} break; case 871: -#line 2015 "frame/parser.Y" +#line 2016 "frame/parser.Y" {fr->markerUnhighliteAllCmd();;} break; case 872: -#line 2016 "frame/parser.Y" +#line 2017 "frame/parser.Y" {fr->markerUnselectAllCmd();;} break; case 873: -#line 2017 "frame/parser.Y" +#line 2018 "frame/parser.Y" {fr->markerLineWidthCmd((yyvsp[(2) - (2)].integer));;} break; case 874: -#line 2020 "frame/parser.Y" +#line 2021 "frame/parser.Y" {(yyval.integer) = CallBack::SELECTCB;;} break; case 875: -#line 2021 "frame/parser.Y" +#line 2022 "frame/parser.Y" {(yyval.integer) = CallBack::UNSELECTCB;;} break; case 876: -#line 2022 "frame/parser.Y" +#line 2023 "frame/parser.Y" {(yyval.integer) = CallBack::HIGHLITECB;;} break; case 877: -#line 2023 "frame/parser.Y" +#line 2024 "frame/parser.Y" {(yyval.integer) = CallBack::UNHIGHLITECB;;} break; case 878: -#line 2024 "frame/parser.Y" +#line 2025 "frame/parser.Y" {(yyval.integer) = CallBack::MOVEBEGINCB;;} break; case 879: -#line 2025 "frame/parser.Y" +#line 2026 "frame/parser.Y" {(yyval.integer) = CallBack::MOVECB;;} break; case 880: -#line 2026 "frame/parser.Y" +#line 2027 "frame/parser.Y" {(yyval.integer) = CallBack::MOVEENDCB;;} break; case 881: -#line 2027 "frame/parser.Y" +#line 2028 "frame/parser.Y" {(yyval.integer) = CallBack::EDITBEGINCB;;} break; case 882: -#line 2028 "frame/parser.Y" +#line 2029 "frame/parser.Y" {(yyval.integer) = CallBack::EDITCB;;} break; case 883: -#line 2029 "frame/parser.Y" +#line 2030 "frame/parser.Y" {(yyval.integer) = CallBack::EDITENDCB;;} break; case 884: -#line 2030 "frame/parser.Y" +#line 2031 "frame/parser.Y" {(yyval.integer) = CallBack::ROTATEBEGINCB;;} break; case 885: -#line 2031 "frame/parser.Y" +#line 2032 "frame/parser.Y" {(yyval.integer) = CallBack::ROTATECB;;} break; case 886: -#line 2032 "frame/parser.Y" +#line 2033 "frame/parser.Y" {(yyval.integer) = CallBack::ROTATEENDCB;;} break; case 887: -#line 2033 "frame/parser.Y" +#line 2034 "frame/parser.Y" {(yyval.integer) = CallBack::DELETECB;;} break; case 888: -#line 2034 "frame/parser.Y" +#line 2035 "frame/parser.Y" {(yyval.integer) = CallBack::TEXTCB;;} break; case 889: -#line 2035 "frame/parser.Y" +#line 2036 "frame/parser.Y" {(yyval.integer) = CallBack::COLORCB;;} break; case 890: -#line 2036 "frame/parser.Y" +#line 2037 "frame/parser.Y" {(yyval.integer) = CallBack::LINEWIDTHCB;;} break; case 891: -#line 2037 "frame/parser.Y" +#line 2038 "frame/parser.Y" {(yyval.integer) = CallBack::PROPERTYCB;;} break; case 892: -#line 2038 "frame/parser.Y" +#line 2039 "frame/parser.Y" {(yyval.integer) = CallBack::FONTCB;;} break; case 893: -#line 2039 "frame/parser.Y" +#line 2040 "frame/parser.Y" {(yyval.integer) = CallBack::KEYCB;;} break; case 894: -#line 2040 "frame/parser.Y" +#line 2041 "frame/parser.Y" {(yyval.integer) = CallBack::UPDATECB;;} break; case 895: -#line 2043 "frame/parser.Y" +#line 2044 "frame/parser.Y" {fr->markerCentroidCmd();;} break; case 896: -#line 2044 "frame/parser.Y" +#line 2045 "frame/parser.Y" {fr->markerCentroidCmd((yyvsp[(1) - (1)].integer));;} break; case 897: -#line 2045 "frame/parser.Y" +#line 2046 "frame/parser.Y" {fr->markerCentroidAutoCmd((yyvsp[(2) - (2)].integer));;} break; case 898: -#line 2046 "frame/parser.Y" +#line 2047 "frame/parser.Y" {fr->markerCentroidRadiusCmd((yyvsp[(2) - (2)].real));;} break; case 899: -#line 2047 "frame/parser.Y" +#line 2048 "frame/parser.Y" {fr->markerCentroidIterationCmd((yyvsp[(2) - (2)].integer));;} break; case 900: -#line 2049 "frame/parser.Y" +#line 2050 "frame/parser.Y" { fr->markerCentroidIterationCmd((yyvsp[(2) - (3)].integer)); fr->markerCentroidRadiusCmd((yyvsp[(3) - (3)].real)); @@ -9112,7 +9113,7 @@ yyreduce: break; case 901: -#line 2059 "frame/parser.Y" +#line 2060 "frame/parser.Y" {fr->createCircleCmd(fr->mapToRef(Vector((yyvsp[(2) - (5)].real),(yyvsp[(3) - (5)].real)),Coord::CANVAS), (yyvsp[(4) - (5)].real), 0, currentColor,currentDash,currentWidth,currentFont, @@ -9120,7 +9121,7 @@ yyreduce: break; case 902: -#line 2067 "frame/parser.Y" +#line 2068 "frame/parser.Y" {fr->createEllipseCmd(fr->mapToRef(Vector((yyvsp[(2) - (7)].real),(yyvsp[(3) - (7)].real)),Coord::CANVAS), Vector((yyvsp[(4) - (7)].real),(yyvsp[(5) - (7)].real)), (yyvsp[(6) - (7)].real), 0, @@ -9129,7 +9130,7 @@ yyreduce: break; case 903: -#line 2076 "frame/parser.Y" +#line 2077 "frame/parser.Y" {fr->createBoxCmd(fr->mapToRef(Vector((yyvsp[(2) - (7)].real),(yyvsp[(3) - (7)].real)),Coord::CANVAS), Vector((yyvsp[(4) - (7)].real),(yyvsp[(5) - (7)].real)), (yyvsp[(6) - (7)].real), 0, @@ -9138,7 +9139,7 @@ yyreduce: break; case 904: -#line 2084 "frame/parser.Y" +#line 2085 "frame/parser.Y" {fr->createPolygonCmd(fr->mapToRef(Vector((yyvsp[(2) - (6)].real),(yyvsp[(3) - (6)].real)),Coord::CANVAS), Vector((yyvsp[(4) - (6)].real),(yyvsp[(5) - (6)].real)), 0, currentColor,currentDash,currentWidth,currentFont, @@ -9146,7 +9147,7 @@ yyreduce: break; case 905: -#line 2091 "frame/parser.Y" +#line 2092 "frame/parser.Y" {fr->createSegmentCmd(fr->mapToRef(Vector((yyvsp[(2) - (6)].real),(yyvsp[(3) - (6)].real)),Coord::CANVAS), Vector((yyvsp[(4) - (6)].real),(yyvsp[(5) - (6)].real)), currentColor,currentDash,currentWidth,currentFont, @@ -9154,7 +9155,7 @@ yyreduce: break; case 906: -#line 2098 "frame/parser.Y" +#line 2099 "frame/parser.Y" {fr->createLineCmd(fr->mapToRef(Vector((yyvsp[(2) - (6)].real),(yyvsp[(3) - (6)].real)),Coord::CANVAS), fr->mapToRef(Vector((yyvsp[(4) - (6)].real),(yyvsp[(5) - (6)].real)),Coord::CANVAS), 0, 0, @@ -9163,7 +9164,7 @@ yyreduce: break; case 907: -#line 2106 "frame/parser.Y" +#line 2107 "frame/parser.Y" {fr->createVectCmd(fr->mapToRef(Vector((yyvsp[(2) - (6)].real),(yyvsp[(3) - (6)].real)),Coord::CANVAS), fr->mapToRef(Vector((yyvsp[(4) - (6)].real),(yyvsp[(5) - (6)].real)),Coord::CANVAS), 1, @@ -9172,7 +9173,7 @@ yyreduce: break; case 908: -#line 2114 "frame/parser.Y" +#line 2115 "frame/parser.Y" {fr->createTextCmd(fr->mapToRef(Vector((yyvsp[(2) - (5)].real),(yyvsp[(3) - (5)].real)),Coord::CANVAS), (yyvsp[(4) - (5)].real), 1, currentColor,currentDash,currentWidth,currentFont, @@ -9180,7 +9181,7 @@ yyreduce: break; case 909: -#line 2119 "frame/parser.Y" +#line 2120 "frame/parser.Y" {fr->createPointCmd(fr->mapToRef(Vector((yyvsp[(3) - (6)].real),(yyvsp[(4) - (6)].real)),Coord::CANVAS), Point::CIRCLE, (yyvsp[(5) - (6)].integer), currentColor,currentDash,currentWidth,currentFont, @@ -9188,7 +9189,7 @@ yyreduce: break; case 910: -#line 2124 "frame/parser.Y" +#line 2125 "frame/parser.Y" {fr->createPointCmd(fr->mapToRef(Vector((yyvsp[(3) - (6)].real),(yyvsp[(4) - (6)].real)),Coord::CANVAS), Point::BOX, (yyvsp[(5) - (6)].integer), currentColor,currentDash,currentWidth,currentFont, @@ -9196,7 +9197,7 @@ yyreduce: break; case 911: -#line 2129 "frame/parser.Y" +#line 2130 "frame/parser.Y" {fr->createPointCmd(fr->mapToRef(Vector((yyvsp[(3) - (6)].real),(yyvsp[(4) - (6)].real)),Coord::CANVAS), Point::DIAMOND, (yyvsp[(5) - (6)].integer), currentColor,currentDash,currentWidth,currentFont, @@ -9204,7 +9205,7 @@ yyreduce: break; case 912: -#line 2134 "frame/parser.Y" +#line 2135 "frame/parser.Y" {fr->createPointCmd(fr->mapToRef(Vector((yyvsp[(3) - (6)].real),(yyvsp[(4) - (6)].real)),Coord::CANVAS), Point::CROSS, (yyvsp[(5) - (6)].integer), currentColor,currentDash,currentWidth,currentFont, @@ -9212,7 +9213,7 @@ yyreduce: break; case 913: -#line 2139 "frame/parser.Y" +#line 2140 "frame/parser.Y" {fr->createPointCmd(fr->mapToRef(Vector((yyvsp[(3) - (6)].real),(yyvsp[(4) - (6)].real)),Coord::CANVAS), Point::EX, (yyvsp[(5) - (6)].integer), currentColor,currentDash,currentWidth,currentFont, @@ -9220,7 +9221,7 @@ yyreduce: break; case 914: -#line 2144 "frame/parser.Y" +#line 2145 "frame/parser.Y" {fr->createPointCmd(fr->mapToRef(Vector((yyvsp[(3) - (6)].real),(yyvsp[(4) - (6)].real)),Coord::CANVAS), Point::ARROW, (yyvsp[(5) - (6)].integer), currentColor,currentDash,currentWidth,currentFont, @@ -9228,7 +9229,7 @@ yyreduce: break; case 915: -#line 2149 "frame/parser.Y" +#line 2150 "frame/parser.Y" {fr->createPointCmd(fr->mapToRef(Vector((yyvsp[(3) - (6)].real),(yyvsp[(4) - (6)].real)),Coord::CANVAS), Point::BOXCIRCLE, (yyvsp[(5) - (6)].integer), currentColor,currentDash,currentWidth,currentFont, @@ -9236,7 +9237,7 @@ yyreduce: break; case 916: -#line 2158 "frame/parser.Y" +#line 2159 "frame/parser.Y" {fr->createRulerCmd(fr->mapToRef(Vector((yyvsp[(2) - (11)].real),(yyvsp[(3) - (11)].real)),Coord::CANVAS), fr->mapToRef(Vector((yyvsp[(4) - (11)].real),(yyvsp[(5) - (11)].real)),Coord::CANVAS), (Coord::CoordSystem)(yyvsp[(6) - (11)].integer), (Coord::SkyFrame)(yyvsp[(7) - (11)].integer), @@ -9246,7 +9247,7 @@ yyreduce: break; case 917: -#line 2168 "frame/parser.Y" +#line 2169 "frame/parser.Y" {fr->createCompassCmd(fr->mapToRef(Vector((yyvsp[(2) - (7)].real),(yyvsp[(3) - (7)].real)),Coord::CANVAS), (yyvsp[(4) - (7)].real), "N", "E", 1, 1, @@ -9256,7 +9257,7 @@ yyreduce: break; case 918: -#line 2178 "frame/parser.Y" +#line 2179 "frame/parser.Y" {fr->createProjectionCmd(fr->mapToRef(Vector((yyvsp[(2) - (7)].real),(yyvsp[(3) - (7)].real)),Coord::CANVAS), fr->mapToRef(Vector((yyvsp[(4) - (7)].real),(yyvsp[(5) - (7)].real)),Coord::CANVAS), (yyvsp[(6) - (7)].real), @@ -9265,7 +9266,7 @@ yyreduce: break; case 919: -#line 2187 "frame/parser.Y" +#line 2188 "frame/parser.Y" {fr->createAnnulusCmd(fr->mapToRef(Vector((yyvsp[(2) - (7)].real),(yyvsp[(3) - (7)].real)),Coord::CANVAS), (yyvsp[(4) - (7)].real),(yyvsp[(5) - (7)].real),(yyvsp[(6) - (7)].integer), currentColor,currentDash,currentWidth,currentFont, @@ -9273,7 +9274,7 @@ yyreduce: break; case 920: -#line 2195 "frame/parser.Y" +#line 2196 "frame/parser.Y" {fr->createEllipseAnnulusCmd(fr->mapToRef(Vector((yyvsp[(2) - (9)].real),(yyvsp[(3) - (9)].real)),Coord::CANVAS), Vector((yyvsp[(4) - (9)].real),(yyvsp[(5) - (9)].real)), Vector((yyvsp[(6) - (9)].real),(yyvsp[(6) - (9)].real)*(yyvsp[(4) - (9)].real)/(yyvsp[(5) - (9)].real)),(yyvsp[(7) - (9)].integer), @@ -9283,7 +9284,7 @@ yyreduce: break; case 921: -#line 2205 "frame/parser.Y" +#line 2206 "frame/parser.Y" {fr->createBoxAnnulusCmd(fr->mapToRef(Vector((yyvsp[(2) - (9)].real),(yyvsp[(3) - (9)].real)),Coord::CANVAS), Vector((yyvsp[(4) - (9)].real),(yyvsp[(5) - (9)].real)),Vector((yyvsp[(6) - (9)].real),(yyvsp[(6) - (9)].real)*(yyvsp[(4) - (9)].real)/(yyvsp[(5) - (9)].real)),(yyvsp[(7) - (9)].integer), (yyvsp[(8) - (9)].real), @@ -9292,7 +9293,7 @@ yyreduce: break; case 922: -#line 2215 "frame/parser.Y" +#line 2216 "frame/parser.Y" {fr->createCpandaCmd(fr->mapToRef(Vector((yyvsp[(2) - (10)].real),(yyvsp[(3) - (10)].real)),Coord::CANVAS), (yyvsp[(4) - (10)].real),(yyvsp[(5) - (10)].real),(yyvsp[(6) - (10)].integer), (yyvsp[(7) - (10)].real),(yyvsp[(8) - (10)].real),(yyvsp[(9) - (10)].integer), @@ -9301,7 +9302,7 @@ yyreduce: break; case 923: -#line 2225 "frame/parser.Y" +#line 2226 "frame/parser.Y" {fr->createEpandaCmd(fr->mapToRef(Vector((yyvsp[(2) - (12)].real),(yyvsp[(3) - (12)].real)),Coord::CANVAS), (yyvsp[(4) - (12)].real),(yyvsp[(5) - (12)].real),(yyvsp[(6) - (12)].integer), Vector((yyvsp[(7) - (12)].real),(yyvsp[(8) - (12)].real)), @@ -9312,7 +9313,7 @@ yyreduce: break; case 924: -#line 2237 "frame/parser.Y" +#line 2238 "frame/parser.Y" {fr->createBpandaCmd(fr->mapToRef(Vector((yyvsp[(2) - (12)].real),(yyvsp[(3) - (12)].real)),Coord::CANVAS), (yyvsp[(4) - (12)].real),(yyvsp[(5) - (12)].real),(yyvsp[(6) - (12)].integer), Vector((yyvsp[(7) - (12)].real),(yyvsp[(8) - (12)].real)), @@ -9323,24 +9324,24 @@ yyreduce: break; case 925: -#line 2246 "frame/parser.Y" +#line 2247 "frame/parser.Y" {fr->createCompositeCmd( currentColor,currentDash,currentWidth,currentFont, currentText,currentProps,NULL,taglist,cblist);;} break; case 927: -#line 2254 "frame/parser.Y" +#line 2255 "frame/parser.Y" {fr->createTemplateCmd(fr->mapToRef(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)),Coord::CANVAS), (yyvsp[(1) - (3)].str));;} break; case 928: -#line 2256 "frame/parser.Y" +#line 2257 "frame/parser.Y" {fr->createTemplateVarCmd(fr->mapToRef(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)),Coord::CANVAS), (yyvsp[(2) - (4)].str));;} break; case 929: -#line 2258 "frame/parser.Y" +#line 2259 "frame/parser.Y" { // backward compatibility fr->createTemplateVarCmd(fr->mapToRef(Vector((yyvsp[(1) - (4)].real),(yyvsp[(2) - (4)].real)),Coord::CANVAS), (yyvsp[(4) - (4)].str)); @@ -9348,560 +9349,560 @@ yyreduce: break; case 930: -#line 2263 "frame/parser.Y" +#line 2264 "frame/parser.Y" {fr->createTemplateCmd(Vector((yyvsp[(4) - (4)].vector)),(Coord::CoordSystem)(yyvsp[(2) - (4)].integer),(Coord::SkyFrame)(yyvsp[(3) - (4)].integer), (yyvsp[(1) - (4)].str));;} break; case 931: -#line 2266 "frame/parser.Y" +#line 2267 "frame/parser.Y" {(yyval.dash)[0] = (yyvsp[(1) - (2)].integer); (yyval.dash)[1] = (yyvsp[(2) - (2)].integer);;} break; case 932: -#line 2270 "frame/parser.Y" +#line 2271 "frame/parser.Y" {fr->markerEditBeginCmd(Vector((yyvsp[(2) - (4)].real),(yyvsp[(3) - (4)].real)),(yyvsp[(4) - (4)].integer));;} break; case 933: -#line 2272 "frame/parser.Y" +#line 2273 "frame/parser.Y" {fr->markerEditMotionCmd(Vector((yyvsp[(2) - (4)].real),(yyvsp[(3) - (4)].real)),(yyvsp[(4) - (4)].integer));;} break; case 934: -#line 2273 "frame/parser.Y" +#line 2274 "frame/parser.Y" {fr->markerEditEndCmd();;} break; case 935: -#line 2276 "frame/parser.Y" +#line 2277 "frame/parser.Y" {(yyval.integer) = Base::DS9;;} break; case 936: -#line 2277 "frame/parser.Y" +#line 2278 "frame/parser.Y" {(yyval.integer) = Base::XML;;} break; case 937: -#line 2278 "frame/parser.Y" +#line 2279 "frame/parser.Y" {(yyval.integer) = Base::CIAO;;} break; case 938: -#line 2279 "frame/parser.Y" +#line 2280 "frame/parser.Y" {(yyval.integer) = Base::SAOTNG;;} break; case 939: -#line 2280 "frame/parser.Y" +#line 2281 "frame/parser.Y" {(yyval.integer) = Base::SAOIMAGE;;} break; case 940: -#line 2281 "frame/parser.Y" +#line 2282 "frame/parser.Y" {(yyval.integer) = Base::PROS;;} break; case 941: -#line 2282 "frame/parser.Y" +#line 2283 "frame/parser.Y" {(yyval.integer) = Base::RAWXY;;} break; case 943: -#line 2286 "frame/parser.Y" +#line 2287 "frame/parser.Y" {fr->getMarkerColorCmd();;} break; case 944: -#line 2287 "frame/parser.Y" +#line 2288 "frame/parser.Y" {fr->getMarkerFontCmd();;} break; case 945: -#line 2288 "frame/parser.Y" +#line 2289 "frame/parser.Y" {fr->getMarkerEpsilonCmd();;} break; case 946: -#line 2289 "frame/parser.Y" +#line 2290 "frame/parser.Y" {fr->getMarkerHandleCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} break; case 947: -#line 2290 "frame/parser.Y" +#line 2291 "frame/parser.Y" {fr->getMarkerIdCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} break; case 948: -#line 2293 "frame/parser.Y" +#line 2294 "frame/parser.Y" {fr->getMarkerAnalysisPandaCmd((yyvsp[(1) - (8)].integer),(yyvsp[(4) - (8)].str),(yyvsp[(5) - (8)].str),(yyvsp[(6) - (8)].str),(Coord::CoordSystem)(yyvsp[(7) - (8)].integer),(yyvsp[(8) - (8)].integer));;} break; case 949: -#line 2295 "frame/parser.Y" +#line 2296 "frame/parser.Y" {fr->getMarkerAnalysisHistogramCmd((yyvsp[(1) - (6)].integer),(yyvsp[(4) - (6)].str),(yyvsp[(5) - (6)].str),(yyvsp[(6) - (6)].integer));;} break; case 950: -#line 2297 "frame/parser.Y" +#line 2298 "frame/parser.Y" {fr->getMarkerAnalysisPlot2dCmd((yyvsp[(1) - (10)].integer),(yyvsp[(4) - (10)].str),(yyvsp[(5) - (10)].str),(yyvsp[(6) - (10)].str),(yyvsp[(7) - (10)].str),(Coord::CoordSystem)(yyvsp[(8) - (10)].integer), (Coord::SkyFrame)(yyvsp[(9) - (10)].integer), (Marker::AnalysisMethod)(yyvsp[(10) - (10)].integer));;} break; case 951: -#line 2299 "frame/parser.Y" +#line 2300 "frame/parser.Y" {fr->getMarkerAnalysisPlot3dCmd((yyvsp[(1) - (7)].integer),(yyvsp[(4) - (7)].str),(yyvsp[(5) - (7)].str),(Coord::CoordSystem)(yyvsp[(6) - (7)].integer), (Marker::AnalysisMethod)(yyvsp[(7) - (7)].integer));;} break; case 952: -#line 2301 "frame/parser.Y" +#line 2302 "frame/parser.Y" {fr->getMarkerAnalysisRadialCmd((yyvsp[(1) - (7)].integer),(yyvsp[(4) - (7)].str),(yyvsp[(5) - (7)].str),(yyvsp[(6) - (7)].str),(Coord::CoordSystem)(yyvsp[(7) - (7)].integer));;} break; case 953: -#line 2303 "frame/parser.Y" +#line 2304 "frame/parser.Y" {fr->getMarkerAnalysisStatsCmd((yyvsp[(1) - (5)].integer),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyFrame)(yyvsp[(5) - (5)].integer));;} break; case 954: -#line 2305 "frame/parser.Y" +#line 2306 "frame/parser.Y" {fr->getMarkerIdAllCmd();;} break; case 955: -#line 2306 "frame/parser.Y" +#line 2307 "frame/parser.Y" {fr->getMarkerAngleCmd((yyvsp[(1) - (2)].integer));;} break; case 956: -#line 2307 "frame/parser.Y" +#line 2308 "frame/parser.Y" {fr->getMarkerAngleCmd((yyvsp[(1) - (3)].integer));;} break; case 957: -#line 2309 "frame/parser.Y" +#line 2310 "frame/parser.Y" {fr->getMarkerAngleCmd((yyvsp[(1) - (4)].integer),(Coord::CoordSystem)(yyvsp[(3) - (4)].integer), (Coord::SkyFrame)(yyvsp[(4) - (4)].integer));;} break; case 958: -#line 2311 "frame/parser.Y" +#line 2312 "frame/parser.Y" {fr->getMarkerAnnulusRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} break; case 959: -#line 2313 "frame/parser.Y" +#line 2314 "frame/parser.Y" {fr->getMarkerBoxFillCmd((yyvsp[(1) - (3)].integer));;} break; case 960: -#line 2315 "frame/parser.Y" +#line 2316 "frame/parser.Y" {fr->getMarkerBoxAnnulusRadiusCmd((yyvsp[(1) - (5)].integer),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer),(Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} break; case 961: -#line 2317 "frame/parser.Y" +#line 2318 "frame/parser.Y" {fr->getMarkerBoxRadiusCmd((yyvsp[(1) - (5)].integer),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} break; case 962: -#line 2318 "frame/parser.Y" +#line 2319 "frame/parser.Y" {fr->getMarkerBpandaAnglesCmd((yyvsp[(1) - (3)].integer));;} break; case 963: -#line 2319 "frame/parser.Y" +#line 2320 "frame/parser.Y" {fr->getMarkerBpandaAnglesCmd((yyvsp[(1) - (4)].integer));;} break; case 964: -#line 2321 "frame/parser.Y" +#line 2322 "frame/parser.Y" {fr->getMarkerBpandaAnglesCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyFrame)(yyvsp[(5) - (5)].integer));;} break; case 965: -#line 2323 "frame/parser.Y" +#line 2324 "frame/parser.Y" {fr->getMarkerBpandaRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} break; case 966: -#line 2326 "frame/parser.Y" +#line 2327 "frame/parser.Y" {fr->getMarkerCenterCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(3) - (5)].integer), (Coord::SkyFrame)(yyvsp[(4) - (5)].integer), (Coord::SkyFormat)(yyvsp[(5) - (5)].integer));;} break; case 967: -#line 2328 "frame/parser.Y" +#line 2329 "frame/parser.Y" {fr->getMarkerCircleFillCmd((yyvsp[(1) - (3)].integer));;} break; case 968: -#line 2330 "frame/parser.Y" +#line 2331 "frame/parser.Y" {fr->getMarkerCircleRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} break; case 969: -#line 2331 "frame/parser.Y" +#line 2332 "frame/parser.Y" {fr->getMarkerColorCmd((yyvsp[(1) - (2)].integer));;} break; case 970: -#line 2332 "frame/parser.Y" +#line 2333 "frame/parser.Y" {fr->getMarkerCompassArrowCmd((yyvsp[(1) - (3)].integer));;} break; case 971: -#line 2333 "frame/parser.Y" +#line 2334 "frame/parser.Y" {fr->getMarkerCompassLabelCmd((yyvsp[(1) - (3)].integer));;} break; case 972: -#line 2335 "frame/parser.Y" +#line 2336 "frame/parser.Y" {fr->getMarkerCompassRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} break; case 973: -#line 2336 "frame/parser.Y" +#line 2337 "frame/parser.Y" {fr->getMarkerCompassSystemCmd((yyvsp[(1) - (3)].integer));;} break; case 974: -#line 2337 "frame/parser.Y" +#line 2338 "frame/parser.Y" {fr->getMarkerCompositeCmd((yyvsp[(1) - (3)].integer));;} break; case 975: -#line 2338 "frame/parser.Y" +#line 2339 "frame/parser.Y" {fr->getMarkerCpandaAnglesCmd((yyvsp[(1) - (3)].integer));;} break; case 976: -#line 2339 "frame/parser.Y" +#line 2340 "frame/parser.Y" {fr->getMarkerCpandaAnglesCmd((yyvsp[(1) - (4)].integer));;} break; case 977: -#line 2341 "frame/parser.Y" +#line 2342 "frame/parser.Y" {fr->getMarkerCpandaAnglesCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyFrame)(yyvsp[(5) - (5)].integer));;} break; case 978: -#line 2343 "frame/parser.Y" +#line 2344 "frame/parser.Y" {fr->getMarkerCpandaRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} break; case 979: -#line 2344 "frame/parser.Y" +#line 2345 "frame/parser.Y" {fr->getMarkerEllipseFillCmd((yyvsp[(1) - (3)].integer));;} break; case 980: -#line 2346 "frame/parser.Y" +#line 2347 "frame/parser.Y" {fr->getMarkerEllipseRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} break; case 981: -#line 2348 "frame/parser.Y" +#line 2349 "frame/parser.Y" {fr->getMarkerEllipseAnnulusRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} break; case 982: -#line 2350 "frame/parser.Y" +#line 2351 "frame/parser.Y" {fr->getMarkerEpandaAnglesCmd((yyvsp[(1) - (3)].integer));;} break; case 983: -#line 2351 "frame/parser.Y" +#line 2352 "frame/parser.Y" {fr->getMarkerEpandaAnglesCmd((yyvsp[(1) - (4)].integer));;} break; case 984: -#line 2353 "frame/parser.Y" +#line 2354 "frame/parser.Y" {fr->getMarkerEpandaAnglesCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::SkyFrame)(yyvsp[(5) - (5)].integer));;} break; case 985: -#line 2355 "frame/parser.Y" +#line 2356 "frame/parser.Y" {fr->getMarkerEpandaRadiusCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} break; case 986: -#line 2356 "frame/parser.Y" +#line 2357 "frame/parser.Y" {fr->getMarkerFontCmd((yyvsp[(1) - (2)].integer));;} break; case 987: -#line 2357 "frame/parser.Y" +#line 2358 "frame/parser.Y" {fr->getMarkerHighlitedCmd((yyvsp[(1) - (2)].integer));;} break; case 988: -#line 2358 "frame/parser.Y" +#line 2359 "frame/parser.Y" {fr->getMarkerLineArrowCmd((yyvsp[(1) - (3)].integer));;} break; case 989: -#line 2360 "frame/parser.Y" +#line 2361 "frame/parser.Y" {fr->getMarkerLineLengthCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} break; case 990: -#line 2362 "frame/parser.Y" +#line 2363 "frame/parser.Y" {fr->getMarkerLineCmd((yyvsp[(1) - (6)].integer), (Coord::CoordSystem)(yyvsp[(4) - (6)].integer), (Coord::SkyFrame)(yyvsp[(5) - (6)].integer), (Coord::SkyFormat)(yyvsp[(6) - (6)].integer));;} break; case 991: -#line 2365 "frame/parser.Y" +#line 2366 "frame/parser.Y" {fr->getMarkerMapLenFromRefCmd((yyvsp[(1) - (6)].integer), (yyvsp[(4) - (6)].real), (Coord::CoordSystem)(yyvsp[(5) - (6)].integer),(Coord::DistFormat)(yyvsp[(6) - (6)].integer));;} break; case 992: -#line 2368 "frame/parser.Y" +#line 2369 "frame/parser.Y" {fr->getMarkerPolygonFillCmd((yyvsp[(1) - (3)].integer));;} break; case 993: -#line 2369 "frame/parser.Y" +#line 2370 "frame/parser.Y" {fr->getMarkerPointShapeCmd((yyvsp[(1) - (3)].integer));;} break; case 994: -#line 2370 "frame/parser.Y" +#line 2371 "frame/parser.Y" {fr->getMarkerPointSizeCmd((yyvsp[(1) - (3)].integer));;} break; case 995: -#line 2372 "frame/parser.Y" +#line 2373 "frame/parser.Y" {fr->getMarkerProjectionPointsCmd((yyvsp[(1) - (6)].integer), (Coord::CoordSystem)(yyvsp[(4) - (6)].integer), (Coord::SkyFrame)(yyvsp[(5) - (6)].integer), (Coord::SkyFormat)(yyvsp[(6) - (6)].integer));;} break; case 996: -#line 2375 "frame/parser.Y" +#line 2376 "frame/parser.Y" {fr->getMarkerProjectionLengthCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} break; case 997: -#line 2378 "frame/parser.Y" +#line 2379 "frame/parser.Y" {fr->getMarkerProjectionWidthCmd((yyvsp[(1) - (5)].integer),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer),(Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} break; case 998: -#line 2379 "frame/parser.Y" +#line 2380 "frame/parser.Y" {fr->getMarkerPropertyCmd((yyvsp[(1) - (2)].integer));;} break; case 999: -#line 2380 "frame/parser.Y" +#line 2381 "frame/parser.Y" {fr->getMarkerPropertyCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].integer));;} break; case 1000: -#line 2381 "frame/parser.Y" +#line 2382 "frame/parser.Y" {fr->getMarkerRulerDistSpecCmd((yyvsp[(1) - (3)].integer));;} break; case 1001: -#line 2383 "frame/parser.Y" +#line 2384 "frame/parser.Y" {fr->getMarkerRulerLengthCmd((yyvsp[(1) - (5)].integer),(Coord::CoordSystem)(yyvsp[(4) - (5)].integer),(Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} break; case 1002: -#line 2385 "frame/parser.Y" +#line 2386 "frame/parser.Y" {fr->getMarkerRulerPointCmd((yyvsp[(1) - (6)].integer), (Coord::CoordSystem)(yyvsp[(4) - (6)].integer), (Coord::SkyFrame)(yyvsp[(5) - (6)].integer), (Coord::SkyFormat)(yyvsp[(6) - (6)].integer));;} break; case 1003: -#line 2387 "frame/parser.Y" +#line 2388 "frame/parser.Y" {fr->getMarkerRulerSystemCmd((yyvsp[(1) - (3)].integer));;} break; case 1004: -#line 2388 "frame/parser.Y" +#line 2389 "frame/parser.Y" {fr->getMarkerSelectedCmd((yyvsp[(1) - (2)].integer));;} break; case 1005: -#line 2390 "frame/parser.Y" +#line 2391 "frame/parser.Y" {fr->getMarkerTagCmd((yyvsp[(1) - (2)].integer));;} break; case 1006: -#line 2391 "frame/parser.Y" +#line 2392 "frame/parser.Y" {fr->getMarkerTagCmd((yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].integer));;} break; case 1007: -#line 2392 "frame/parser.Y" +#line 2393 "frame/parser.Y" {fr->getMarkerTextCmd((yyvsp[(1) - (2)].integer));;} break; case 1008: -#line 2393 "frame/parser.Y" +#line 2394 "frame/parser.Y" {fr->getMarkerTextRotateCmd((yyvsp[(1) - (3)].integer));;} break; case 1009: -#line 2394 "frame/parser.Y" +#line 2395 "frame/parser.Y" {fr->getMarkerTypeCmd((yyvsp[(1) - (2)].integer));;} break; case 1010: -#line 2396 "frame/parser.Y" +#line 2397 "frame/parser.Y" {fr->getMarkerVectorArrowCmd((yyvsp[(1) - (3)].integer));;} break; case 1011: -#line 2398 "frame/parser.Y" +#line 2399 "frame/parser.Y" {fr->getMarkerVectorLengthCmd((yyvsp[(1) - (5)].integer), (Coord::CoordSystem)(yyvsp[(4) - (5)].integer), (Coord::DistFormat)(yyvsp[(5) - (5)].integer));;} break; case 1012: -#line 2400 "frame/parser.Y" +#line 2401 "frame/parser.Y" {fr->getMarkerVectorCmd((yyvsp[(1) - (6)].integer), (Coord::CoordSystem)(yyvsp[(4) - (6)].integer), (Coord::SkyFrame)(yyvsp[(5) - (6)].integer), (Coord::SkyFormat)(yyvsp[(6) - (6)].integer));;} break; case 1013: -#line 2402 "frame/parser.Y" +#line 2403 "frame/parser.Y" {fr->getMarkerLineWidthCmd((yyvsp[(1) - (2)].integer));;} break; case 1015: -#line 2404 "frame/parser.Y" +#line 2405 "frame/parser.Y" {fr->getMarkerHighlitedNumberCmd();;} break; case 1016: -#line 2405 "frame/parser.Y" +#line 2406 "frame/parser.Y" {fr->getMarkerNumberCmd();;} break; case 1017: -#line 2407 "frame/parser.Y" +#line 2408 "frame/parser.Y" {fr->getMarkerPolygonSegmentCmd(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;} break; case 1018: -#line 2409 "frame/parser.Y" +#line 2410 "frame/parser.Y" {fr->getMarkerSegmentSegmentCmd(Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;} break; case 1019: -#line 2410 "frame/parser.Y" +#line 2411 "frame/parser.Y" {fr->getMarkerPreserveCmd();;} break; case 1020: -#line 2411 "frame/parser.Y" +#line 2412 "frame/parser.Y" {fr->getMarkerPropertyCmd((yyvsp[(2) - (2)].integer));;} break; case 1022: -#line 2413 "frame/parser.Y" +#line 2414 "frame/parser.Y" {fr->getMarkerSelectedNumberCmd();;} break; case 1024: -#line 2417 "frame/parser.Y" +#line 2418 "frame/parser.Y" {fr->getMarkerColorCmd((yyvsp[(1) - (2)].str));;} break; case 1025: -#line 2418 "frame/parser.Y" +#line 2419 "frame/parser.Y" {fr->getMarkerFontCmd((yyvsp[(1) - (2)].str));;} break; case 1026: -#line 2419 "frame/parser.Y" +#line 2420 "frame/parser.Y" {fr->getMarkerIdCmd((yyvsp[(1) - (2)].str));;} break; case 1027: -#line 2420 "frame/parser.Y" +#line 2421 "frame/parser.Y" {fr->getMarkerPropertyCmd((yyvsp[(1) - (3)].str),(yyvsp[(3) - (3)].integer));;} break; case 1028: -#line 2421 "frame/parser.Y" +#line 2422 "frame/parser.Y" {fr->getMarkerTagCmd((yyvsp[(1) - (2)].str));;} break; case 1029: -#line 2422 "frame/parser.Y" +#line 2423 "frame/parser.Y" {fr->getMarkerTagNumberCmd((yyvsp[(1) - (3)].str));;} break; case 1030: -#line 2424 "frame/parser.Y" +#line 2425 "frame/parser.Y" {fr->getMarkerTagsCmd();;} break; case 1031: -#line 2425 "frame/parser.Y" +#line 2426 "frame/parser.Y" {fr->getMarkerTagDefaultNameCmd();;} break; case 1032: -#line 2427 "frame/parser.Y" +#line 2428 "frame/parser.Y" {fr->getMarkerLineWidthCmd();;} break; case 1033: -#line 2430 "frame/parser.Y" +#line 2431 "frame/parser.Y" {fr->getMarkerCentroidAutoCmd();;} break; case 1034: -#line 2431 "frame/parser.Y" +#line 2432 "frame/parser.Y" {fr->getMarkerCentroidRadiusCmd();;} break; case 1035: -#line 2432 "frame/parser.Y" +#line 2433 "frame/parser.Y" {fr->getMarkerCentroidIterationCmd();;} break; case 1036: -#line 2433 "frame/parser.Y" +#line 2434 "frame/parser.Y" {fr->getMarkerCentroidOptionCmd();;} break; case 1037: -#line 2436 "frame/parser.Y" +#line 2437 "frame/parser.Y" {fr->getMarkerHighlitedCmd();;} break; case 1038: -#line 2437 "frame/parser.Y" +#line 2438 "frame/parser.Y" {fr->getMarkerHighlitedCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;} break; case 1039: -#line 2440 "frame/parser.Y" +#line 2441 "frame/parser.Y" {fr->getMarkerSelectedCmd();;} break; case 1040: -#line 2441 "frame/parser.Y" +#line 2442 "frame/parser.Y" {fr->getMarkerSelectedCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;} break; case 1041: -#line 2444 "frame/parser.Y" +#line 2445 "frame/parser.Y" {fr->getMarkerShowCmd();;} break; case 1042: -#line 2445 "frame/parser.Y" +#line 2446 "frame/parser.Y" {fr->getMarkerShowTextCmd();;} break; case 1043: -#line 2448 "frame/parser.Y" +#line 2449 "frame/parser.Y" { strncpy(currentFont, "helvetica 10 normal roman", 32); strncpy(currentColor, "green", 16); @@ -9916,12 +9917,12 @@ yyreduce: break; case 1044: -#line 2461 "frame/parser.Y" +#line 2462 "frame/parser.Y" {fr->markerLayerCmd(Base::USER);;} break; case 1045: -#line 2462 "frame/parser.Y" +#line 2463 "frame/parser.Y" { // backward compatibility fr->markerLayerCmd(Base::USER); @@ -9929,12 +9930,12 @@ yyreduce: break; case 1046: -#line 2466 "frame/parser.Y" +#line 2467 "frame/parser.Y" {fr->markerLayerCmd(Base::USER);;} break; case 1047: -#line 2467 "frame/parser.Y" +#line 2468 "frame/parser.Y" { // backward compatibility fr->markerLayerCmd(Base::USER); @@ -9942,279 +9943,279 @@ yyreduce: break; case 1048: -#line 2471 "frame/parser.Y" +#line 2472 "frame/parser.Y" {fr->markerLayerCmd(Base::CATALOG);;} break; case 1049: -#line 2472 "frame/parser.Y" +#line 2473 "frame/parser.Y" {fr->markerLayerCmd(Base::FOOTPRINT);;} break; case 1050: -#line 2477 "frame/parser.Y" +#line 2478 "frame/parser.Y" {fr->markerListCmd((Base::MarkerFormat)(yyvsp[(1) - (7)].integer), (Coord::CoordSystem)(yyvsp[(2) - (7)].integer), (Coord::SkyFrame)(yyvsp[(3) - (7)].integer), (Coord::SkyFormat)(yyvsp[(4) - (7)].integer), (yyvsp[(5) - (7)].integer), 0, propQMask, propQValue, taglist);;} break; case 1051: -#line 2482 "frame/parser.Y" +#line 2483 "frame/parser.Y" {fr->markerListCmd((Base::MarkerFormat)(yyvsp[(2) - (8)].integer), (Coord::CoordSystem)(yyvsp[(3) - (8)].integer), (Coord::SkyFrame)(yyvsp[(4) - (8)].integer), (Coord::SkyFormat)(yyvsp[(5) - (8)].integer), (yyvsp[(6) - (8)].integer), 1, propQMask, propQValue, taglist);;} break; case 1052: -#line 2488 "frame/parser.Y" +#line 2489 "frame/parser.Y" {fr->markerLoadCmd((Base::MarkerFormat)(yyvsp[(1) - (2)].integer),(yyvsp[(2) - (2)].str));;} break; case 1053: -#line 2490 "frame/parser.Y" +#line 2491 "frame/parser.Y" {fr->markerLoadCmd((Base::MarkerFormat)(yyvsp[(1) - (4)].integer),(yyvsp[(2) - (4)].str), (Coord::CoordSystem)(yyvsp[(3) - (4)].integer),(Coord::SkyFrame)(yyvsp[(4) - (4)].integer));;} break; case 1054: -#line 2493 "frame/parser.Y" +#line 2494 "frame/parser.Y" {fr->markerLoadCmd((Base::MarkerFormat)(yyvsp[(1) - (2)].integer),(yyvsp[(2) - (2)].integer));;} break; case 1055: -#line 2495 "frame/parser.Y" +#line 2496 "frame/parser.Y" {fr->markerLoadCmd((Base::MarkerFormat)(yyvsp[(1) - (4)].integer),(yyvsp[(2) - (4)].integer), (Coord::CoordSystem)(yyvsp[(3) - (4)].integer),(Coord::SkyFrame)(yyvsp[(4) - (4)].integer));;} break; case 1056: -#line 2498 "frame/parser.Y" +#line 2499 "frame/parser.Y" {fr->markerLoadFitsCmd((yyvsp[(2) - (6)].str), (yyvsp[(3) - (6)].str), (yyvsp[(4) - (6)].dash), (yyvsp[(5) - (6)].integer), (yyvsp[(6) - (6)].str));;} break; case 1057: -#line 2501 "frame/parser.Y" +#line 2502 "frame/parser.Y" {fr->markerMoveCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;} break; case 1058: -#line 2502 "frame/parser.Y" +#line 2503 "frame/parser.Y" {fr->markerFrontCmd();;} break; case 1059: -#line 2503 "frame/parser.Y" +#line 2504 "frame/parser.Y" {fr->markerBackCmd();;} break; case 1060: -#line 2504 "frame/parser.Y" +#line 2505 "frame/parser.Y" {fr->markerMoveBeginCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} break; case 1061: -#line 2505 "frame/parser.Y" +#line 2506 "frame/parser.Y" {fr->markerMoveMotionCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} break; case 1062: -#line 2506 "frame/parser.Y" +#line 2507 "frame/parser.Y" {fr->markerMoveEndCmd();;} break; case 1063: -#line 2508 "frame/parser.Y" +#line 2509 "frame/parser.Y" {fr->markerMoveToCmd(Vector((yyvsp[(4) - (4)].vector)), (Coord::CoordSystem)(yyvsp[(2) - (4)].integer), (Coord::SkyFrame)(yyvsp[(3) - (4)].integer));;} break; case 1066: -#line 2515 "frame/parser.Y" +#line 2516 "frame/parser.Y" {setProps(¤tProps,(yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].integer));;} break; case 1067: -#line 2516 "frame/parser.Y" +#line 2517 "frame/parser.Y" {strncpy(currentColor,(yyvsp[(3) - (3)].str),16);;} break; case 1068: -#line 2517 "frame/parser.Y" +#line 2518 "frame/parser.Y" {currentDash[0]=(yyvsp[(3) - (4)].integer);currentDash[1]=(yyvsp[(4) - (4)].integer);;} break; case 1069: -#line 2518 "frame/parser.Y" +#line 2519 "frame/parser.Y" {currentWidth = (yyvsp[(3) - (3)].integer);;} break; case 1070: -#line 2519 "frame/parser.Y" +#line 2520 "frame/parser.Y" {strncpy(currentFont,(yyvsp[(3) - (3)].str),32);;} break; case 1071: -#line 2520 "frame/parser.Y" +#line 2521 "frame/parser.Y" {strncpy(currentText,(yyvsp[(3) - (3)].str),80);;} break; case 1074: -#line 2525 "frame/parser.Y" +#line 2526 "frame/parser.Y" {(yyval.integer) = Marker::NONE;;} break; case 1075: -#line 2526 "frame/parser.Y" +#line 2527 "frame/parser.Y" {(yyval.integer) = Marker::SELECT;;} break; case 1076: -#line 2527 "frame/parser.Y" +#line 2528 "frame/parser.Y" {(yyval.integer) = Marker::HIGHLITE;;} break; case 1077: -#line 2528 "frame/parser.Y" +#line 2529 "frame/parser.Y" {(yyval.integer) = Marker::DASH;;} break; case 1078: -#line 2529 "frame/parser.Y" +#line 2530 "frame/parser.Y" {(yyval.integer) = Marker::FIXED;;} break; case 1079: -#line 2530 "frame/parser.Y" +#line 2531 "frame/parser.Y" {(yyval.integer) = Marker::EDIT;;} break; case 1080: -#line 2531 "frame/parser.Y" +#line 2532 "frame/parser.Y" {(yyval.integer) = Marker::MOVE;;} break; case 1081: -#line 2532 "frame/parser.Y" +#line 2533 "frame/parser.Y" {(yyval.integer) = Marker::ROTATE;;} break; case 1082: -#line 2533 "frame/parser.Y" +#line 2534 "frame/parser.Y" {(yyval.integer) = Marker::DELETE;;} break; case 1083: -#line 2534 "frame/parser.Y" +#line 2535 "frame/parser.Y" {(yyval.integer) = Marker::INCLUDE;;} break; case 1084: -#line 2535 "frame/parser.Y" +#line 2536 "frame/parser.Y" {(yyval.integer) = Marker::SOURCE;;} break; case 1087: -#line 2542 "frame/parser.Y" +#line 2543 "frame/parser.Y" {propQMask=0;propQValue=0;;} break; case 1088: -#line 2543 "frame/parser.Y" +#line 2544 "frame/parser.Y" {propQMask=0;propQValue=0;;} break; case 1090: -#line 2546 "frame/parser.Y" +#line 2547 "frame/parser.Y" {fr->markerSelectAllCmd();;} break; case 1091: -#line 2547 "frame/parser.Y" +#line 2548 "frame/parser.Y" {fr->markerSelectOnlyCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} break; case 1092: -#line 2548 "frame/parser.Y" +#line 2549 "frame/parser.Y" {fr->markerSelectToggleCmd();;} break; case 1093: -#line 2549 "frame/parser.Y" +#line 2550 "frame/parser.Y" {fr->markerSelectToggleCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} break; case 1094: -#line 2552 "frame/parser.Y" +#line 2553 "frame/parser.Y" {fr->markerShowCmd((yyvsp[(1) - (1)].integer));;} break; case 1095: -#line 2553 "frame/parser.Y" +#line 2554 "frame/parser.Y" {fr->markerShowTextCmd((yyvsp[(2) - (2)].integer));;} break; case 1098: -#line 2561 "frame/parser.Y" +#line 2562 "frame/parser.Y" {propQMask |= (yyvsp[(1) - (3)].integer); setProps(&propQValue,(yyvsp[(1) - (3)].integer),(yyvsp[(3) - (3)].integer));;} break; case 1099: -#line 2564 "frame/parser.Y" +#line 2565 "frame/parser.Y" {taglist.deleteAll();;} break; case 1100: -#line 2565 "frame/parser.Y" +#line 2566 "frame/parser.Y" {taglist.deleteAll();;} break; case 1104: -#line 2572 "frame/parser.Y" +#line 2573 "frame/parser.Y" {taglist.append(new Tag((yyvsp[(3) - (3)].str)));;} break; case 1105: -#line 2575 "frame/parser.Y" +#line 2576 "frame/parser.Y" {cblist.append( new CallBack(fr->getInterp(),(CallBack::Type)(yyvsp[(3) - (5)].integer),(yyvsp[(4) - (5)].str),(yyvsp[(5) - (5)].str)));;} break; case 1106: -#line 2579 "frame/parser.Y" +#line 2580 "frame/parser.Y" {fr->maskClearCmd();;} break; case 1107: -#line 2580 "frame/parser.Y" +#line 2581 "frame/parser.Y" {fr->maskColorCmd((yyvsp[(2) - (2)].str));;} break; case 1108: -#line 2581 "frame/parser.Y" +#line 2582 "frame/parser.Y" {fr->maskMarkCmd((FitsMask::MaskType)(yyvsp[(2) - (2)].integer));;} break; case 1109: -#line 2582 "frame/parser.Y" +#line 2583 "frame/parser.Y" {fr->maskRangeCmd((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real));;} break; case 1110: -#line 2583 "frame/parser.Y" +#line 2584 "frame/parser.Y" {fr->maskSystemCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;} break; case 1111: -#line 2584 "frame/parser.Y" +#line 2585 "frame/parser.Y" {fr->maskTransparencyCmd((yyvsp[(2) - (2)].real));;} break; case 1112: -#line 2585 "frame/parser.Y" +#line 2586 "frame/parser.Y" {fr->maskBlendCmd((FitsMask::MaskBlend)(yyvsp[(2) - (2)].integer));;} break; case 1113: -#line 2586 "frame/parser.Y" +#line 2587 "frame/parser.Y" { // backward compatibility fr->maskMarkCmd((FitsMask::MaskType)(yyvsp[(2) - (2)].integer)); @@ -10222,37 +10223,37 @@ yyreduce: break; case 1114: -#line 2592 "frame/parser.Y" +#line 2593 "frame/parser.Y" {fr->orientCmd(Coord::XX);;} break; case 1115: -#line 2593 "frame/parser.Y" +#line 2594 "frame/parser.Y" {fr->orientCmd(Coord::YY);;} break; case 1116: -#line 2594 "frame/parser.Y" +#line 2595 "frame/parser.Y" {fr->orientCmd(Coord::XY);;} break; case 1117: -#line 2595 "frame/parser.Y" +#line 2596 "frame/parser.Y" {fr->orientCmd(Coord::NORMAL);;} break; case 1118: -#line 2599 "frame/parser.Y" +#line 2600 "frame/parser.Y" {fr->panCmd(Vector((yyvsp[(1) - (4)].real),(yyvsp[(2) - (4)].real)),Vector((yyvsp[(3) - (4)].real),(yyvsp[(4) - (4)].real)));;} break; case 1119: -#line 2600 "frame/parser.Y" +#line 2601 "frame/parser.Y" {fr->panCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;} break; case 1120: -#line 2602 "frame/parser.Y" +#line 2603 "frame/parser.Y" { // backward compatibility fr->panCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real))); @@ -10260,27 +10261,27 @@ yyreduce: break; case 1121: -#line 2607 "frame/parser.Y" +#line 2608 "frame/parser.Y" {fr->panCmd(Vector((yyvsp[(3) - (3)].vector)), (Coord::CoordSystem)(yyvsp[(1) - (3)].integer), (Coord::SkyFrame)(yyvsp[(2) - (3)].integer));;} break; case 1123: -#line 2609 "frame/parser.Y" +#line 2610 "frame/parser.Y" {fr->panBBoxCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} break; case 1125: -#line 2611 "frame/parser.Y" +#line 2612 "frame/parser.Y" {fr->panPreserveCmd((yyvsp[(2) - (2)].integer));;} break; case 1126: -#line 2614 "frame/parser.Y" +#line 2615 "frame/parser.Y" {fr->panToCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;} break; case 1127: -#line 2616 "frame/parser.Y" +#line 2617 "frame/parser.Y" { // backward compatibility fr->panToCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real))); @@ -10288,32 +10289,32 @@ yyreduce: break; case 1128: -#line 2621 "frame/parser.Y" +#line 2622 "frame/parser.Y" {fr->panToCmd(Vector((yyvsp[(3) - (3)].vector)), (Coord::CoordSystem)(yyvsp[(1) - (3)].integer), (Coord::SkyFrame)(yyvsp[(2) - (3)].integer));;} break; case 1129: -#line 2624 "frame/parser.Y" +#line 2625 "frame/parser.Y" {fr->panBeginCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} break; case 1130: -#line 2625 "frame/parser.Y" +#line 2626 "frame/parser.Y" {fr->panMotionCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;} break; case 1131: -#line 2626 "frame/parser.Y" +#line 2627 "frame/parser.Y" {fr->panEndCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} break; case 1132: -#line 2629 "frame/parser.Y" +#line 2630 "frame/parser.Y" {fr->pannerCmd((yyvsp[(1) - (1)].integer));;} break; case 1133: -#line 2631 "frame/parser.Y" +#line 2632 "frame/parser.Y" { // backward compatibility fr->pannerCmd((Coord::CoordSystem)(yyvsp[(2) - (3)].integer),(Coord::SkyFrame)(yyvsp[(3) - (3)].integer)); @@ -10321,44 +10322,44 @@ yyreduce: break; case 1134: -#line 2635 "frame/parser.Y" +#line 2636 "frame/parser.Y" {fr->pannerCmd((yyvsp[(1) - (3)].str), (yyvsp[(2) - (3)].integer), (yyvsp[(3) - (3)].integer));;} break; case 1135: -#line 2636 "frame/parser.Y" +#line 2637 "frame/parser.Y" {fr->updatePannerCmd();;} break; case 1136: -#line 2640 "frame/parser.Y" +#line 2641 "frame/parser.Y" {fr->psColorSpaceCmd((PSColorSpace)(yyvsp[(2) - (2)].integer));;} break; case 1137: -#line 2641 "frame/parser.Y" +#line 2642 "frame/parser.Y" {fr->psLevelCmd((yyvsp[(2) - (2)].integer));;} break; case 1138: -#line 2642 "frame/parser.Y" +#line 2643 "frame/parser.Y" {fr->psResolutionCmd((yyvsp[(2) - (2)].integer));;} break; case 1139: -#line 2643 "frame/parser.Y" +#line 2644 "frame/parser.Y" { // backward compatibility with backup ;} break; case 1140: -#line 2649 "frame/parser.Y" +#line 2650 "frame/parser.Y" {fr->precCmd((yyvsp[(1) - (9)].integer),(yyvsp[(2) - (9)].integer),(yyvsp[(3) - (9)].integer),(yyvsp[(4) - (9)].integer),(yyvsp[(5) - (9)].integer),(yyvsp[(6) - (9)].integer),(yyvsp[(7) - (9)].integer),(yyvsp[(8) - (9)].integer),(yyvsp[(9) - (9)].integer));;} break; case 1141: -#line 2650 "frame/parser.Y" +#line 2651 "frame/parser.Y" { // backward compatibility with backup fr->precCmd((yyvsp[(1) - (6)].integer),(yyvsp[(2) - (6)].integer),(yyvsp[(3) - (6)].integer),(yyvsp[(4) - (6)].integer),(yyvsp[(5) - (6)].integer),(yyvsp[(6) - (6)].integer)); @@ -10366,337 +10367,337 @@ yyreduce: break; case 1142: -#line 2656 "frame/parser.Y" +#line 2657 "frame/parser.Y" {(yyval.integer) = BW;;} break; case 1143: -#line 2657 "frame/parser.Y" +#line 2658 "frame/parser.Y" {(yyval.integer) = GRAY;;} break; case 1144: -#line 2658 "frame/parser.Y" +#line 2659 "frame/parser.Y" {(yyval.integer) = RGB;;} break; case 1145: -#line 2659 "frame/parser.Y" +#line 2660 "frame/parser.Y" {(yyval.integer) = CMYK;;} break; case 1148: -#line 2667 "frame/parser.Y" +#line 2668 "frame/parser.Y" {fr->regionHighliteBeginCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} break; case 1149: -#line 2669 "frame/parser.Y" +#line 2670 "frame/parser.Y" {fr->regionHighliteMotionCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} break; case 1150: -#line 2670 "frame/parser.Y" +#line 2671 "frame/parser.Y" {fr->regionHighliteEndCmd();;} break; case 1151: -#line 2671 "frame/parser.Y" +#line 2672 "frame/parser.Y" {fr->regionHighliteShiftEndCmd();;} break; case 1152: -#line 2675 "frame/parser.Y" +#line 2676 "frame/parser.Y" {fr->regionSelectBeginCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} break; case 1153: -#line 2676 "frame/parser.Y" +#line 2677 "frame/parser.Y" {fr->regionSelectMotionCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} break; case 1154: -#line 2677 "frame/parser.Y" +#line 2678 "frame/parser.Y" {fr->regionSelectEndCmd();;} break; case 1155: -#line 2678 "frame/parser.Y" +#line 2679 "frame/parser.Y" {fr->regionSelectShiftEndCmd();;} break; case 1156: -#line 2681 "frame/parser.Y" +#line 2682 "frame/parser.Y" {(yyval.integer) = Frame3dBase::MIP;;} break; case 1157: -#line 2682 "frame/parser.Y" +#line 2683 "frame/parser.Y" {(yyval.integer) = Frame3dBase::AIP;;} break; case 1158: -#line 2685 "frame/parser.Y" +#line 2686 "frame/parser.Y" {(yyval.integer) = Frame3dBase::NONE;;} break; case 1159: -#line 2686 "frame/parser.Y" +#line 2687 "frame/parser.Y" {(yyval.integer) = Frame3dBase::AZIMUTH;;} break; case 1160: -#line 2687 "frame/parser.Y" +#line 2688 "frame/parser.Y" {(yyval.integer) = Frame3dBase::ELEVATION;;} break; case 1161: -#line 2690 "frame/parser.Y" +#line 2691 "frame/parser.Y" {fr->setRGBChannelCmd((yyvsp[(2) - (2)].str));;} break; case 1162: -#line 2691 "frame/parser.Y" +#line 2692 "frame/parser.Y" {fr->setRGBSystemCmd((Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;} break; case 1163: -#line 2692 "frame/parser.Y" +#line 2693 "frame/parser.Y" {fr->setRGBViewCmd((yyvsp[(2) - (4)].integer),(yyvsp[(3) - (4)].integer),(yyvsp[(4) - (4)].integer));;} break; case 1164: -#line 2695 "frame/parser.Y" +#line 2696 "frame/parser.Y" {fr->rotateCmd(zeroTWOPI(degToRad((yyvsp[(1) - (1)].real))));;} break; case 1165: -#line 2696 "frame/parser.Y" +#line 2697 "frame/parser.Y" {fr->rotateCmd(zeroTWOPI(degToRad((yyvsp[(1) - (2)].real))));;} break; case 1167: -#line 2698 "frame/parser.Y" +#line 2699 "frame/parser.Y" {fr->rotateToCmd(zeroTWOPI(degToRad((yyvsp[(2) - (2)].real))));;} break; case 1168: -#line 2699 "frame/parser.Y" +#line 2700 "frame/parser.Y" {fr->rotateToCmd(zeroTWOPI(degToRad((yyvsp[(2) - (3)].real))));;} break; case 1169: -#line 2702 "frame/parser.Y" +#line 2703 "frame/parser.Y" {fr->rotateBeginCmd();;} break; case 1170: -#line 2703 "frame/parser.Y" +#line 2704 "frame/parser.Y" {fr->rotateMotionCmd(zeroTWOPI(degToRad((yyvsp[(1) - (1)].real))));;} break; case 1171: -#line 2704 "frame/parser.Y" +#line 2705 "frame/parser.Y" {fr->rotateEndCmd();;} break; case 1176: -#line 2711 "frame/parser.Y" +#line 2712 "frame/parser.Y" {fr->savePhotoCmd((yyvsp[(2) - (2)].str));;} break; case 1177: -#line 2715 "frame/parser.Y" +#line 2716 "frame/parser.Y" {fr->saveArrayFileCmd((yyvsp[(2) - (3)].str), (FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;} break; case 1178: -#line 2717 "frame/parser.Y" +#line 2718 "frame/parser.Y" {fr->saveArrayChannelCmd((yyvsp[(2) - (3)].str), (FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;} break; case 1179: -#line 2719 "frame/parser.Y" +#line 2720 "frame/parser.Y" {fr->saveArraySocketCmd((yyvsp[(2) - (3)].integer), (FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;} break; case 1181: -#line 2724 "frame/parser.Y" +#line 2725 "frame/parser.Y" {fr->saveArrayRGBCubeFileCmd((yyvsp[(2) - (3)].str), (FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;} break; case 1182: -#line 2726 "frame/parser.Y" +#line 2727 "frame/parser.Y" {fr->saveArrayRGBCubeChannelCmd((yyvsp[(2) - (3)].str), (FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;} break; case 1183: -#line 2728 "frame/parser.Y" +#line 2729 "frame/parser.Y" {fr->saveArrayRGBCubeSocketCmd((yyvsp[(2) - (3)].integer), (FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;} break; case 1193: -#line 2741 "frame/parser.Y" +#line 2742 "frame/parser.Y" {fr->saveFitsFileCmd((yyvsp[(2) - (2)].str));;} break; case 1194: -#line 2742 "frame/parser.Y" +#line 2743 "frame/parser.Y" {fr->saveFitsChannelCmd((yyvsp[(2) - (2)].str));;} break; case 1195: -#line 2743 "frame/parser.Y" +#line 2744 "frame/parser.Y" {fr->saveFitsSocketCmd((yyvsp[(2) - (2)].integer));;} break; case 1196: -#line 2746 "frame/parser.Y" +#line 2747 "frame/parser.Y" {fr->saveFitsTableFileCmd((yyvsp[(2) - (2)].str));;} break; case 1197: -#line 2747 "frame/parser.Y" +#line 2748 "frame/parser.Y" {fr->saveFitsTableChannelCmd((yyvsp[(2) - (2)].str));;} break; case 1198: -#line 2748 "frame/parser.Y" +#line 2749 "frame/parser.Y" {fr->saveFitsTableSocketCmd((yyvsp[(2) - (2)].integer));;} break; case 1199: -#line 2751 "frame/parser.Y" +#line 2752 "frame/parser.Y" {fr->saveFitsSliceFileCmd((yyvsp[(2) - (2)].str));;} break; case 1200: -#line 2752 "frame/parser.Y" +#line 2753 "frame/parser.Y" {fr->saveFitsSliceChannelCmd((yyvsp[(2) - (2)].str));;} break; case 1201: -#line 2753 "frame/parser.Y" +#line 2754 "frame/parser.Y" {fr->saveFitsSliceSocketCmd((yyvsp[(2) - (2)].integer));;} break; case 1202: -#line 2756 "frame/parser.Y" +#line 2757 "frame/parser.Y" {fr->saveFitsExtCubeFileCmd((yyvsp[(2) - (2)].str));;} break; case 1203: -#line 2757 "frame/parser.Y" +#line 2758 "frame/parser.Y" {fr->saveFitsExtCubeChannelCmd((yyvsp[(2) - (2)].str));;} break; case 1204: -#line 2758 "frame/parser.Y" +#line 2759 "frame/parser.Y" {fr->saveFitsExtCubeSocketCmd((yyvsp[(2) - (2)].integer));;} break; case 1206: -#line 2762 "frame/parser.Y" +#line 2763 "frame/parser.Y" {fr->saveFitsMosaicFileCmd((yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].integer));;} break; case 1207: -#line 2763 "frame/parser.Y" +#line 2764 "frame/parser.Y" {fr->saveFitsMosaicChannelCmd((yyvsp[(2) - (3)].str),(yyvsp[(3) - (3)].integer));;} break; case 1208: -#line 2764 "frame/parser.Y" +#line 2765 "frame/parser.Y" {fr->saveFitsMosaicSocketCmd((yyvsp[(2) - (3)].integer),(yyvsp[(3) - (3)].integer));;} break; case 1209: -#line 2767 "frame/parser.Y" +#line 2768 "frame/parser.Y" {fr->saveFitsMosaicImageFileCmd((yyvsp[(2) - (2)].str));;} break; case 1210: -#line 2768 "frame/parser.Y" +#line 2769 "frame/parser.Y" {fr->saveFitsMosaicImageChannelCmd((yyvsp[(2) - (2)].str));;} break; case 1211: -#line 2769 "frame/parser.Y" +#line 2770 "frame/parser.Y" {fr->saveFitsMosaicImageSocketCmd((yyvsp[(2) - (2)].integer));;} break; case 1212: -#line 2772 "frame/parser.Y" +#line 2773 "frame/parser.Y" {fr->saveFitsRGBImageFileCmd((yyvsp[(2) - (2)].str));;} break; case 1213: -#line 2773 "frame/parser.Y" +#line 2774 "frame/parser.Y" {fr->saveFitsRGBImageChannelCmd((yyvsp[(2) - (2)].str));;} break; case 1214: -#line 2774 "frame/parser.Y" +#line 2775 "frame/parser.Y" {fr->saveFitsRGBImageSocketCmd((yyvsp[(2) - (2)].integer));;} break; case 1215: -#line 2777 "frame/parser.Y" +#line 2778 "frame/parser.Y" {fr->saveFitsRGBCubeFileCmd((yyvsp[(2) - (2)].str));;} break; case 1216: -#line 2778 "frame/parser.Y" +#line 2779 "frame/parser.Y" {fr->saveFitsRGBCubeChannelCmd((yyvsp[(2) - (2)].str));;} break; case 1217: -#line 2779 "frame/parser.Y" +#line 2780 "frame/parser.Y" {fr->saveFitsRGBCubeSocketCmd((yyvsp[(2) - (2)].integer));;} break; case 1218: -#line 2782 "frame/parser.Y" +#line 2783 "frame/parser.Y" {fr->saveFitsResampleFileCmd((yyvsp[(2) - (2)].str));;} break; case 1219: -#line 2783 "frame/parser.Y" +#line 2784 "frame/parser.Y" {fr->saveFitsResampleChannelCmd((yyvsp[(2) - (2)].str));;} break; case 1220: -#line 2784 "frame/parser.Y" +#line 2785 "frame/parser.Y" {fr->saveFitsResampleSocketCmd((yyvsp[(2) - (2)].integer));;} break; case 1221: -#line 2788 "frame/parser.Y" +#line 2789 "frame/parser.Y" {fr->saveNRRDFileCmd((yyvsp[(2) - (3)].str), (FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;} break; case 1222: -#line 2790 "frame/parser.Y" +#line 2791 "frame/parser.Y" {fr->saveNRRDChannelCmd((yyvsp[(2) - (3)].str), (FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;} break; case 1223: -#line 2792 "frame/parser.Y" +#line 2793 "frame/parser.Y" {fr->saveNRRDSocketCmd((yyvsp[(2) - (3)].integer), (FitsFile::ArchType)(yyvsp[(3) - (3)].integer));;} break; case 1224: -#line 2796 "frame/parser.Y" +#line 2797 "frame/parser.Y" {fr->saveENVIFileCmd((yyvsp[(2) - (4)].str), (yyvsp[(3) - (4)].str), (FitsFile::ArchType)(yyvsp[(4) - (4)].integer));;} break; case 1225: -#line 2800 "frame/parser.Y" +#line 2801 "frame/parser.Y" {fr->smoothCmd((Context::SmoothFunction)(yyvsp[(1) - (6)].integer),(yyvsp[(2) - (6)].integer),(yyvsp[(3) - (6)].integer),(yyvsp[(4) - (6)].real),(yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real));;} break; case 1226: -#line 2802 "frame/parser.Y" +#line 2803 "frame/parser.Y" { // backward compatibility with backup fr->smoothCmd((Context::SmoothFunction)(yyvsp[(1) - (2)].integer),(yyvsp[(2) - (2)].integer)); @@ -10704,122 +10705,122 @@ yyreduce: break; case 1227: -#line 2806 "frame/parser.Y" +#line 2807 "frame/parser.Y" {fr->smoothDeleteCmd();;} break; case 1228: -#line 2809 "frame/parser.Y" +#line 2810 "frame/parser.Y" {(yyval.integer) = Context::BOXCAR;;} break; case 1229: -#line 2810 "frame/parser.Y" +#line 2811 "frame/parser.Y" {(yyval.integer) = Context::TOPHAT;;} break; case 1230: -#line 2811 "frame/parser.Y" +#line 2812 "frame/parser.Y" {(yyval.integer) = Context::GAUSSIAN;;} break; case 1231: -#line 2812 "frame/parser.Y" +#line 2813 "frame/parser.Y" {(yyval.integer) = Context::ELLIPTIC;;} break; case 1232: -#line 2815 "frame/parser.Y" +#line 2816 "frame/parser.Y" {fr->updateFitsCmd(0);;} break; case 1233: -#line 2817 "frame/parser.Y" +#line 2818 "frame/parser.Y" {fr->updateFitsCmd((yyvsp[(1) - (5)].integer),BBox((yyvsp[(2) - (5)].real),(yyvsp[(3) - (5)].real),(yyvsp[(4) - (5)].real),(yyvsp[(5) - (5)].real)),0);;} break; case 1234: -#line 2818 "frame/parser.Y" +#line 2819 "frame/parser.Y" {fr->updateFitsCmd(1);;} break; case 1235: -#line 2820 "frame/parser.Y" +#line 2821 "frame/parser.Y" {fr->updateFitsCmd((yyvsp[(2) - (6)].integer),BBox((yyvsp[(3) - (6)].real),(yyvsp[(4) - (6)].real),(yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real)),1);;} break; case 1237: -#line 2824 "frame/parser.Y" +#line 2825 "frame/parser.Y" {fr->sliceCmd(2,(yyvsp[(1) - (1)].integer));;} break; case 1238: -#line 2825 "frame/parser.Y" +#line 2826 "frame/parser.Y" {fr->sliceCmd((yyvsp[(1) - (2)].integer),(yyvsp[(2) - (2)].integer));;} break; case 1239: -#line 2826 "frame/parser.Y" +#line 2827 "frame/parser.Y" {fr->sliceCmd((yyvsp[(1) - (2)].real), (Coord::CoordSystem)(yyvsp[(2) - (2)].integer));;} break; case 1240: -#line 2829 "frame/parser.Y" +#line 2830 "frame/parser.Y" {fr->warpCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;} break; case 1241: -#line 2830 "frame/parser.Y" +#line 2831 "frame/parser.Y" {fr->warpToCmd(Vector((yyvsp[(2) - (3)].real),(yyvsp[(3) - (3)].real)));;} break; case 1242: -#line 2834 "frame/parser.Y" +#line 2835 "frame/parser.Y" {fr->wcsCmd((Coord::CoordSystem)(yyvsp[(1) - (3)].integer), (Coord::SkyFrame)(yyvsp[(2) - (3)].integer), (Coord::SkyFormat)(yyvsp[(3) - (3)].integer));;} break; case 1244: -#line 2836 "frame/parser.Y" +#line 2837 "frame/parser.Y" {fr->wcsResetCmd((yyvsp[(2) - (2)].integer));;} break; case 1247: -#line 2841 "frame/parser.Y" +#line 2842 "frame/parser.Y" {fr->wcsAppendCmd((yyvsp[(1) - (2)].integer),(yyvsp[(2) - (2)].integer));;} break; case 1248: -#line 2842 "frame/parser.Y" +#line 2843 "frame/parser.Y" {fr->wcsAppendCmd((yyvsp[(1) - (2)].integer),(yyvsp[(2) - (2)].str));;} break; case 1249: -#line 2843 "frame/parser.Y" +#line 2844 "frame/parser.Y" {fr->wcsAppendTxtCmd((yyvsp[(2) - (3)].integer),(yyvsp[(3) - (3)].str));;} break; case 1250: -#line 2846 "frame/parser.Y" +#line 2847 "frame/parser.Y" {fr->wcsReplaceCmd((yyvsp[(1) - (2)].integer),(yyvsp[(2) - (2)].integer));;} break; case 1251: -#line 2847 "frame/parser.Y" +#line 2848 "frame/parser.Y" {fr->wcsReplaceCmd((yyvsp[(1) - (2)].integer),(yyvsp[(2) - (2)].str));;} break; case 1252: -#line 2848 "frame/parser.Y" +#line 2849 "frame/parser.Y" {fr->wcsReplaceTxtCmd((yyvsp[(2) - (3)].integer),(yyvsp[(3) - (3)].str));;} break; case 1253: -#line 2851 "frame/parser.Y" +#line 2852 "frame/parser.Y" {fr->wcsAlignCmd((yyvsp[(1) - (1)].integer));;} break; case 1254: -#line 2853 "frame/parser.Y" +#line 2854 "frame/parser.Y" { // used by backup fr->wcsAlignCmd((yyvsp[(1) - (3)].integer), (Coord::CoordSystem)(yyvsp[(2) - (3)].integer), (Coord::SkyFrame)(yyvsp[(3) - (3)].integer)); @@ -10827,12 +10828,12 @@ yyreduce: break; case 1255: -#line 2858 "frame/parser.Y" +#line 2859 "frame/parser.Y" {fr->wcsAlignCmd((yyvsp[(1) - (4)].integer), (FitsImage*)(yyvsp[(2) - (4)].ptr), (Coord::CoordSystem)(yyvsp[(3) - (4)].integer), (Coord::SkyFrame)(yyvsp[(4) - (4)].integer));;} break; case 1256: -#line 2861 "frame/parser.Y" +#line 2862 "frame/parser.Y" { #ifdef __WIN32 fr->win32PrintCmd(); @@ -10841,17 +10842,17 @@ yyreduce: break; case 1257: -#line 2868 "frame/parser.Y" +#line 2869 "frame/parser.Y" {fr->zoomCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;} break; case 1258: -#line 2870 "frame/parser.Y" +#line 2871 "frame/parser.Y" {fr->zoomAboutCmd(Vector((yyvsp[(1) - (5)].real),(yyvsp[(2) - (5)].real)),Vector((yyvsp[(4) - (5)].real),(yyvsp[(5) - (5)].real)));;} break; case 1259: -#line 2872 "frame/parser.Y" +#line 2873 "frame/parser.Y" { // backward compatibility fr->zoomAboutCmd(Vector((yyvsp[(1) - (6)].real),(yyvsp[(2) - (6)].real)),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real))); @@ -10859,32 +10860,32 @@ yyreduce: break; case 1260: -#line 2877 "frame/parser.Y" +#line 2878 "frame/parser.Y" {fr->zoomAboutCmd(Vector((yyvsp[(1) - (6)].real),(yyvsp[(2) - (6)].real)),Vector((yyvsp[(6) - (6)].vector)), (Coord::CoordSystem)(yyvsp[(4) - (6)].integer),(Coord::SkyFrame)(yyvsp[(5) - (6)].integer));;} break; case 1262: -#line 2881 "frame/parser.Y" +#line 2882 "frame/parser.Y" {fr->zoomToFitCmd(1);;} break; case 1263: -#line 2882 "frame/parser.Y" +#line 2883 "frame/parser.Y" {fr->zoomToFitCmd((yyvsp[(2) - (2)].real));;} break; case 1264: -#line 2883 "frame/parser.Y" +#line 2884 "frame/parser.Y" {fr->zoomToCmd(Vector((yyvsp[(1) - (2)].real),(yyvsp[(2) - (2)].real)));;} break; case 1265: -#line 2885 "frame/parser.Y" +#line 2886 "frame/parser.Y" {fr->zoomToAboutCmd(Vector((yyvsp[(1) - (5)].real),(yyvsp[(2) - (5)].real)),Vector((yyvsp[(4) - (5)].real),(yyvsp[(5) - (5)].real)));;} break; case 1266: -#line 2887 "frame/parser.Y" +#line 2888 "frame/parser.Y" { // backward compatibility fr->zoomToAboutCmd(Vector((yyvsp[(1) - (6)].real),(yyvsp[(2) - (6)].real)),Vector((yyvsp[(5) - (6)].real),(yyvsp[(6) - (6)].real))); @@ -10892,14 +10893,14 @@ yyreduce: break; case 1267: -#line 2892 "frame/parser.Y" +#line 2893 "frame/parser.Y" {fr->zoomToAboutCmd(Vector((yyvsp[(1) - (6)].real),(yyvsp[(2) - (6)].real)), Vector((yyvsp[(6) - (6)].vector)), (Coord::CoordSystem)(yyvsp[(4) - (6)].integer), (Coord::SkyFrame)(yyvsp[(5) - (6)].integer));;} break; /* Line 1267 of yacc.c. */ -#line 10903 "frame/parser.C" +#line 10904 "frame/parser.C" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -11113,7 +11114,7 @@ yyreturn: } -#line 2896 "frame/parser.Y" +#line 2897 "frame/parser.Y" static void setProps(unsigned short* props, unsigned short prop, int value) diff --git a/tksao/frame/parser.H b/tksao/frame/parser.H index f7ace30..2ecd636 100644 --- a/tksao/frame/parser.H +++ b/tksao/frame/parser.H @@ -750,7 +750,7 @@ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 53 "frame/parser.Y" +#line 54 "frame/parser.Y" { #define FRBUFSIZE 4096 char chr; diff --git a/tksao/frame/parser.Y b/tksao/frame/parser.Y index 4501418..08b05cc 100644 --- a/tksao/frame/parser.Y +++ b/tksao/frame/parser.Y @@ -14,12 +14,13 @@ #include <string.h> #include <iostream> +#include "util.h" +#include "tkutil.h" #include "base.h" #include "frame3d.h" #include "fitsimage.h" #include "fitsmask.h" #include "marker.h" -#include "util.h" #undef yyFlexLexer #define yyFlexLexer frFlexLexer diff --git a/tksao/frame/point.C b/tksao/frame/point.C index 2132454..5e018b5 100644 --- a/tksao/frame/point.C +++ b/tksao/frame/point.C @@ -3,6 +3,7 @@ // For conditions of distribution and use, see copyright notice in "copyright" #include "util.h" +#include "tkutil.h" #include "point.h" #include "fitsimage.h" diff --git a/tksao/frame/prosparser.C b/tksao/frame/prosparser.C index 61eae2a..8b31315 100644 --- a/tksao/frame/prosparser.C +++ b/tksao/frame/prosparser.C @@ -153,6 +153,7 @@ #include <string.h> #include <iostream> +#include "tkutil.h" #include "base.h" #include "fitsimage.h" #include "basemarker.h" @@ -219,7 +220,7 @@ static Coord::SkyFrame checkWCSSky(); #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 66 "frame/prosparser.Y" +#line 67 "frame/prosparser.Y" { #define PROSBUFSIZE 2048 double real; @@ -228,7 +229,7 @@ typedef union YYSTYPE double vector[3]; } /* Line 193 of yacc.c. */ -#line 232 "frame/prosparser.C" +#line 233 "frame/prosparser.C" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -241,7 +242,7 @@ typedef union YYSTYPE /* Line 216 of yacc.c. */ -#line 245 "frame/prosparser.C" +#line 246 "frame/prosparser.C" #ifdef short # undef short @@ -564,16 +565,16 @@ static const yytype_int8 yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 126, 126, 129, 130, 133, 134, 135, 136, 136, - 137, 137, 138, 139, 142, 143, 144, 147, 148, 151, - 152, 155, 156, 159, 160, 163, 164, 167, 168, 171, - 172, 173, 176, 177, 178, 179, 182, 189, 196, 203, - 212, 215, 218, 221, 224, 237, 245, 253, 260, 270, - 271, 274, 275, 276, 277, 278, 281, 282, 285, 296, - 308, 309, 310, 314, 317, 321, 321, 330, 335, 349, - 356, 370, 373, 380, 384, 384, 389, 390, 393, 396, - 397, 400, 404, 431, 432, 432, 435, 435, 438, 439, - 439 + 0, 127, 127, 130, 131, 134, 135, 136, 137, 137, + 138, 138, 139, 140, 143, 144, 145, 148, 149, 152, + 153, 156, 157, 160, 161, 164, 165, 168, 169, 172, + 173, 174, 177, 178, 179, 180, 183, 190, 197, 204, + 213, 216, 219, 222, 225, 238, 246, 254, 261, 271, + 272, 275, 276, 277, 278, 279, 282, 283, 286, 297, + 309, 310, 311, 315, 318, 322, 322, 331, 336, 350, + 357, 371, 374, 381, 385, 385, 390, 391, 394, 397, + 398, 401, 405, 432, 433, 433, 436, 436, 439, 440, + 440 }; #endif @@ -1620,92 +1621,92 @@ yyreduce: switch (yyn) { case 7: -#line 135 "frame/prosparser.Y" +#line 136 "frame/prosparser.Y" {cerr << "PROS" << endl;;} break; case 8: -#line 136 "frame/prosparser.Y" +#line 137 "frame/prosparser.Y" {globalSystem = (Coord::CoordSystem)(yyvsp[(1) - (1)].integer);;} break; case 10: -#line 137 "frame/prosparser.Y" +#line 138 "frame/prosparser.Y" {globalSystem = Coord::WCS; globalSky = (Coord::SkyFrame)(yyvsp[(1) - (1)].integer);;} break; case 16: -#line 144 "frame/prosparser.Y" +#line 145 "frame/prosparser.Y" {YYACCEPT;;} break; case 17: -#line 147 "frame/prosparser.Y" +#line 148 "frame/prosparser.Y" {(yyval.real)=(yyvsp[(1) - (1)].real);;} break; case 18: -#line 148 "frame/prosparser.Y" +#line 149 "frame/prosparser.Y" {(yyval.real)=(yyvsp[(1) - (1)].integer);;} break; case 19: -#line 151 "frame/prosparser.Y" +#line 152 "frame/prosparser.Y" {yydebug=1;;} break; case 20: -#line 152 "frame/prosparser.Y" +#line 153 "frame/prosparser.Y" {yydebug=0;;} break; case 27: -#line 167 "frame/prosparser.Y" +#line 168 "frame/prosparser.Y" {(yyval.real) = 0;;} break; case 28: -#line 168 "frame/prosparser.Y" +#line 169 "frame/prosparser.Y" {(yyval.real) = (yyvsp[(1) - (1)].real);;} break; case 29: -#line 171 "frame/prosparser.Y" +#line 172 "frame/prosparser.Y" {(yyval.real) = zeroTWOPI(degToRad((yyvsp[(1) - (1)].real)));;} break; case 30: -#line 172 "frame/prosparser.Y" +#line 173 "frame/prosparser.Y" {(yyval.real) = zeroTWOPI(degToRad((yyvsp[(1) - (1)].real)));;} break; case 31: -#line 173 "frame/prosparser.Y" +#line 174 "frame/prosparser.Y" {(yyval.real)=(yyvsp[(1) - (1)].real);;} break; case 32: -#line 176 "frame/prosparser.Y" +#line 177 "frame/prosparser.Y" {(yyval.real) = FITSPTR->mapLenToRef((yyvsp[(1) - (1)].real), Coord::IMAGE);;} break; case 33: -#line 177 "frame/prosparser.Y" +#line 178 "frame/prosparser.Y" {(yyval.real) = FITSPTR->mapLenToRef((yyvsp[(1) - (1)].real), checkWCSSystem(), Coord::DEGREE);;} break; case 34: -#line 178 "frame/prosparser.Y" +#line 179 "frame/prosparser.Y" {(yyval.real) = FITSPTR->mapLenToRef((yyvsp[(1) - (1)].real), checkWCSSystem(), Coord::ARCMIN);;} break; case 35: -#line 179 "frame/prosparser.Y" +#line 180 "frame/prosparser.Y" {(yyval.real) = FITSPTR->mapLenToRef((yyvsp[(1) - (1)].real), checkWCSSystem(), Coord::ARCSEC);;} break; case 36: -#line 183 "frame/prosparser.Y" +#line 184 "frame/prosparser.Y" { Vector r = FITSPTR->mapLenToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), Coord::IMAGE); (yyval.vector)[0] = r[0]; @@ -1715,7 +1716,7 @@ yyreduce: break; case 37: -#line 190 "frame/prosparser.Y" +#line 191 "frame/prosparser.Y" { Vector r=FITSPTR->mapLenToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)),checkWCSSystem(),Coord::DEGREE); (yyval.vector)[0] = r[0]; @@ -1725,7 +1726,7 @@ yyreduce: break; case 38: -#line 197 "frame/prosparser.Y" +#line 198 "frame/prosparser.Y" { Vector r=FITSPTR->mapLenToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)),checkWCSSystem(),Coord::ARCMIN); (yyval.vector)[0] = r[0]; @@ -1735,7 +1736,7 @@ yyreduce: break; case 39: -#line 204 "frame/prosparser.Y" +#line 205 "frame/prosparser.Y" { Vector r=FITSPTR->mapLenToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)),checkWCSSystem(),Coord::ARCSEC); (yyval.vector)[0] = r[0]; @@ -1745,27 +1746,27 @@ yyreduce: break; case 40: -#line 212 "frame/prosparser.Y" +#line 213 "frame/prosparser.Y" {(yyval.integer) = (yyvsp[(3) - (3)].integer);;} break; case 41: -#line 215 "frame/prosparser.Y" +#line 216 "frame/prosparser.Y" {(yyval.real) = parseSEXStr((yyvsp[(1) - (1)].str));;} break; case 42: -#line 218 "frame/prosparser.Y" +#line 219 "frame/prosparser.Y" {(yyval.real) = parseHMSStr((yyvsp[(1) - (1)].str));;} break; case 43: -#line 221 "frame/prosparser.Y" +#line 222 "frame/prosparser.Y" {(yyval.real) = parseDMSStr((yyvsp[(1) - (1)].str));;} break; case 44: -#line 225 "frame/prosparser.Y" +#line 226 "frame/prosparser.Y" { Vector r; Coord::CoordSystem sys = checkWCSSystem(); @@ -1781,7 +1782,7 @@ yyreduce: break; case 45: -#line 238 "frame/prosparser.Y" +#line 239 "frame/prosparser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), checkWCSSystem(), checkWCSSky()); @@ -1792,7 +1793,7 @@ yyreduce: break; case 46: -#line 246 "frame/prosparser.Y" +#line 247 "frame/prosparser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), checkWCSSystem(), checkWCSSky()); @@ -1803,7 +1804,7 @@ yyreduce: break; case 47: -#line 254 "frame/prosparser.Y" +#line 255 "frame/prosparser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), localSystem, localSky); (yyval.vector)[0] = r[0]; @@ -1813,7 +1814,7 @@ yyreduce: break; case 48: -#line 261 "frame/prosparser.Y" +#line 262 "frame/prosparser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), checkWCSSystem(), checkWCSSky()); @@ -1824,52 +1825,52 @@ yyreduce: break; case 49: -#line 270 "frame/prosparser.Y" +#line 271 "frame/prosparser.Y" {(yyval.integer) = Coord::IMAGE;;} break; case 50: -#line 271 "frame/prosparser.Y" +#line 272 "frame/prosparser.Y" {(yyval.integer) = Coord::PHYSICAL;;} break; case 51: -#line 274 "frame/prosparser.Y" +#line 275 "frame/prosparser.Y" {(yyval.integer) = (yyvsp[(2) - (2)].integer);;} break; case 52: -#line 275 "frame/prosparser.Y" +#line 276 "frame/prosparser.Y" {(yyval.integer) = Coord::FK4;;} break; case 53: -#line 276 "frame/prosparser.Y" +#line 277 "frame/prosparser.Y" {(yyval.integer) = Coord::FK5;;} break; case 54: -#line 277 "frame/prosparser.Y" +#line 278 "frame/prosparser.Y" {(yyval.integer) = Coord::GALACTIC;;} break; case 55: -#line 278 "frame/prosparser.Y" +#line 279 "frame/prosparser.Y" {(yyval.integer) = Coord::ECLIPTIC;;} break; case 56: -#line 281 "frame/prosparser.Y" +#line 282 "frame/prosparser.Y" {(yyval.integer) = Coord::FK4;;} break; case 57: -#line 282 "frame/prosparser.Y" +#line 283 "frame/prosparser.Y" {(yyval.integer) = Coord::FK5;;} break; case 58: -#line 285 "frame/prosparser.Y" +#line 286 "frame/prosparser.Y" { // global properties globalSystem = Coord::IMAGE; @@ -1882,7 +1883,7 @@ yyreduce: break; case 59: -#line 296 "frame/prosparser.Y" +#line 297 "frame/prosparser.Y" { // reset maperr flag maperr =0; @@ -1896,40 +1897,40 @@ yyreduce: break; case 60: -#line 308 "frame/prosparser.Y" +#line 309 "frame/prosparser.Y" {setProps(&localProps, Marker::INCLUDE, 1);;} break; case 61: -#line 309 "frame/prosparser.Y" +#line 310 "frame/prosparser.Y" {setProps(&localProps, Marker::INCLUDE, 1);;} break; case 62: -#line 310 "frame/prosparser.Y" +#line 311 "frame/prosparser.Y" {setProps(&localProps, Marker::INCLUDE, 0);;} break; case 63: -#line 315 "frame/prosparser.Y" +#line 316 "frame/prosparser.Y" {fr->createCircleCmd(Vector((yyvsp[(3) - (7)].vector)), (yyvsp[(5) - (7)].real), fill_, color,dash,1,font,text,localProps,localComment,taglist,cblist);;} break; case 64: -#line 318 "frame/prosparser.Y" +#line 319 "frame/prosparser.Y" {fr->createAnnulusCmd(Vector((yyvsp[(3) - (9)].vector)), (yyvsp[(5) - (9)].real),(yyvsp[(7) - (9)].real),1, color,dash,1,font,text,localProps,localComment,taglist,cblist);;} break; case 65: -#line 321 "frame/prosparser.Y" +#line 322 "frame/prosparser.Y" {aNum=2;;} break; case 66: -#line 323 "frame/prosparser.Y" +#line 324 "frame/prosparser.Y" { aAnnuli[0] = (yyvsp[(5) - (12)].real); aAnnuli[1] = (yyvsp[(7) - (12)].real); @@ -1940,14 +1941,14 @@ yyreduce: break; case 67: -#line 331 "frame/prosparser.Y" +#line 332 "frame/prosparser.Y" {fr->createAnnulusCmd(Vector((yyvsp[(3) - (11)].vector)), (yyvsp[(5) - (11)].real),(yyvsp[(7) - (11)].real),(yyvsp[(9) - (11)].integer), color,dash,1,font,text,localProps,localComment,taglist,cblist);;} break; case 68: -#line 336 "frame/prosparser.Y" +#line 337 "frame/prosparser.Y" { // for ellipse annulus aStatus = 1; @@ -1964,7 +1965,7 @@ yyreduce: break; case 69: -#line 351 "frame/prosparser.Y" +#line 352 "frame/prosparser.Y" { aStatus = 2; aVector[aNum++] = Vector((yyvsp[(5) - (18)].vector)); @@ -1972,7 +1973,7 @@ yyreduce: break; case 70: -#line 357 "frame/prosparser.Y" +#line 358 "frame/prosparser.Y" { // for box annulus aStatus = 3; @@ -1989,13 +1990,13 @@ yyreduce: break; case 71: -#line 371 "frame/prosparser.Y" +#line 372 "frame/prosparser.Y" {fr->createBoxCmd(Vector((yyvsp[(3) - (9)].vector)), Vector((yyvsp[(5) - (9)].vector)), (yyvsp[(7) - (9)].real), fill_, color,dash,1,font,text,localProps,localComment,taglist,cblist);;} break; case 72: -#line 375 "frame/prosparser.Y" +#line 376 "frame/prosparser.Y" { aStatus = 4; aVector[aNum++] = Vector((yyvsp[(5) - (18)].vector)); @@ -2003,34 +2004,34 @@ yyreduce: break; case 73: -#line 381 "frame/prosparser.Y" +#line 382 "frame/prosparser.Y" {fr->createPointCmd(Vector((yyvsp[(3) - (5)].vector)), Point::BOXCIRCLE, POINTSIZE, color,dash,1,font,text,localProps,localComment,taglist,cblist);;} break; case 74: -#line 384 "frame/prosparser.Y" +#line 385 "frame/prosparser.Y" {polylist.deleteAll();;} break; case 75: -#line 385 "frame/prosparser.Y" +#line 386 "frame/prosparser.Y" {fr->createPolygonCmd(polylist, fill_, color,dash,1,font,text,localProps,localComment,taglist,cblist);;} break; case 78: -#line 393 "frame/prosparser.Y" +#line 394 "frame/prosparser.Y" {polylist.append(new Vertex((yyvsp[(1) - (1)].vector)));;} break; case 81: -#line 400 "frame/prosparser.Y" +#line 401 "frame/prosparser.Y" {aAnnuli[aNum++] = (yyvsp[(1) - (1)].real);;} break; case 82: -#line 404 "frame/prosparser.Y" +#line 405 "frame/prosparser.Y" { switch (aStatus) { case 0: // do nothing @@ -2059,28 +2060,28 @@ yyreduce: break; case 84: -#line 432 "frame/prosparser.Y" +#line 433 "frame/prosparser.Y" {DISCARD_(1);;} break; case 86: -#line 435 "frame/prosparser.Y" +#line 436 "frame/prosparser.Y" {DISCARD_(1);;} break; case 89: -#line 439 "frame/prosparser.Y" +#line 440 "frame/prosparser.Y" {DISCARD_(0);;} break; case 90: -#line 440 "frame/prosparser.Y" +#line 441 "frame/prosparser.Y" {strncpy(localComment,(yyvsp[(3) - (4)].str),80);;} break; /* Line 1267 of yacc.c. */ -#line 2084 "frame/prosparser.C" +#line 2085 "frame/prosparser.C" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2294,7 +2295,7 @@ yyreturn: } -#line 443 "frame/prosparser.Y" +#line 444 "frame/prosparser.Y" static void setProps(unsigned short* props, unsigned short prop, int value) diff --git a/tksao/frame/prosparser.H b/tksao/frame/prosparser.H index edbab7d..4c76972 100644 --- a/tksao/frame/prosparser.H +++ b/tksao/frame/prosparser.H @@ -108,7 +108,7 @@ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 66 "frame/prosparser.Y" +#line 67 "frame/prosparser.Y" { #define PROSBUFSIZE 2048 double real; diff --git a/tksao/frame/prosparser.Y b/tksao/frame/prosparser.Y index 0e10b93..a66fb86 100644 --- a/tksao/frame/prosparser.Y +++ b/tksao/frame/prosparser.Y @@ -17,6 +17,7 @@ #include <string.h> #include <iostream> +#include "tkutil.h" #include "base.h" #include "fitsimage.h" #include "basemarker.h" diff --git a/tksao/frame/saoparser.C b/tksao/frame/saoparser.C index a805259..8b894ee 100644 --- a/tksao/frame/saoparser.C +++ b/tksao/frame/saoparser.C @@ -125,6 +125,7 @@ #include <string.h> #include <iostream> +#include "tkutil.h" #include "base.h" #include "fitsimage.h" #include "basemarker.h" @@ -185,7 +186,7 @@ static void setProps(unsigned short* props, unsigned short prop, int value); #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 60 "frame/saoparser.Y" +#line 61 "frame/saoparser.Y" { #define SAOBUFSIZE 2048 double real; @@ -194,7 +195,7 @@ typedef union YYSTYPE double vector[3]; } /* Line 193 of yacc.c. */ -#line 198 "frame/saoparser.C" +#line 199 "frame/saoparser.C" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -207,7 +208,7 @@ typedef union YYSTYPE /* Line 216 of yacc.c. */ -#line 211 "frame/saoparser.C" +#line 212 "frame/saoparser.C" #ifdef short # undef short @@ -518,12 +519,12 @@ static const yytype_int8 yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 98, 98, 101, 102, 105, 106, 107, 108, 109, - 112, 113, 114, 117, 118, 121, 122, 125, 126, 129, - 130, 133, 134, 137, 138, 141, 144, 147, 156, 159, - 168, 176, 184, 185, 186, 189, 192, 196, 196, 205, - 211, 225, 232, 246, 249, 256, 260, 260, 265, 266, - 269, 272, 273, 276, 280, 307, 307, 310, 311, 311 + 0, 99, 99, 102, 103, 106, 107, 108, 109, 110, + 113, 114, 115, 118, 119, 122, 123, 126, 127, 130, + 131, 134, 135, 138, 139, 142, 145, 148, 157, 160, + 169, 177, 185, 186, 187, 190, 193, 197, 197, 206, + 212, 226, 233, 247, 250, 257, 261, 261, 266, 267, + 270, 273, 274, 277, 281, 308, 308, 311, 312, 312 }; #endif @@ -1529,57 +1530,57 @@ yyreduce: switch (yyn) { case 7: -#line 107 "frame/saoparser.Y" +#line 108 "frame/saoparser.Y" {cerr << "SAOimage" << endl;;} break; case 12: -#line 114 "frame/saoparser.Y" +#line 115 "frame/saoparser.Y" {YYACCEPT;;} break; case 13: -#line 117 "frame/saoparser.Y" +#line 118 "frame/saoparser.Y" {(yyval.real)=(yyvsp[(1) - (1)].real);;} break; case 14: -#line 118 "frame/saoparser.Y" +#line 119 "frame/saoparser.Y" {(yyval.real)=(yyvsp[(1) - (1)].integer);;} break; case 15: -#line 121 "frame/saoparser.Y" +#line 122 "frame/saoparser.Y" {yydebug=1;;} break; case 16: -#line 122 "frame/saoparser.Y" +#line 123 "frame/saoparser.Y" {yydebug=0;;} break; case 23: -#line 137 "frame/saoparser.Y" +#line 138 "frame/saoparser.Y" {(yyval.real) = 0;;} break; case 24: -#line 138 "frame/saoparser.Y" +#line 139 "frame/saoparser.Y" {(yyval.real) = (yyvsp[(1) - (1)].real);;} break; case 25: -#line 141 "frame/saoparser.Y" +#line 142 "frame/saoparser.Y" {(yyval.real) = zeroTWOPI(degToRad((yyvsp[(1) - (1)].real)));;} break; case 26: -#line 144 "frame/saoparser.Y" +#line 145 "frame/saoparser.Y" {(yyval.real) = FITSPTR->mapLenToRef((yyvsp[(1) - (1)].real), Coord::IMAGE);;} break; case 27: -#line 148 "frame/saoparser.Y" +#line 149 "frame/saoparser.Y" { Vector r = FITSPTR->mapLenToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), Coord::IMAGE); (yyval.vector)[0] = r[0]; @@ -1589,12 +1590,12 @@ yyreduce: break; case 28: -#line 156 "frame/saoparser.Y" +#line 157 "frame/saoparser.Y" {(yyval.integer) = (yyvsp[(3) - (3)].integer);;} break; case 29: -#line 160 "frame/saoparser.Y" +#line 161 "frame/saoparser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), Coord::IMAGE); (yyval.vector)[0] = r[0]; @@ -1604,7 +1605,7 @@ yyreduce: break; case 30: -#line 168 "frame/saoparser.Y" +#line 169 "frame/saoparser.Y" { globalProps = Marker::SELECT | Marker::EDIT | Marker::MOVE | @@ -1614,7 +1615,7 @@ yyreduce: break; case 31: -#line 176 "frame/saoparser.Y" +#line 177 "frame/saoparser.Y" { // reset maperr flag maperr =0; @@ -1624,40 +1625,40 @@ yyreduce: break; case 32: -#line 184 "frame/saoparser.Y" +#line 185 "frame/saoparser.Y" {setProps(&localProps, Marker::INCLUDE, 1);;} break; case 33: -#line 185 "frame/saoparser.Y" +#line 186 "frame/saoparser.Y" {setProps(&localProps, Marker::INCLUDE, 1);;} break; case 34: -#line 186 "frame/saoparser.Y" +#line 187 "frame/saoparser.Y" {setProps(&localProps, Marker::INCLUDE, 0);;} break; case 35: -#line 190 "frame/saoparser.Y" +#line 191 "frame/saoparser.Y" {fr->createCircleCmd(Vector((yyvsp[(3) - (7)].vector)), (yyvsp[(5) - (7)].real), fill_, color,dash,1,font,text,localProps,localComment,taglist,cblist);;} break; case 36: -#line 193 "frame/saoparser.Y" +#line 194 "frame/saoparser.Y" {fr->createAnnulusCmd(Vector((yyvsp[(3) - (9)].vector)), (yyvsp[(5) - (9)].real),(yyvsp[(7) - (9)].real),1, color,dash,1,font,text,localProps,localComment,taglist,cblist);;} break; case 37: -#line 196 "frame/saoparser.Y" +#line 197 "frame/saoparser.Y" {aNum=2;;} break; case 38: -#line 198 "frame/saoparser.Y" +#line 199 "frame/saoparser.Y" { aAnnuli[0] = (yyvsp[(5) - (12)].real); aAnnuli[1] = (yyvsp[(7) - (12)].real); @@ -1668,14 +1669,14 @@ yyreduce: break; case 39: -#line 206 "frame/saoparser.Y" +#line 207 "frame/saoparser.Y" {fr->createAnnulusCmd(Vector((yyvsp[(3) - (11)].vector)), (yyvsp[(5) - (11)].real),(yyvsp[(7) - (11)].real),(yyvsp[(9) - (11)].integer), color,dash,1,font,text,localProps,localComment,taglist,cblist);;} break; case 40: -#line 212 "frame/saoparser.Y" +#line 213 "frame/saoparser.Y" { // for ellipse annulus aStatus = 1; @@ -1692,7 +1693,7 @@ yyreduce: break; case 41: -#line 227 "frame/saoparser.Y" +#line 228 "frame/saoparser.Y" { aStatus = 2; aVector[aNum++] = Vector((yyvsp[(5) - (18)].vector)); @@ -1700,7 +1701,7 @@ yyreduce: break; case 42: -#line 233 "frame/saoparser.Y" +#line 234 "frame/saoparser.Y" { // for box annulus aStatus = 3; @@ -1717,13 +1718,13 @@ yyreduce: break; case 43: -#line 247 "frame/saoparser.Y" +#line 248 "frame/saoparser.Y" {fr->createBoxCmd(Vector((yyvsp[(3) - (9)].vector)), Vector((yyvsp[(5) - (9)].vector)), (yyvsp[(7) - (9)].real), fill_, color,dash,1,font,text,localProps,localComment,taglist,cblist);;} break; case 44: -#line 251 "frame/saoparser.Y" +#line 252 "frame/saoparser.Y" { aStatus = 4; aVector[aNum++] = Vector((yyvsp[(5) - (18)].vector)); @@ -1731,34 +1732,34 @@ yyreduce: break; case 45: -#line 257 "frame/saoparser.Y" +#line 258 "frame/saoparser.Y" {fr->createPointCmd(Vector((yyvsp[(3) - (5)].vector)), Point::BOXCIRCLE, POINTSIZE, color,dash,1,font,text,localProps,localComment,taglist,cblist);;} break; case 46: -#line 260 "frame/saoparser.Y" +#line 261 "frame/saoparser.Y" {polylist.deleteAll();;} break; case 47: -#line 261 "frame/saoparser.Y" +#line 262 "frame/saoparser.Y" {fr->createPolygonCmd(polylist, fill_, color,dash,1,font,text,localProps,localComment,taglist,cblist);;} break; case 50: -#line 269 "frame/saoparser.Y" +#line 270 "frame/saoparser.Y" {polylist.append(new Vertex((yyvsp[(1) - (1)].vector)));;} break; case 53: -#line 276 "frame/saoparser.Y" +#line 277 "frame/saoparser.Y" {aAnnuli[aNum++] = (yyvsp[(1) - (1)].real);;} break; case 54: -#line 280 "frame/saoparser.Y" +#line 281 "frame/saoparser.Y" { switch (aStatus) { case 0: // do nothing @@ -1787,23 +1788,23 @@ yyreduce: break; case 55: -#line 307 "frame/saoparser.Y" +#line 308 "frame/saoparser.Y" {DISCARD_(1);;} break; case 58: -#line 311 "frame/saoparser.Y" +#line 312 "frame/saoparser.Y" {DISCARD_(0);;} break; case 59: -#line 312 "frame/saoparser.Y" +#line 313 "frame/saoparser.Y" {strncpy(localComment,(yyvsp[(3) - (4)].str),80);;} break; /* Line 1267 of yacc.c. */ -#line 1807 "frame/saoparser.C" +#line 1808 "frame/saoparser.C" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2017,7 +2018,7 @@ yyreturn: } -#line 315 "frame/saoparser.Y" +#line 316 "frame/saoparser.Y" static void setProps(unsigned short* props, unsigned short prop, int value) diff --git a/tksao/frame/saoparser.H b/tksao/frame/saoparser.H index 541f58d..f90c391 100644 --- a/tksao/frame/saoparser.H +++ b/tksao/frame/saoparser.H @@ -80,7 +80,7 @@ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 60 "frame/saoparser.Y" +#line 61 "frame/saoparser.Y" { #define SAOBUFSIZE 2048 double real; diff --git a/tksao/frame/saoparser.Y b/tksao/frame/saoparser.Y index 469d30f..339db03 100644 --- a/tksao/frame/saoparser.Y +++ b/tksao/frame/saoparser.Y @@ -17,6 +17,7 @@ #include <string.h> #include <iostream> +#include "tkutil.h" #include "base.h" #include "fitsimage.h" #include "basemarker.h" diff --git a/tksao/frame/text.C b/tksao/frame/text.C index 23f0fcd..31b24e8 100644 --- a/tksao/frame/text.C +++ b/tksao/frame/text.C @@ -3,6 +3,7 @@ // For conditions of distribution and use, see copyright notice in "copyright" #include "util.h" +#include "tkutil.h" #include "text.h" #include "fitsimage.h" diff --git a/tksao/frame/tngparser.C b/tksao/frame/tngparser.C index 9a096d9..dbd3410 100644 --- a/tksao/frame/tngparser.C +++ b/tksao/frame/tngparser.C @@ -175,6 +175,7 @@ #include <string.h> #include <iostream> +#include "tkutil.h" #include "base.h" #include "fitsimage.h" #include "basemarker.h" @@ -237,7 +238,7 @@ static Coord::SkyFrame checkWCSSky(); #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 62 "frame/tngparser.Y" +#line 63 "frame/tngparser.Y" { #define TNGBUFSIZE 2048 double real; @@ -246,7 +247,7 @@ typedef union YYSTYPE double vector[3]; } /* Line 193 of yacc.c. */ -#line 250 "frame/tngparser.C" +#line 251 "frame/tngparser.C" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -259,7 +260,7 @@ typedef union YYSTYPE /* Line 216 of yacc.c. */ -#line 263 "frame/tngparser.C" +#line 264 "frame/tngparser.C" #ifdef short # undef short @@ -576,15 +577,15 @@ static const yytype_int8 yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 128, 128, 131, 132, 135, 136, 137, 138, 139, - 142, 143, 144, 147, 148, 151, 152, 155, 156, 159, - 160, 163, 164, 167, 168, 171, 172, 175, 178, 187, - 190, 204, 211, 221, 222, 223, 224, 225, 226, 227, - 230, 244, 260, 261, 262, 265, 270, 275, 280, 287, - 292, 292, 298, 298, 304, 305, 308, 311, 312, 312, - 313, 313, 314, 314, 317, 318, 319, 320, 321, 322, - 323, 324, 325, 326, 331, 336, 336, 339, 340, 341, - 342, 346, 350 + 0, 129, 129, 132, 133, 136, 137, 138, 139, 140, + 143, 144, 145, 148, 149, 152, 153, 156, 157, 160, + 161, 164, 165, 168, 169, 172, 173, 176, 179, 188, + 191, 205, 212, 222, 223, 224, 225, 226, 227, 228, + 231, 245, 261, 262, 263, 266, 271, 276, 281, 288, + 293, 293, 299, 299, 305, 306, 309, 312, 313, 313, + 314, 314, 315, 315, 318, 319, 320, 321, 322, 323, + 324, 325, 326, 327, 332, 337, 337, 340, 341, 342, + 343, 347, 351 }; #endif @@ -1600,62 +1601,62 @@ yyreduce: switch (yyn) { case 7: -#line 137 "frame/tngparser.Y" +#line 138 "frame/tngparser.Y" {cerr << "SAOtng" << endl;;} break; case 12: -#line 144 "frame/tngparser.Y" +#line 145 "frame/tngparser.Y" {YYACCEPT;;} break; case 13: -#line 147 "frame/tngparser.Y" +#line 148 "frame/tngparser.Y" {(yyval.real)=(yyvsp[(1) - (1)].real);;} break; case 14: -#line 148 "frame/tngparser.Y" +#line 149 "frame/tngparser.Y" {(yyval.real)=(yyvsp[(1) - (1)].integer);;} break; case 15: -#line 151 "frame/tngparser.Y" +#line 152 "frame/tngparser.Y" {yydebug=1;;} break; case 16: -#line 152 "frame/tngparser.Y" +#line 153 "frame/tngparser.Y" {yydebug=0;;} break; case 23: -#line 167 "frame/tngparser.Y" +#line 168 "frame/tngparser.Y" {(yyval.real) = 0;;} break; case 24: -#line 168 "frame/tngparser.Y" +#line 169 "frame/tngparser.Y" {(yyval.real) = (yyvsp[(1) - (1)].real);;} break; case 25: -#line 171 "frame/tngparser.Y" +#line 172 "frame/tngparser.Y" {(yyval.real) = zeroTWOPI(degToRad((yyvsp[(1) - (1)].real)));;} break; case 26: -#line 172 "frame/tngparser.Y" +#line 173 "frame/tngparser.Y" {(yyval.real) = zeroTWOPI(degToRad((yyvsp[(1) - (1)].real)));;} break; case 27: -#line 175 "frame/tngparser.Y" +#line 176 "frame/tngparser.Y" {(yyval.real) = FITSPTR->mapLenToRef((yyvsp[(1) - (1)].real),Coord::IMAGE);;} break; case 28: -#line 179 "frame/tngparser.Y" +#line 180 "frame/tngparser.Y" { Vector r = FITSPTR->mapLenToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), Coord::IMAGE); (yyval.vector)[0] = r[0]; @@ -1665,12 +1666,12 @@ yyreduce: break; case 29: -#line 187 "frame/tngparser.Y" +#line 188 "frame/tngparser.Y" {(yyval.real) = parseSEXStr((yyvsp[(1) - (1)].str));;} break; case 30: -#line 191 "frame/tngparser.Y" +#line 192 "frame/tngparser.Y" { Vector r; Coord::CoordSystem sys = checkWCSSystem(); @@ -1687,7 +1688,7 @@ yyreduce: break; case 31: -#line 205 "frame/tngparser.Y" +#line 206 "frame/tngparser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), localSystem, localSky); (yyval.vector)[0] = r[0]; @@ -1697,7 +1698,7 @@ yyreduce: break; case 32: -#line 212 "frame/tngparser.Y" +#line 213 "frame/tngparser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), checkWCSSystem(), checkWCSSky()); @@ -1708,42 +1709,42 @@ yyreduce: break; case 33: -#line 221 "frame/tngparser.Y" +#line 222 "frame/tngparser.Y" {(yyval.integer) = Coord::FK4;;} break; case 34: -#line 222 "frame/tngparser.Y" +#line 223 "frame/tngparser.Y" {(yyval.integer) = Coord::FK4;;} break; case 35: -#line 223 "frame/tngparser.Y" +#line 224 "frame/tngparser.Y" {(yyval.integer) = Coord::FK5;;} break; case 36: -#line 224 "frame/tngparser.Y" +#line 225 "frame/tngparser.Y" {(yyval.integer) = Coord::FK5;;} break; case 37: -#line 225 "frame/tngparser.Y" +#line 226 "frame/tngparser.Y" {(yyval.integer) = Coord::ICRS;;} break; case 38: -#line 226 "frame/tngparser.Y" +#line 227 "frame/tngparser.Y" {(yyval.integer) = Coord::GALACTIC;;} break; case 39: -#line 227 "frame/tngparser.Y" +#line 228 "frame/tngparser.Y" {(yyval.integer) = Coord::ECLIPTIC;;} break; case 40: -#line 230 "frame/tngparser.Y" +#line 231 "frame/tngparser.Y" { // global properties globalSystem = Coord::IMAGE; @@ -1759,7 +1760,7 @@ yyreduce: break; case 41: -#line 244 "frame/tngparser.Y" +#line 245 "frame/tngparser.Y" { // reset maperr flag maperr =0; @@ -1777,43 +1778,43 @@ yyreduce: break; case 42: -#line 260 "frame/tngparser.Y" +#line 261 "frame/tngparser.Y" {setProps(&localProps, Marker::INCLUDE, 1);;} break; case 43: -#line 261 "frame/tngparser.Y" +#line 262 "frame/tngparser.Y" {setProps(&localProps, Marker::INCLUDE, 1);;} break; case 44: -#line 262 "frame/tngparser.Y" +#line 263 "frame/tngparser.Y" {setProps(&localProps, Marker::INCLUDE, 0);;} break; case 45: -#line 266 "frame/tngparser.Y" +#line 267 "frame/tngparser.Y" {fr->createCircleCmd(Vector((yyvsp[(3) - (7)].vector)), (yyvsp[(5) - (7)].real), fill_, localColor,dash,1,globalFont,localText, localProps,localComment,taglist,cblist);;} break; case 46: -#line 271 "frame/tngparser.Y" +#line 272 "frame/tngparser.Y" {fr->createEllipseCmd(Vector((yyvsp[(3) - (9)].vector)), Vector((yyvsp[(5) - (9)].vector)), (yyvsp[(7) - (9)].real), fill_, localColor,dash,1,globalFont,localText, localProps,localComment,taglist,cblist);;} break; case 47: -#line 276 "frame/tngparser.Y" +#line 277 "frame/tngparser.Y" {fr->createBoxCmd(Vector((yyvsp[(3) - (9)].vector)), Vector((yyvsp[(5) - (9)].vector)), (yyvsp[(7) - (9)].real), fill_, localColor,dash,1,globalFont,localText, localProps,localComment,taglist,cblist);;} break; case 48: -#line 281 "frame/tngparser.Y" +#line 282 "frame/tngparser.Y" {fr->createLineCmd(Vector((yyvsp[(3) - (7)].vector)), Vector((yyvsp[(5) - (7)].vector)), 0,0, @@ -1822,19 +1823,19 @@ yyreduce: break; case 49: -#line 288 "frame/tngparser.Y" +#line 289 "frame/tngparser.Y" {fr->createPointCmd(Vector((yyvsp[(3) - (5)].vector)), Point::BOXCIRCLE, POINTSIZE, localColor,dash,1,globalFont,localText, localProps,localComment,taglist,cblist);;} break; case 50: -#line 292 "frame/tngparser.Y" +#line 293 "frame/tngparser.Y" {strncpy(localText,(yyvsp[(5) - (6)].str),80);;} break; case 51: -#line 293 "frame/tngparser.Y" +#line 294 "frame/tngparser.Y" {fr->createTextCmd(Vector((yyvsp[(3) - (8)].vector)), 0, 1, localColor,dash,1,globalFont,localText, @@ -1842,84 +1843,84 @@ yyreduce: break; case 52: -#line 298 "frame/tngparser.Y" +#line 299 "frame/tngparser.Y" {polylist.deleteAll();;} break; case 53: -#line 299 "frame/tngparser.Y" +#line 300 "frame/tngparser.Y" {fr->createPolygonCmd(polylist, fill_, localColor,dash,1,globalFont,localText, localProps,localComment,taglist,cblist);;} break; case 56: -#line 308 "frame/tngparser.Y" +#line 309 "frame/tngparser.Y" {polylist.append(new Vertex((yyvsp[(1) - (1)].vector)));;} break; case 58: -#line 312 "frame/tngparser.Y" +#line 313 "frame/tngparser.Y" {DISCARD_(0);;} break; case 60: -#line 313 "frame/tngparser.Y" +#line 314 "frame/tngparser.Y" {DISCARD_(0);;} break; case 62: -#line 314 "frame/tngparser.Y" +#line 315 "frame/tngparser.Y" {DISCARD_(1);;} break; case 63: -#line 314 "frame/tngparser.Y" +#line 315 "frame/tngparser.Y" {strncpy(globalText,(yyvsp[(3) - (3)].str),80);;} break; case 65: -#line 318 "frame/tngparser.Y" +#line 319 "frame/tngparser.Y" {strcpy(localColor,"white");;} break; case 66: -#line 319 "frame/tngparser.Y" +#line 320 "frame/tngparser.Y" {strcpy(localColor,"black");;} break; case 67: -#line 320 "frame/tngparser.Y" +#line 321 "frame/tngparser.Y" {strcpy(localColor,"red");;} break; case 68: -#line 321 "frame/tngparser.Y" +#line 322 "frame/tngparser.Y" {strcpy(localColor,"green");;} break; case 69: -#line 322 "frame/tngparser.Y" +#line 323 "frame/tngparser.Y" {strcpy(localColor,"blue");;} break; case 70: -#line 323 "frame/tngparser.Y" +#line 324 "frame/tngparser.Y" {strcpy(localColor,"cyan");;} break; case 71: -#line 324 "frame/tngparser.Y" +#line 325 "frame/tngparser.Y" {strcpy(localColor,"magenta");;} break; case 72: -#line 325 "frame/tngparser.Y" +#line 326 "frame/tngparser.Y" {strcpy(localColor,"yellow");;} break; case 73: -#line 327 "frame/tngparser.Y" +#line 328 "frame/tngparser.Y" { strcpy(localColor,"green"); setProps(&localProps,Marker::SOURCE,1); @@ -1927,7 +1928,7 @@ yyreduce: break; case 74: -#line 332 "frame/tngparser.Y" +#line 333 "frame/tngparser.Y" { strcpy(localColor,"red"); setProps(&localProps,Marker::SOURCE,0); @@ -1935,27 +1936,27 @@ yyreduce: break; case 75: -#line 336 "frame/tngparser.Y" +#line 337 "frame/tngparser.Y" {DISCARD_(1);;} break; case 76: -#line 336 "frame/tngparser.Y" +#line 337 "frame/tngparser.Y" {strncpy(localComment,(yyvsp[(3) - (3)].str),80);;} break; case 79: -#line 341 "frame/tngparser.Y" +#line 342 "frame/tngparser.Y" {globalSystem = localSystem = Coord::IMAGE;;} break; case 80: -#line 342 "frame/tngparser.Y" +#line 343 "frame/tngparser.Y" {globalSystem = localSystem = Coord::IMAGE;;} break; case 81: -#line 346 "frame/tngparser.Y" +#line 347 "frame/tngparser.Y" { globalSystem = localSystem = Coord::WCS; globalSky = localSky = Coord::FK5; @@ -1963,7 +1964,7 @@ yyreduce: break; case 82: -#line 351 "frame/tngparser.Y" +#line 352 "frame/tngparser.Y" { globalSystem = localSystem = Coord::WCS; globalSky = localSky = (Coord::SkyFrame)(yyvsp[(2) - (3)].integer); @@ -1972,7 +1973,7 @@ yyreduce: /* Line 1267 of yacc.c. */ -#line 1976 "frame/tngparser.C" +#line 1977 "frame/tngparser.C" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2186,7 +2187,7 @@ yyreturn: } -#line 357 "frame/tngparser.Y" +#line 358 "frame/tngparser.Y" static void setProps(unsigned short* props, unsigned short prop, int value) diff --git a/tksao/frame/tngparser.H b/tksao/frame/tngparser.H index a393d99..097d421 100644 --- a/tksao/frame/tngparser.H +++ b/tksao/frame/tngparser.H @@ -130,7 +130,7 @@ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 62 "frame/tngparser.Y" +#line 63 "frame/tngparser.Y" { #define TNGBUFSIZE 2048 double real; diff --git a/tksao/frame/tngparser.Y b/tksao/frame/tngparser.Y index f54b619..548caa5 100644 --- a/tksao/frame/tngparser.Y +++ b/tksao/frame/tngparser.Y @@ -17,6 +17,7 @@ #include <string.h> #include <iostream> +#include "tkutil.h" #include "base.h" #include "fitsimage.h" #include "basemarker.h" diff --git a/tksao/frame/xyparser.C b/tksao/frame/xyparser.C index fbe6524..56e2519 100644 --- a/tksao/frame/xyparser.C +++ b/tksao/frame/xyparser.C @@ -194,6 +194,7 @@ #include <string.h> #include <iostream> +#include "tkutil.h" #include "base.h" #include "fitsimage.h" #include "basemarker.h" @@ -240,7 +241,7 @@ static List<CallBack> cblist; #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 45 "frame/xyparser.Y" +#line 46 "frame/xyparser.Y" { #define XYBUFSIZE 2048 double real; @@ -249,7 +250,7 @@ typedef union YYSTYPE double vector[3]; } /* Line 193 of yacc.c. */ -#line 253 "frame/xyparser.C" +#line 254 "frame/xyparser.C" YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 @@ -262,7 +263,7 @@ typedef union YYSTYPE /* Line 216 of yacc.c. */ -#line 266 "frame/xyparser.C" +#line 267 "frame/xyparser.C" #ifdef short # undef short @@ -571,14 +572,14 @@ static const yytype_int8 yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 120, 120, 120, 126, 127, 130, 131, 132, 133, - 134, 136, 136, 139, 140, 143, 144, 147, 150, 151, - 152, 155, 156, 159, 160, 163, 164, 167, 170, 173, - 176, 187, 194, 201, 208, 217, 218, 219, 220, 221, - 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, - 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, - 242, 243, 244, 245, 246, 247, 248, 249, 252, 253, - 254, 255, 256, 257, 258, 261 + 0, 121, 121, 121, 127, 128, 131, 132, 133, 134, + 135, 137, 137, 140, 141, 144, 145, 148, 151, 152, + 153, 156, 157, 160, 161, 164, 165, 168, 171, 174, + 177, 188, 195, 202, 209, 218, 219, 220, 221, 222, + 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, + 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, + 243, 244, 245, 246, 247, 248, 249, 250, 253, 254, + 255, 256, 257, 258, 259, 262 }; #endif @@ -1564,7 +1565,7 @@ yyreduce: switch (yyn) { case 2: -#line 120 "frame/xyparser.Y" +#line 121 "frame/xyparser.Y" { globalSystem = fr->xySystem(); globalSky = fr->xySky(); @@ -1572,72 +1573,72 @@ yyreduce: break; case 8: -#line 132 "frame/xyparser.Y" +#line 133 "frame/xyparser.Y" {cerr << "X Y Format 1.0" << endl;;} break; case 9: -#line 133 "frame/xyparser.Y" +#line 134 "frame/xyparser.Y" {globalSystem = (Coord::CoordSystem)(yyvsp[(1) - (1)].integer);;} break; case 10: -#line 135 "frame/xyparser.Y" +#line 136 "frame/xyparser.Y" {globalSystem = (Coord::CoordSystem)(yyvsp[(1) - (2)].integer); globalSky = (Coord::SkyFrame)(yyvsp[(2) - (2)].integer);;} break; case 11: -#line 136 "frame/xyparser.Y" +#line 137 "frame/xyparser.Y" {localSystem = globalSystem; localSky = globalSky; maperr = 0;;} break; case 17: -#line 147 "frame/xyparser.Y" +#line 148 "frame/xyparser.Y" {;} break; case 20: -#line 152 "frame/xyparser.Y" +#line 153 "frame/xyparser.Y" {YYACCEPT;;} break; case 21: -#line 155 "frame/xyparser.Y" +#line 156 "frame/xyparser.Y" {(yyval.real)=(yyvsp[(1) - (1)].real);;} break; case 22: -#line 156 "frame/xyparser.Y" +#line 157 "frame/xyparser.Y" {(yyval.real)=(yyvsp[(1) - (1)].integer);;} break; case 23: -#line 159 "frame/xyparser.Y" +#line 160 "frame/xyparser.Y" {yydebug=1;;} break; case 24: -#line 160 "frame/xyparser.Y" +#line 161 "frame/xyparser.Y" {yydebug=0;;} break; case 27: -#line 167 "frame/xyparser.Y" +#line 168 "frame/xyparser.Y" {(yyval.real) = parseSEXStr((yyvsp[(1) - (1)].str));;} break; case 28: -#line 170 "frame/xyparser.Y" +#line 171 "frame/xyparser.Y" {(yyval.real) = parseHMSStr((yyvsp[(1) - (1)].str));;} break; case 29: -#line 173 "frame/xyparser.Y" +#line 174 "frame/xyparser.Y" {(yyval.real) = parseDMSStr((yyvsp[(1) - (1)].str));;} break; case 30: -#line 177 "frame/xyparser.Y" +#line 178 "frame/xyparser.Y" { Vector r; if (localSky == Coord::GALACTIC || localSky == Coord::ECLIPTIC) @@ -1651,7 +1652,7 @@ yyreduce: break; case 31: -#line 188 "frame/xyparser.Y" +#line 189 "frame/xyparser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)),localSystem,localSky); (yyval.vector)[0] = r[0]; @@ -1661,7 +1662,7 @@ yyreduce: break; case 32: -#line 195 "frame/xyparser.Y" +#line 196 "frame/xyparser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)),localSystem,localSky); (yyval.vector)[0] = r[0]; @@ -1671,7 +1672,7 @@ yyreduce: break; case 33: -#line 202 "frame/xyparser.Y" +#line 203 "frame/xyparser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)),localSystem,localSky); (yyval.vector)[0] = r[0]; @@ -1681,7 +1682,7 @@ yyreduce: break; case 34: -#line 209 "frame/xyparser.Y" +#line 210 "frame/xyparser.Y" { Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)),localSystem,localSky); (yyval.vector)[0] = r[0]; @@ -1691,207 +1692,207 @@ yyreduce: break; case 35: -#line 217 "frame/xyparser.Y" +#line 218 "frame/xyparser.Y" {(yyval.integer) = Coord::IMAGE;;} break; case 36: -#line 218 "frame/xyparser.Y" +#line 219 "frame/xyparser.Y" {(yyval.integer) = Coord::IMAGE;;} break; case 37: -#line 219 "frame/xyparser.Y" +#line 220 "frame/xyparser.Y" {(yyval.integer) = Coord::PHYSICAL;;} break; case 38: -#line 220 "frame/xyparser.Y" +#line 221 "frame/xyparser.Y" {(yyval.integer) = Coord::PHYSICAL;;} break; case 39: -#line 221 "frame/xyparser.Y" +#line 222 "frame/xyparser.Y" {(yyval.integer) = Coord::AMPLIFIER;;} break; case 40: -#line 222 "frame/xyparser.Y" +#line 223 "frame/xyparser.Y" {(yyval.integer) = Coord::DETECTOR;;} break; case 41: -#line 223 "frame/xyparser.Y" +#line 224 "frame/xyparser.Y" {(yyval.integer) = Coord::WCS;;} break; case 42: -#line 224 "frame/xyparser.Y" +#line 225 "frame/xyparser.Y" {(yyval.integer) = Coord::WCSA;;} break; case 43: -#line 225 "frame/xyparser.Y" +#line 226 "frame/xyparser.Y" {(yyval.integer) = Coord::WCSB;;} break; case 44: -#line 226 "frame/xyparser.Y" +#line 227 "frame/xyparser.Y" {(yyval.integer) = Coord::WCSC;;} break; case 45: -#line 227 "frame/xyparser.Y" +#line 228 "frame/xyparser.Y" {(yyval.integer) = Coord::WCSD;;} break; case 46: -#line 228 "frame/xyparser.Y" +#line 229 "frame/xyparser.Y" {(yyval.integer) = Coord::WCSE;;} break; case 47: -#line 229 "frame/xyparser.Y" +#line 230 "frame/xyparser.Y" {(yyval.integer) = Coord::WCSF;;} break; case 48: -#line 230 "frame/xyparser.Y" +#line 231 "frame/xyparser.Y" {(yyval.integer) = Coord::WCSG;;} break; case 49: -#line 231 "frame/xyparser.Y" +#line 232 "frame/xyparser.Y" {(yyval.integer) = Coord::WCSH;;} break; case 50: -#line 232 "frame/xyparser.Y" +#line 233 "frame/xyparser.Y" {(yyval.integer) = Coord::WCSI;;} break; case 51: -#line 233 "frame/xyparser.Y" +#line 234 "frame/xyparser.Y" {(yyval.integer) = Coord::WCSJ;;} break; case 52: -#line 234 "frame/xyparser.Y" +#line 235 "frame/xyparser.Y" {(yyval.integer) = Coord::WCSK;;} break; case 53: -#line 235 "frame/xyparser.Y" +#line 236 "frame/xyparser.Y" {(yyval.integer) = Coord::WCSL;;} break; case 54: -#line 236 "frame/xyparser.Y" +#line 237 "frame/xyparser.Y" {(yyval.integer) = Coord::WCSM;;} break; case 55: -#line 237 "frame/xyparser.Y" +#line 238 "frame/xyparser.Y" {(yyval.integer) = Coord::WCSN;;} break; case 56: -#line 238 "frame/xyparser.Y" +#line 239 "frame/xyparser.Y" {(yyval.integer) = Coord::WCSO;;} break; case 57: -#line 239 "frame/xyparser.Y" +#line 240 "frame/xyparser.Y" {(yyval.integer) = Coord::WCSP;;} break; case 58: -#line 240 "frame/xyparser.Y" +#line 241 "frame/xyparser.Y" {(yyval.integer) = Coord::WCSQ;;} break; case 59: -#line 241 "frame/xyparser.Y" +#line 242 "frame/xyparser.Y" {(yyval.integer) = Coord::WCSR;;} break; case 60: -#line 242 "frame/xyparser.Y" +#line 243 "frame/xyparser.Y" {(yyval.integer) = Coord::WCSS;;} break; case 61: -#line 243 "frame/xyparser.Y" +#line 244 "frame/xyparser.Y" {(yyval.integer) = Coord::WCST;;} break; case 62: -#line 244 "frame/xyparser.Y" +#line 245 "frame/xyparser.Y" {(yyval.integer) = Coord::WCSU;;} break; case 63: -#line 245 "frame/xyparser.Y" +#line 246 "frame/xyparser.Y" {(yyval.integer) = Coord::WCSV;;} break; case 64: -#line 246 "frame/xyparser.Y" +#line 247 "frame/xyparser.Y" {(yyval.integer) = Coord::WCSW;;} break; case 65: -#line 247 "frame/xyparser.Y" +#line 248 "frame/xyparser.Y" {(yyval.integer) = Coord::WCSX;;} break; case 66: -#line 248 "frame/xyparser.Y" +#line 249 "frame/xyparser.Y" {(yyval.integer) = Coord::WCSY;;} break; case 67: -#line 249 "frame/xyparser.Y" +#line 250 "frame/xyparser.Y" {(yyval.integer) = Coord::WCSZ;;} break; case 68: -#line 252 "frame/xyparser.Y" +#line 253 "frame/xyparser.Y" {(yyval.integer) = Coord::FK4;;} break; case 69: -#line 253 "frame/xyparser.Y" +#line 254 "frame/xyparser.Y" {(yyval.integer) = Coord::FK4;;} break; case 70: -#line 254 "frame/xyparser.Y" +#line 255 "frame/xyparser.Y" {(yyval.integer) = Coord::FK5;;} break; case 71: -#line 255 "frame/xyparser.Y" +#line 256 "frame/xyparser.Y" {(yyval.integer) = Coord::FK5;;} break; case 72: -#line 256 "frame/xyparser.Y" +#line 257 "frame/xyparser.Y" {(yyval.integer) = Coord::ICRS;;} break; case 73: -#line 257 "frame/xyparser.Y" +#line 258 "frame/xyparser.Y" {(yyval.integer) = Coord::GALACTIC;;} break; case 74: -#line 258 "frame/xyparser.Y" +#line 259 "frame/xyparser.Y" {(yyval.integer) = Coord::ECLIPTIC;;} break; case 75: -#line 261 "frame/xyparser.Y" +#line 262 "frame/xyparser.Y" {fr->createPointCmd(Vector((yyvsp[(1) - (1)].vector)), Point::BOXCIRCLE, POINTSIZE, color,dash,1,font,text, Marker::SELECT | Marker::EDIT | Marker::MOVE | Marker::ROTATE | @@ -1903,7 +1904,7 @@ yyreduce: /* Line 1267 of yacc.c. */ -#line 1907 "frame/xyparser.C" +#line 1908 "frame/xyparser.C" default: break; } YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); @@ -2117,6 +2118,6 @@ yyreturn: } -#line 270 "frame/xyparser.Y" +#line 271 "frame/xyparser.Y" diff --git a/tksao/frame/xyparser.H b/tksao/frame/xyparser.H index def8379..0b235b4 100644 --- a/tksao/frame/xyparser.H +++ b/tksao/frame/xyparser.H @@ -150,7 +150,7 @@ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 45 "frame/xyparser.Y" +#line 46 "frame/xyparser.Y" { #define XYBUFSIZE 2048 double real; diff --git a/tksao/frame/xyparser.Y b/tksao/frame/xyparser.Y index 9a55614..be6c584 100644 --- a/tksao/frame/xyparser.Y +++ b/tksao/frame/xyparser.Y @@ -16,6 +16,7 @@ #include <string.h> #include <iostream> +#include "tkutil.h" #include "base.h" #include "fitsimage.h" #include "basemarker.h" diff --git a/tksao/util/FlexLexer.h b/tksao/tkutil/FlexLexer.h index 1d783f1..1d783f1 100644 --- a/tksao/util/FlexLexer.h +++ b/tksao/tkutil/FlexLexer.h diff --git a/tksao/util/attribute.C b/tksao/tkutil/attribute.C index cdeacf1..cdeacf1 100644 --- a/tksao/util/attribute.C +++ b/tksao/tkutil/attribute.C diff --git a/tksao/util/attribute.h b/tksao/tkutil/attribute.h index 72e2904..72e2904 100644 --- a/tksao/util/attribute.h +++ b/tksao/tkutil/attribute.h diff --git a/tksao/util/convolve.C b/tksao/tkutil/convolve.C index ac8755e..ac8755e 100644 --- a/tksao/util/convolve.C +++ b/tksao/tkutil/convolve.C diff --git a/tksao/util/convolve.h b/tksao/tkutil/convolve.h index 637cf97..637cf97 100644 --- a/tksao/util/convolve.h +++ b/tksao/tkutil/convolve.h diff --git a/tksao/util/fdstream.hpp b/tksao/tkutil/fdstream.hpp index 585e03d..585e03d 100644 --- a/tksao/util/fdstream.hpp +++ b/tksao/tkutil/fdstream.hpp diff --git a/tksao/util/grf.C b/tksao/tkutil/grf.C index f4f98d7..f4f98d7 100644 --- a/tksao/util/grf.C +++ b/tksao/tkutil/grf.C diff --git a/tksao/util/grf3d.C b/tksao/tkutil/grf3d.C index c6381a7..c6381a7 100644 --- a/tksao/util/grf3d.C +++ b/tksao/tkutil/grf3d.C diff --git a/tksao/util/grid25dbase.C b/tksao/tkutil/grid25dbase.C index 39b7304..39b7304 100644 --- a/tksao/util/grid25dbase.C +++ b/tksao/tkutil/grid25dbase.C diff --git a/tksao/util/grid25dbase.h b/tksao/tkutil/grid25dbase.h index d00a9e9..d00a9e9 100644 --- a/tksao/util/grid25dbase.h +++ b/tksao/tkutil/grid25dbase.h diff --git a/tksao/util/grid2dbase.C b/tksao/tkutil/grid2dbase.C index 9cee22a..9cee22a 100644 --- a/tksao/util/grid2dbase.C +++ b/tksao/tkutil/grid2dbase.C diff --git a/tksao/util/grid2dbase.h b/tksao/tkutil/grid2dbase.h index d3f1203..d3f1203 100644 --- a/tksao/util/grid2dbase.h +++ b/tksao/tkutil/grid2dbase.h diff --git a/tksao/util/grid3dbase.C b/tksao/tkutil/grid3dbase.C index 10c82a2..10c82a2 100644 --- a/tksao/util/grid3dbase.C +++ b/tksao/tkutil/grid3dbase.C diff --git a/tksao/util/grid3dbase.h b/tksao/tkutil/grid3dbase.h index e25b25a..e25b25a 100644 --- a/tksao/util/grid3dbase.h +++ b/tksao/tkutil/grid3dbase.h diff --git a/tksao/util/gridbase.C b/tksao/tkutil/gridbase.C index 1f27180..7e8b41e 100644 --- a/tksao/util/gridbase.C +++ b/tksao/tkutil/gridbase.C @@ -3,6 +3,7 @@ // For conditions of distribution and use, see copyright notice in "copyright" #include "util.h" +#include "tkutil.h" #include "gridbase.h" #include "attribute.h" #include "ps.h" diff --git a/tksao/util/gridbase.h b/tksao/tkutil/gridbase.h index 51d7384..51d7384 100644 --- a/tksao/util/gridbase.h +++ b/tksao/tkutil/gridbase.h diff --git a/tksao/util/ps.C b/tksao/tkutil/ps.C index fb75ce5..bb25f7d 100644 --- a/tksao/util/ps.C +++ b/tksao/tkutil/ps.C @@ -5,6 +5,7 @@ #include <string.h> #include "util.h" +#include "tkutil.h" #include "ps.h" double RGB2Gray(double red, double green, double blue) diff --git a/tksao/util/ps.h b/tksao/tkutil/ps.h index 7d6c2a2..7d6c2a2 100644 --- a/tksao/util/ps.h +++ b/tksao/tkutil/ps.h diff --git a/tksao/util/util.C b/tksao/tkutil/tkutil.C index e128882..859b20d 100644 --- a/tksao/util/util.C +++ b/tksao/tkutil/tkutil.C @@ -5,6 +5,7 @@ #include <tk.h> #include "util.h" +#include "tkutil.h" // Error in mapping int maperr= 0; diff --git a/tksao/util/util.h b/tksao/tkutil/tkutil.h index 8877b52..ae13b88 100644 --- a/tksao/util/util.h +++ b/tksao/tkutil/tkutil.h @@ -4,8 +4,8 @@ // important note: needs to be included first as X11 defs are here -#ifndef __util_h__ -#define __util_h__ +#ifndef __tkutil_h__ +#define __tkutil_h__ #include <stdlib.h> #include <string.h> |