"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "tksao/frame/prosparser.C" between
ds9.8.2.tar.gz and ds9.8.2.1.tar.gz

About: SAOImage DS9 is an astronomical imaging and data visualization application that supports FITS images and binary tables, multiple frame buffers, region manipulation, and many scale algorithms and colormaps.

prosparser.C  (ds9.8.2):prosparser.C  (ds9.8.2.1)
skipping to change at line 559 skipping to change at line 559
74, 55, 75, 56, 84, -1, 75, 54, 76, -1, 74, 55, 75, 56, 84, -1, 75, 54, 76, -1,
76, -1, 65, -1, 77, 54, 78, -1, 78, -1, 76, -1, 65, -1, 77, 54, 78, -1, 78, -1,
59, -1, -1, -1, -1, 43, 81, 5, -1, -1, 59, -1, -1, -1, -1, 43, 81, 5, -1, -1,
43, 83, 5, -1, 79, -1, -1, 43, 85, 5, 43, 83, 5, -1, 79, -1, -1, 43, 85, 5,
79, -1 79, -1
}; };
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */ /* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] = static const yytype_uint16 yyrline[] =
{ {
0, 126, 126, 126, 137, 138, 141, 142, 143, 144, 0, 126, 126, 126, 133, 134, 137, 138, 139, 140,
144, 145, 145, 146, 147, 150, 151, 152, 155, 156, 140, 141, 141, 142, 143, 146, 147, 148, 151, 152,
159, 160, 163, 164, 167, 168, 171, 172, 175, 176, 155, 156, 159, 160, 163, 164, 167, 168, 171, 172,
179, 180, 181, 184, 185, 186, 187, 190, 197, 204, 175, 176, 177, 180, 181, 182, 183, 186, 193, 200,
211, 220, 223, 226, 229, 232, 245, 253, 261, 268, 207, 216, 219, 222, 225, 228, 241, 249, 257, 264,
278, 279, 282, 283, 284, 285, 286, 289, 290, 293, 274, 275, 278, 279, 280, 281, 282, 285, 286, 289,
304, 316, 317, 318, 322, 325, 329, 329, 338, 343, 300, 312, 313, 314, 318, 321, 325, 325, 334, 339,
357, 364, 378, 381, 388, 392, 392, 397, 398, 401, 353, 360, 374, 377, 384, 388, 388, 393, 394, 397,
404, 405, 408, 412, 439, 440, 440, 443, 443, 446, 400, 401, 404, 408, 435, 436, 436, 439, 439, 442,
447, 447 443, 443
}; };
#endif #endif
#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE #if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
First, the terminals, then, starting at YYNTOKENS, nonterminals. */ First, the terminals, then, starting at YYNTOKENS, nonterminals. */
static const char *const yytname[] = static const char *const yytname[] =
{ {
"$end", "error", "$undefined", "INT", "REAL", "STRING", "ANGDEGREE", "$end", "error", "$undefined", "INT", "REAL", "STRING", "ANGDEGREE",
"ARCMINUTE", "ARCSECOND", "ANGRADIAN", "SEXSTR", "HMSSTR", "DMSSTR", "ARCMINUTE", "ARCSECOND", "ANGRADIAN", "SEXSTR", "HMSSTR", "DMSSTR",
skipping to change at line 1588 skipping to change at line 1588
unconditionally makes the parser a bit smaller, and it avoids a unconditionally makes the parser a bit smaller, and it avoids a
GCC warning that YYVAL may be used uninitialized. */ GCC warning that YYVAL may be used uninitialized. */
yyval = yyvsp[1-yylen]; yyval = yyvsp[1-yylen];
YY_REDUCE_PRINT (yyn); YY_REDUCE_PRINT (yyn);
switch (yyn) switch (yyn)
{ {
case 2: case 2:
#line 126 "frame/prosparser.Y" #line 126 "frame/prosparser.Y"
{ {
if (fr->useMarkerColor()) strcpy(color, fr->markerColor());
strcpy(color, fr->markerColor());
else
strcpy(color, "green");
globalSystem = fr->xySystem(); globalSystem = fr->xySystem();
globalSky = fr->xySky(); globalSky = fr->xySky();
;} ;}
break; break;
case 8: case 8:
#line 143 "frame/prosparser.Y" #line 139 "frame/prosparser.Y"
{cerr << "PROS" << endl;;} {cerr << "PROS" << endl;;}
break; break;
case 9: case 9:
#line 144 "frame/prosparser.Y" #line 140 "frame/prosparser.Y"
{globalSystem = (Coord::CoordSystem)(yyvsp[(1) - (1)].integer);;} {globalSystem = (Coord::CoordSystem)(yyvsp[(1) - (1)].integer);;}
break; break;
case 11: case 11:
#line 145 "frame/prosparser.Y" #line 141 "frame/prosparser.Y"
{globalSystem = Coord::WCS; globalSky = (Coord::SkyFrame)(yyvsp[(1) - (1)].i nteger);;} {globalSystem = Coord::WCS; globalSky = (Coord::SkyFrame)(yyvsp[(1) - (1)].i nteger);;}
break; break;
case 17: case 17:
#line 152 "frame/prosparser.Y" #line 148 "frame/prosparser.Y"
{YYACCEPT;;} {YYACCEPT;;}
break; break;
case 18: case 18:
#line 155 "frame/prosparser.Y" #line 151 "frame/prosparser.Y"
{(yyval.real)=(yyvsp[(1) - (1)].real);;} {(yyval.real)=(yyvsp[(1) - (1)].real);;}
break; break;
case 19: case 19:
#line 156 "frame/prosparser.Y" #line 152 "frame/prosparser.Y"
{(yyval.real)=(yyvsp[(1) - (1)].integer);;} {(yyval.real)=(yyvsp[(1) - (1)].integer);;}
break; break;
case 20: case 20:
#line 159 "frame/prosparser.Y" #line 155 "frame/prosparser.Y"
{yydebug=1;;} {yydebug=1;;}
break; break;
case 21: case 21:
#line 160 "frame/prosparser.Y" #line 156 "frame/prosparser.Y"
{yydebug=0;;} {yydebug=0;;}
break; break;
case 28: case 28:
#line 175 "frame/prosparser.Y" #line 171 "frame/prosparser.Y"
{(yyval.real) = 0;;} {(yyval.real) = 0;;}
break; break;
case 29: case 29:
#line 176 "frame/prosparser.Y" #line 172 "frame/prosparser.Y"
{(yyval.real) = (yyvsp[(1) - (1)].real);;} {(yyval.real) = (yyvsp[(1) - (1)].real);;}
break; break;
case 30: case 30:
#line 179 "frame/prosparser.Y" #line 175 "frame/prosparser.Y"
{(yyval.real) = zeroTWOPI(degToRad((yyvsp[(1) - (1)].real)));;} {(yyval.real) = zeroTWOPI(degToRad((yyvsp[(1) - (1)].real)));;}
break; break;
case 31: case 31:
#line 180 "frame/prosparser.Y" #line 176 "frame/prosparser.Y"
{(yyval.real) = zeroTWOPI(degToRad((yyvsp[(1) - (1)].real)));;} {(yyval.real) = zeroTWOPI(degToRad((yyvsp[(1) - (1)].real)));;}
break; break;
case 32: case 32:
#line 181 "frame/prosparser.Y" #line 177 "frame/prosparser.Y"
{(yyval.real)=(yyvsp[(1) - (1)].real);;} {(yyval.real)=(yyvsp[(1) - (1)].real);;}
break; break;
case 33: case 33:
#line 184 "frame/prosparser.Y" #line 180 "frame/prosparser.Y"
{(yyval.real) = FITSPTR->mapLenToRef((yyvsp[(1) - (1)].real), Coord::IMAGE); ;} {(yyval.real) = FITSPTR->mapLenToRef((yyvsp[(1) - (1)].real), Coord::IMAGE); ;}
break; break;
case 34: case 34:
#line 185 "frame/prosparser.Y" #line 181 "frame/prosparser.Y"
{(yyval.real) = FITSPTR->mapLenToRef((yyvsp[(1) - (1)].real), checkWCSSystem (), Coord::DEGREE);;} {(yyval.real) = FITSPTR->mapLenToRef((yyvsp[(1) - (1)].real), checkWCSSystem (), Coord::DEGREE);;}
break; break;
case 35: case 35:
#line 186 "frame/prosparser.Y" #line 182 "frame/prosparser.Y"
{(yyval.real) = FITSPTR->mapLenToRef((yyvsp[(1) - (1)].real), checkWCSSystem (), Coord::ARCMIN);;} {(yyval.real) = FITSPTR->mapLenToRef((yyvsp[(1) - (1)].real), checkWCSSystem (), Coord::ARCMIN);;}
break; break;
case 36: case 36:
#line 187 "frame/prosparser.Y" #line 183 "frame/prosparser.Y"
{(yyval.real) = FITSPTR->mapLenToRef((yyvsp[(1) - (1)].real), checkWCSSystem (), Coord::ARCSEC);;} {(yyval.real) = FITSPTR->mapLenToRef((yyvsp[(1) - (1)].real), checkWCSSystem (), Coord::ARCSEC);;}
break; break;
case 37: case 37:
#line 191 "frame/prosparser.Y" #line 187 "frame/prosparser.Y"
{ {
Vector r = FITSPTR->mapLenToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[( 3) - (3)].real)), Coord::IMAGE); Vector r = FITSPTR->mapLenToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[( 3) - (3)].real)), Coord::IMAGE);
(yyval.vector)[0] = r[0]; (yyval.vector)[0] = r[0];
(yyval.vector)[1] = r[1]; (yyval.vector)[1] = r[1];
(yyval.vector)[2] = r[2]; (yyval.vector)[2] = r[2];
;} ;}
break; break;
case 38: case 38:
#line 198 "frame/prosparser.Y" #line 194 "frame/prosparser.Y"
{ {
Vector r=FITSPTR->mapLenToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)),checkWCSSystem(),Coord::DEGREE); Vector r=FITSPTR->mapLenToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)),checkWCSSystem(),Coord::DEGREE);
(yyval.vector)[0] = r[0]; (yyval.vector)[0] = r[0];
(yyval.vector)[1] = r[1]; (yyval.vector)[1] = r[1];
(yyval.vector)[2] = r[2]; (yyval.vector)[2] = r[2];
;} ;}
break; break;
case 39: case 39:
#line 205 "frame/prosparser.Y" #line 201 "frame/prosparser.Y"
{ {
Vector r=FITSPTR->mapLenToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)),checkWCSSystem(),Coord::ARCMIN); Vector r=FITSPTR->mapLenToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)),checkWCSSystem(),Coord::ARCMIN);
(yyval.vector)[0] = r[0]; (yyval.vector)[0] = r[0];
(yyval.vector)[1] = r[1]; (yyval.vector)[1] = r[1];
(yyval.vector)[2] = r[2]; (yyval.vector)[2] = r[2];
;} ;}
break; break;
case 40: case 40:
#line 212 "frame/prosparser.Y" #line 208 "frame/prosparser.Y"
{ {
Vector r=FITSPTR->mapLenToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)),checkWCSSystem(),Coord::ARCSEC); Vector r=FITSPTR->mapLenToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)),checkWCSSystem(),Coord::ARCSEC);
(yyval.vector)[0] = r[0]; (yyval.vector)[0] = r[0];
(yyval.vector)[1] = r[1]; (yyval.vector)[1] = r[1];
(yyval.vector)[2] = r[2]; (yyval.vector)[2] = r[2];
;} ;}
break; break;
case 41: case 41:
#line 220 "frame/prosparser.Y" #line 216 "frame/prosparser.Y"
{(yyval.integer) = (yyvsp[(3) - (3)].integer);;} {(yyval.integer) = (yyvsp[(3) - (3)].integer);;}
break; break;
case 42: case 42:
#line 223 "frame/prosparser.Y" #line 219 "frame/prosparser.Y"
{(yyval.real) = parseSEXStr((yyvsp[(1) - (1)].str));;} {(yyval.real) = parseSEXStr((yyvsp[(1) - (1)].str));;}
break; break;
case 43: case 43:
#line 226 "frame/prosparser.Y" #line 222 "frame/prosparser.Y"
{(yyval.real) = parseHMSStr((yyvsp[(1) - (1)].str));;} {(yyval.real) = parseHMSStr((yyvsp[(1) - (1)].str));;}
break; break;
case 44: case 44:
#line 229 "frame/prosparser.Y" #line 225 "frame/prosparser.Y"
{(yyval.real) = parseDMSStr((yyvsp[(1) - (1)].str));;} {(yyval.real) = parseDMSStr((yyvsp[(1) - (1)].str));;}
break; break;
case 45: case 45:
#line 233 "frame/prosparser.Y" #line 229 "frame/prosparser.Y"
{ {
Vector r; Vector r;
Coord::CoordSystem sys = checkWCSSystem(); Coord::CoordSystem sys = checkWCSSystem();
Coord::SkyFrame sky = checkWCSSky(); Coord::SkyFrame sky = checkWCSSky();
if (sky == Coord::GALACTIC || sky == Coord::ECLIPTIC) if (sky == Coord::GALACTIC || sky == Coord::ECLIPTIC)
r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3) ].real)), sys, sky); r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3) ].real)), sys, sky);
else else
r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real)*360./24.,(yyvsp[ (3) - (3)].real)), sys, sky); r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real)*360./24.,(yyvsp[ (3) - (3)].real)), sys, sky);
(yyval.vector)[0] = r[0]; (yyval.vector)[0] = r[0];
(yyval.vector)[1] = r[1]; (yyval.vector)[1] = r[1];
(yyval.vector)[2] = r[2]; (yyval.vector)[2] = r[2];
;} ;}
break; break;
case 46: case 46:
#line 246 "frame/prosparser.Y" #line 242 "frame/prosparser.Y"
{ {
Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)),
checkWCSSystem(), checkWCSSky()); checkWCSSystem(), checkWCSSky());
(yyval.vector)[0] = r[0]; (yyval.vector)[0] = r[0];
(yyval.vector)[1] = r[1]; (yyval.vector)[1] = r[1];
(yyval.vector)[2] = r[2]; (yyval.vector)[2] = r[2];
;} ;}
break; break;
case 47: case 47:
#line 254 "frame/prosparser.Y" #line 250 "frame/prosparser.Y"
{ {
Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)),
checkWCSSystem(), checkWCSSky()); checkWCSSystem(), checkWCSSky());
(yyval.vector)[0] = r[0]; (yyval.vector)[0] = r[0];
(yyval.vector)[1] = r[1]; (yyval.vector)[1] = r[1];
(yyval.vector)[2] = r[2]; (yyval.vector)[2] = r[2];
;} ;}
break; break;
case 48: case 48:
#line 262 "frame/prosparser.Y" #line 258 "frame/prosparser.Y"
{ {
Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), localSystem, localSky); Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), localSystem, localSky);
(yyval.vector)[0] = r[0]; (yyval.vector)[0] = r[0];
(yyval.vector)[1] = r[1]; (yyval.vector)[1] = r[1];
(yyval.vector)[2] = r[2]; (yyval.vector)[2] = r[2];
;} ;}
break; break;
case 49: case 49:
#line 269 "frame/prosparser.Y" #line 265 "frame/prosparser.Y"
{ {
Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)), Vector r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3)].real)),
checkWCSSystem(), checkWCSSky()); checkWCSSystem(), checkWCSSky());
(yyval.vector)[0] = r[0]; (yyval.vector)[0] = r[0];
(yyval.vector)[1] = r[1]; (yyval.vector)[1] = r[1];
(yyval.vector)[2] = r[2]; (yyval.vector)[2] = r[2];
;} ;}
break; break;
case 50: case 50:
#line 278 "frame/prosparser.Y" #line 274 "frame/prosparser.Y"
{(yyval.integer) = Coord::IMAGE;;} {(yyval.integer) = Coord::IMAGE;;}
break; break;
case 51: case 51:
#line 279 "frame/prosparser.Y" #line 275 "frame/prosparser.Y"
{(yyval.integer) = Coord::PHYSICAL;;} {(yyval.integer) = Coord::PHYSICAL;;}
break; break;
case 52: case 52:
#line 282 "frame/prosparser.Y" #line 278 "frame/prosparser.Y"
{(yyval.integer) = (yyvsp[(2) - (2)].integer);;} {(yyval.integer) = (yyvsp[(2) - (2)].integer);;}
break; break;
case 53: case 53:
#line 283 "frame/prosparser.Y" #line 279 "frame/prosparser.Y"
{(yyval.integer) = Coord::FK4;;} {(yyval.integer) = Coord::FK4;;}
break; break;
case 54: case 54:
#line 284 "frame/prosparser.Y" #line 280 "frame/prosparser.Y"
{(yyval.integer) = Coord::FK5;;} {(yyval.integer) = Coord::FK5;;}
break; break;
case 55: case 55:
#line 285 "frame/prosparser.Y" #line 281 "frame/prosparser.Y"
{(yyval.integer) = Coord::GALACTIC;;} {(yyval.integer) = Coord::GALACTIC;;}
break; break;
case 56: case 56:
#line 286 "frame/prosparser.Y" #line 282 "frame/prosparser.Y"
{(yyval.integer) = Coord::ECLIPTIC;;} {(yyval.integer) = Coord::ECLIPTIC;;}
break; break;
case 57: case 57:
#line 289 "frame/prosparser.Y" #line 285 "frame/prosparser.Y"
{(yyval.integer) = Coord::FK4;;} {(yyval.integer) = Coord::FK4;;}
break; break;
case 58: case 58:
#line 290 "frame/prosparser.Y" #line 286 "frame/prosparser.Y"
{(yyval.integer) = Coord::FK5;;} {(yyval.integer) = Coord::FK5;;}
break; break;
case 59: case 59:
#line 293 "frame/prosparser.Y" #line 289 "frame/prosparser.Y"
{ {
// global properties // global properties
globalSystem = Coord::IMAGE; globalSystem = Coord::IMAGE;
globalSky = Coord::FK5; globalSky = Coord::FK5;
globalProps = globalProps =
Marker::SELECT | Marker::EDIT | Marker::MOVE | Marker::SELECT | Marker::EDIT | Marker::MOVE |
Marker::ROTATE | Marker::DELETE | Marker::HIGHLITE | Marker::ROTATE | Marker::DELETE | Marker::HIGHLITE |
Marker::INCLUDE | Marker::SOURCE; Marker::INCLUDE | Marker::SOURCE;
;} ;}
break; break;
case 60: case 60:
#line 304 "frame/prosparser.Y" #line 300 "frame/prosparser.Y"
{ {
// reset maperr flag // reset maperr flag
maperr =0; maperr =0;
// global properties // global properties
localSystem = globalSystem; localSystem = globalSystem;
localSky = globalSky; localSky = globalSky;
localProps = globalProps; localProps = globalProps;
strcpy(localComment,""); strcpy(localComment,"");
;} ;}
break; break;
case 61: case 61:
#line 316 "frame/prosparser.Y" #line 312 "frame/prosparser.Y"
{setProps(&localProps, Marker::INCLUDE, 1);;} {setProps(&localProps, Marker::INCLUDE, 1);;}
break; break;
case 62: case 62:
#line 317 "frame/prosparser.Y" #line 313 "frame/prosparser.Y"
{setProps(&localProps, Marker::INCLUDE, 1);;} {setProps(&localProps, Marker::INCLUDE, 1);;}
break; break;
case 63: case 63:
#line 318 "frame/prosparser.Y" #line 314 "frame/prosparser.Y"
{setProps(&localProps, Marker::INCLUDE, 0);;} {setProps(&localProps, Marker::INCLUDE, 0);;}
break; break;
case 64: case 64:
#line 323 "frame/prosparser.Y" #line 319 "frame/prosparser.Y"
{fr->createCircleCmd(Vector((yyvsp[(3) - (7)].vector)), (yyvsp[(5) - (7)].re al), fill_, {fr->createCircleCmd(Vector((yyvsp[(3) - (7)].vector)), (yyvsp[(5) - (7)].re al), fill_,
color,dash,1,font,text,localProps,localComment,taglist,cblist);;} color,dash,1,font,text,localProps,localComment,taglist,cblist);;}
break; break;
case 65: case 65:
#line 326 "frame/prosparser.Y" #line 322 "frame/prosparser.Y"
{fr->createAnnulusCmd(Vector((yyvsp[(3) - (9)].vector)), {fr->createAnnulusCmd(Vector((yyvsp[(3) - (9)].vector)),
(yyvsp[(5) - (9)].real),(yyvsp[(7) - (9)].real),1, (yyvsp[(5) - (9)].real),(yyvsp[(7) - (9)].real),1,
color,dash,1,font,text,localProps,localComment,taglist,cblist);;} color,dash,1,font,text,localProps,localComment,taglist,cblist);;}
break; break;
case 66: case 66:
#line 329 "frame/prosparser.Y" #line 325 "frame/prosparser.Y"
{aNum=2;;} {aNum=2;;}
break; break;
case 67: case 67:
#line 331 "frame/prosparser.Y" #line 327 "frame/prosparser.Y"
{ {
aAnnuli[0] = (yyvsp[(5) - (12)].real); aAnnuli[0] = (yyvsp[(5) - (12)].real);
aAnnuli[1] = (yyvsp[(7) - (12)].real); aAnnuli[1] = (yyvsp[(7) - (12)].real);
fr->createAnnulusCmd(Vector((yyvsp[(3) - (12)].vector)), fr->createAnnulusCmd(Vector((yyvsp[(3) - (12)].vector)),
aNum,aAnnuli, aNum,aAnnuli,
color,dash,1,font,text,localProps,localComment,taglist,cblist); color,dash,1,font,text,localProps,localComment,taglist,cblist);
;} ;}
break; break;
case 68: case 68:
#line 339 "frame/prosparser.Y" #line 335 "frame/prosparser.Y"
{fr->createAnnulusCmd(Vector((yyvsp[(3) - (11)].vector)), {fr->createAnnulusCmd(Vector((yyvsp[(3) - (11)].vector)),
(yyvsp[(5) - (11)].real),(yyvsp[(7) - (11)].real),(yyvsp[(9) - (11)]. integer), (yyvsp[(5) - (11)].real),(yyvsp[(7) - (11)].real),(yyvsp[(9) - (11)]. integer),
color,dash,1,font,text,localProps,localComment,taglist,cblist);;} color,dash,1,font,text,localProps,localComment,taglist,cblist);;}
break; break;
case 69: case 69:
#line 344 "frame/prosparser.Y" #line 340 "frame/prosparser.Y"
{ {
// for ellipse annulus // for ellipse annulus
aStatus = 1; aStatus = 1;
aCenter = Vector((yyvsp[(3) - (9)].vector)); aCenter = Vector((yyvsp[(3) - (9)].vector));
aAngle = (yyvsp[(7) - (9)].real); aAngle = (yyvsp[(7) - (9)].real);
aVector[0] = Vector((yyvsp[(5) - (9)].vector)); aVector[0] = Vector((yyvsp[(5) - (9)].vector));
aNum = 1; aNum = 1;
strncpy(aComment,localComment,80); strncpy(aComment,localComment,80);
aProps = localProps; aProps = localProps;
fr->createEllipseCmd(Vector((yyvsp[(3) - (9)].vector)), Vector((yyvsp[( 5) - (9)].vector)), (yyvsp[(7) - (9)].real), fill_, fr->createEllipseCmd(Vector((yyvsp[(3) - (9)].vector)), Vector((yyvsp[( 5) - (9)].vector)), (yyvsp[(7) - (9)].real), fill_,
color,dash,1,font,text,localProps,localComment,taglist,cblist); color,dash,1,font,text,localProps,localComment,taglist,cblist);
;} ;}
break; break;
case 70: case 70:
#line 359 "frame/prosparser.Y" #line 355 "frame/prosparser.Y"
{ {
aStatus = 2; aStatus = 2;
aVector[aNum++] = Vector((yyvsp[(5) - (18)].vector)); aVector[aNum++] = Vector((yyvsp[(5) - (18)].vector));
;} ;}
break; break;
case 71: case 71:
#line 365 "frame/prosparser.Y" #line 361 "frame/prosparser.Y"
{ {
// for box annulus // for box annulus
aStatus = 3; aStatus = 3;
aCenter = Vector((yyvsp[(3) - (9)].vector)); aCenter = Vector((yyvsp[(3) - (9)].vector));
aAngle = (yyvsp[(7) - (9)].real); aAngle = (yyvsp[(7) - (9)].real);
aVector[0] = Vector((yyvsp[(5) - (9)].vector)); aVector[0] = Vector((yyvsp[(5) - (9)].vector));
aNum = 1; aNum = 1;
strncpy(aComment,localComment,80); strncpy(aComment,localComment,80);
aProps = localProps; aProps = localProps;
fr->createBoxCmd(Vector((yyvsp[(3) - (9)].vector)), Vector((yyvsp[(5) - (9)].vector)), (yyvsp[(7) - (9)].real), fill_, 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); color,dash,1,font,text,localProps,localComment,taglist,cblist);
;} ;}
break; break;
case 72: case 72:
#line 379 "frame/prosparser.Y" #line 375 "frame/prosparser.Y"
{fr->createBoxCmd(Vector((yyvsp[(3) - (9)].vector)), Vector((yyvsp[(5) - (9) ].vector)), (yyvsp[(7) - (9)].real), fill_, {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);;} color,dash,1,font,text,localProps,localComment,taglist,cblist);;}
break; break;
case 73: case 73:
#line 383 "frame/prosparser.Y" #line 379 "frame/prosparser.Y"
{ {
aStatus = 4; aStatus = 4;
aVector[aNum++] = Vector((yyvsp[(5) - (18)].vector)); aVector[aNum++] = Vector((yyvsp[(5) - (18)].vector));
;} ;}
break; break;
case 74: case 74:
#line 389 "frame/prosparser.Y" #line 385 "frame/prosparser.Y"
{fr->createPointCmd(Vector((yyvsp[(3) - (5)].vector)), Point::BOXCIRCLE, POI NTSIZE, {fr->createPointCmd(Vector((yyvsp[(3) - (5)].vector)), Point::BOXCIRCLE, POI NTSIZE,
color,dash,1,font,text,localProps,localComment,taglist,cblist);;} color,dash,1,font,text,localProps,localComment,taglist,cblist);;}
break; break;
case 75: case 75:
#line 392 "frame/prosparser.Y" #line 388 "frame/prosparser.Y"
{polylist.deleteAll();;} {polylist.deleteAll();;}
break; break;
case 76: case 76:
#line 393 "frame/prosparser.Y" #line 389 "frame/prosparser.Y"
{fr->createPolygonCmd(polylist, fill_, {fr->createPolygonCmd(polylist, fill_,
color,dash,1,font,text,localProps,localComment,taglist,cblist);;} color,dash,1,font,text,localProps,localComment,taglist,cblist);;}
break; break;
case 79: case 79:
#line 401 "frame/prosparser.Y" #line 397 "frame/prosparser.Y"
{polylist.append(new Vertex((yyvsp[(1) - (1)].vector)));;} {polylist.append(new Vertex((yyvsp[(1) - (1)].vector)));;}
break; break;
case 82: case 82:
#line 408 "frame/prosparser.Y" #line 404 "frame/prosparser.Y"
{aAnnuli[aNum++] = (yyvsp[(1) - (1)].real);;} {aAnnuli[aNum++] = (yyvsp[(1) - (1)].real);;}
break; break;
case 83: case 83:
#line 412 "frame/prosparser.Y" #line 408 "frame/prosparser.Y"
{ {
switch (aStatus) { switch (aStatus) {
case 0: // do nothing case 0: // do nothing
break; break;
case 1: // we found just an ellipse, do nothing case 1: // we found just an ellipse, do nothing
break; break;
case 2: // ok we have an ellipse annulus case 2: // ok we have an ellipse annulus
fr->markerDeleteLastCmd(); // delete the previous ellipse fr->markerDeleteLastCmd(); // delete the previous ellipse
fr->createEllipseAnnulusCmd(aCenter, fr->createEllipseAnnulusCmd(aCenter,
aNum,aVector, aNum,aVector,
skipping to change at line 2038 skipping to change at line 2034
aNum,aVector, aNum,aVector,
aAngle, aAngle,
color,dash,1,font,text,aProps,aComment,taglist,cblist); color,dash,1,font,text,aProps,aComment,taglist,cblist);
break; break;
} }
aStatus = 0; aStatus = 0;
;} ;}
break; break;
case 85: case 85:
#line 440 "frame/prosparser.Y" #line 436 "frame/prosparser.Y"
{DISCARD_(1);;} {DISCARD_(1);;}
break; break;
case 87: case 87:
#line 443 "frame/prosparser.Y" #line 439 "frame/prosparser.Y"
{DISCARD_(1);;} {DISCARD_(1);;}
break; break;
case 90: case 90:
#line 447 "frame/prosparser.Y" #line 443 "frame/prosparser.Y"
{DISCARD_(0);;} {DISCARD_(0);;}
break; break;
case 91: case 91:
#line 448 "frame/prosparser.Y" #line 444 "frame/prosparser.Y"
{strncpy(localComment,(yyvsp[(3) - (4)].str),80);;} {strncpy(localComment,(yyvsp[(3) - (4)].str),80);;}
break; break;
/* Line 1267 of yacc.c. */ /* Line 1267 of yacc.c. */
#line 2098 "frame/prosparser.C" #line 2094 "frame/prosparser.C"
default: break; default: break;
} }
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
YYPOPSTACK (yylen); YYPOPSTACK (yylen);
yylen = 0; yylen = 0;
YY_STACK_PRINT (yyss, yyssp); YY_STACK_PRINT (yyss, yyssp);
*++yyvsp = yyval; *++yyvsp = yyval;
skipping to change at line 2262 skipping to change at line 2258
YYSTACK_FREE (yyss); YYSTACK_FREE (yyss);
#endif #endif
#if YYERROR_VERBOSE #if YYERROR_VERBOSE
if (yymsg != yymsgbuf) if (yymsg != yymsgbuf)
YYSTACK_FREE (yymsg); YYSTACK_FREE (yymsg);
#endif #endif
/* Make sure YYID is used. */ /* Make sure YYID is used. */
return YYID (yyresult); return YYID (yyresult);
} }
#line 451 "frame/prosparser.Y" #line 447 "frame/prosparser.Y"
static void setProps(unsigned short* props, unsigned short prop, int value) static void setProps(unsigned short* props, unsigned short prop, int value)
{ {
if (value) if (value)
*props |= prop; *props |= prop;
else else
*props &= ~prop; *props &= ~prop;
} }
static Coord::CoordSystem checkWCSSystem() static Coord::CoordSystem checkWCSSystem()
 End of changes. 68 change blocks. 
81 lines changed or deleted 77 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)