"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "tksao/frame/xyparser.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.

xyparser.C  (ds9.8.2):xyparser.C  (ds9.8.2.1)
skipping to change at line 565 skipping to change at line 565
-1, 40, -1, 41, -1, 42, -1, 43, -1, 44, -1, 40, -1, 41, -1, 42, -1, 43, -1, 44,
-1, 45, -1, 46, -1, 47, -1, 48, -1, 49, -1, 45, -1, 46, -1, 47, -1, 48, -1, 49,
-1, 50, -1, 51, -1, 52, -1, 53, -1, 16, -1, 50, -1, 51, -1, 52, -1, 53, -1, 16,
-1, 11, -1, 17, -1, 21, -1, 19, -1, 18, -1, 11, -1, 17, -1, 21, -1, 19, -1, 18,
-1, 15, -1, 73, -1 -1, 15, -1, 73, -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, 120, 120, 120, 131, 132, 135, 136, 137, 138, 0, 120, 120, 120, 127, 128, 131, 132, 133, 134,
139, 141, 141, 144, 145, 148, 149, 152, 155, 156, 135, 137, 137, 140, 141, 144, 145, 148, 151, 152,
157, 160, 161, 164, 165, 168, 169, 172, 175, 178, 153, 156, 157, 160, 161, 164, 165, 168, 171, 174,
181, 192, 199, 206, 213, 222, 223, 224, 225, 226, 177, 188, 195, 202, 209, 218, 219, 220, 221, 222,
227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232,
237, 238, 239, 240, 241, 242, 243, 244, 245, 246, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242,
247, 248, 249, 250, 251, 252, 253, 254, 257, 258, 243, 244, 245, 246, 247, 248, 249, 250, 253, 254,
259, 260, 261, 262, 263, 266 255, 256, 257, 258, 259, 262
}; };
#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", "ANGDEGREE", "SEXSTR", "$end", "error", "$undefined", "INT", "REAL", "ANGDEGREE", "SEXSTR",
"HMSSTR", "DMSSTR", "EOF_", "AMPLIFIER_", "B1950_", "CCD_", "DEBUG_", "HMSSTR", "DMSSTR", "EOF_", "AMPLIFIER_", "B1950_", "CCD_", "DEBUG_",
skipping to change at line 1531 skipping to change at line 1531
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 120 "frame/xyparser.Y" #line 120 "frame/xyparser.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 137 "frame/xyparser.Y" #line 133 "frame/xyparser.Y"
{cerr << "X Y Format 1.0" << endl;;} {cerr << "X Y Format 1.0" << endl;;}
break; break;
case 9: case 9:
#line 138 "frame/xyparser.Y" #line 134 "frame/xyparser.Y"
{globalSystem = (Coord::CoordSystem)(yyvsp[(1) - (1)].integer);;} {globalSystem = (Coord::CoordSystem)(yyvsp[(1) - (1)].integer);;}
break; break;
case 10: case 10:
#line 140 "frame/xyparser.Y" #line 136 "frame/xyparser.Y"
{globalSystem = (Coord::CoordSystem)(yyvsp[(1) - (2)].integer); globalSky = (Coord::SkyFrame)(yyvsp[(2) - (2)].integer);;} {globalSystem = (Coord::CoordSystem)(yyvsp[(1) - (2)].integer); globalSky = (Coord::SkyFrame)(yyvsp[(2) - (2)].integer);;}
break; break;
case 11: case 11:
#line 141 "frame/xyparser.Y" #line 137 "frame/xyparser.Y"
{localSystem = globalSystem; localSky = globalSky; maperr = 0;;} {localSystem = globalSystem; localSky = globalSky; maperr = 0;;}
break; break;
case 17: case 17:
#line 152 "frame/xyparser.Y" #line 148 "frame/xyparser.Y"
{;} {;}
break; break;
case 20: case 20:
#line 157 "frame/xyparser.Y" #line 153 "frame/xyparser.Y"
{YYACCEPT;;} {YYACCEPT;;}
break; break;
case 21: case 21:
#line 160 "frame/xyparser.Y" #line 156 "frame/xyparser.Y"
{(yyval.real)=(yyvsp[(1) - (1)].real);;} {(yyval.real)=(yyvsp[(1) - (1)].real);;}
break; break;
case 22: case 22:
#line 161 "frame/xyparser.Y" #line 157 "frame/xyparser.Y"
{(yyval.real)=(yyvsp[(1) - (1)].integer);;} {(yyval.real)=(yyvsp[(1) - (1)].integer);;}
break; break;
case 23: case 23:
#line 164 "frame/xyparser.Y" #line 160 "frame/xyparser.Y"
{yydebug=1;;} {yydebug=1;;}
break; break;
case 24: case 24:
#line 165 "frame/xyparser.Y" #line 161 "frame/xyparser.Y"
{yydebug=0;;} {yydebug=0;;}
break; break;
case 27: case 27:
#line 172 "frame/xyparser.Y" #line 168 "frame/xyparser.Y"
{(yyval.real) = parseSEXStr((yyvsp[(1) - (1)].str));;} {(yyval.real) = parseSEXStr((yyvsp[(1) - (1)].str));;}
break; break;
case 28: case 28:
#line 175 "frame/xyparser.Y" #line 171 "frame/xyparser.Y"
{(yyval.real) = parseHMSStr((yyvsp[(1) - (1)].str));;} {(yyval.real) = parseHMSStr((yyvsp[(1) - (1)].str));;}
break; break;
case 29: case 29:
#line 178 "frame/xyparser.Y" #line 174 "frame/xyparser.Y"
{(yyval.real) = parseDMSStr((yyvsp[(1) - (1)].str));;} {(yyval.real) = parseDMSStr((yyvsp[(1) - (1)].str));;}
break; break;
case 30: case 30:
#line 182 "frame/xyparser.Y" #line 178 "frame/xyparser.Y"
{ {
Vector r; Vector r;
if (localSky == Coord::GALACTIC || localSky == Coord::ECLIPTIC) if (localSky == Coord::GALACTIC || localSky == Coord::ECLIPTIC)
r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3) ].real)),localSystem,localSky); r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real),(yyvsp[(3) - (3) ].real)),localSystem,localSky);
else else
r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real)*360./24.,(yyvsp[ (3) - (3)].real)),localSystem,localSky); r = FITSPTR->mapToRef(Vector((yyvsp[(1) - (3)].real)*360./24.,(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 31: case 31:
#line 193 "frame/xyparser.Y" #line 189 "frame/xyparser.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 32: case 32:
#line 200 "frame/xyparser.Y" #line 196 "frame/xyparser.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 33: case 33:
#line 207 "frame/xyparser.Y" #line 203 "frame/xyparser.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 34: case 34:
#line 214 "frame/xyparser.Y" #line 210 "frame/xyparser.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 35: case 35:
#line 222 "frame/xyparser.Y" #line 218 "frame/xyparser.Y"
{(yyval.integer) = Coord::IMAGE;;} {(yyval.integer) = Coord::IMAGE;;}
break; break;
case 36: case 36:
#line 223 "frame/xyparser.Y" #line 219 "frame/xyparser.Y"
{(yyval.integer) = Coord::IMAGE;;} {(yyval.integer) = Coord::IMAGE;;}
break; break;
case 37: case 37:
#line 224 "frame/xyparser.Y" #line 220 "frame/xyparser.Y"
{(yyval.integer) = Coord::PHYSICAL;;} {(yyval.integer) = Coord::PHYSICAL;;}
break; break;
case 38: case 38:
#line 225 "frame/xyparser.Y" #line 221 "frame/xyparser.Y"
{(yyval.integer) = Coord::PHYSICAL;;} {(yyval.integer) = Coord::PHYSICAL;;}
break; break;
case 39: case 39:
#line 226 "frame/xyparser.Y" #line 222 "frame/xyparser.Y"
{(yyval.integer) = Coord::AMPLIFIER;;} {(yyval.integer) = Coord::AMPLIFIER;;}
break; break;
case 40: case 40:
#line 227 "frame/xyparser.Y" #line 223 "frame/xyparser.Y"
{(yyval.integer) = Coord::DETECTOR;;} {(yyval.integer) = Coord::DETECTOR;;}
break; break;
case 41: case 41:
#line 228 "frame/xyparser.Y" #line 224 "frame/xyparser.Y"
{(yyval.integer) = Coord::WCS;;} {(yyval.integer) = Coord::WCS;;}
break; break;
case 42: case 42:
#line 229 "frame/xyparser.Y" #line 225 "frame/xyparser.Y"
{(yyval.integer) = Coord::WCSA;;} {(yyval.integer) = Coord::WCSA;;}
break; break;
case 43: case 43:
#line 230 "frame/xyparser.Y" #line 226 "frame/xyparser.Y"
{(yyval.integer) = Coord::WCSB;;} {(yyval.integer) = Coord::WCSB;;}
break; break;
case 44: case 44:
#line 231 "frame/xyparser.Y" #line 227 "frame/xyparser.Y"
{(yyval.integer) = Coord::WCSC;;} {(yyval.integer) = Coord::WCSC;;}
break; break;
case 45: case 45:
#line 232 "frame/xyparser.Y" #line 228 "frame/xyparser.Y"
{(yyval.integer) = Coord::WCSD;;} {(yyval.integer) = Coord::WCSD;;}
break; break;
case 46: case 46:
#line 233 "frame/xyparser.Y" #line 229 "frame/xyparser.Y"
{(yyval.integer) = Coord::WCSE;;} {(yyval.integer) = Coord::WCSE;;}
break; break;
case 47: case 47:
#line 234 "frame/xyparser.Y" #line 230 "frame/xyparser.Y"
{(yyval.integer) = Coord::WCSF;;} {(yyval.integer) = Coord::WCSF;;}
break; break;
case 48: case 48:
#line 235 "frame/xyparser.Y" #line 231 "frame/xyparser.Y"
{(yyval.integer) = Coord::WCSG;;} {(yyval.integer) = Coord::WCSG;;}
break; break;
case 49: case 49:
#line 236 "frame/xyparser.Y" #line 232 "frame/xyparser.Y"
{(yyval.integer) = Coord::WCSH;;} {(yyval.integer) = Coord::WCSH;;}
break; break;
case 50: case 50:
#line 237 "frame/xyparser.Y" #line 233 "frame/xyparser.Y"
{(yyval.integer) = Coord::WCSI;;} {(yyval.integer) = Coord::WCSI;;}
break; break;
case 51: case 51:
#line 238 "frame/xyparser.Y" #line 234 "frame/xyparser.Y"
{(yyval.integer) = Coord::WCSJ;;} {(yyval.integer) = Coord::WCSJ;;}
break; break;
case 52: case 52:
#line 239 "frame/xyparser.Y" #line 235 "frame/xyparser.Y"
{(yyval.integer) = Coord::WCSK;;} {(yyval.integer) = Coord::WCSK;;}
break; break;
case 53: case 53:
#line 240 "frame/xyparser.Y" #line 236 "frame/xyparser.Y"
{(yyval.integer) = Coord::WCSL;;} {(yyval.integer) = Coord::WCSL;;}
break; break;
case 54: case 54:
#line 241 "frame/xyparser.Y" #line 237 "frame/xyparser.Y"
{(yyval.integer) = Coord::WCSM;;} {(yyval.integer) = Coord::WCSM;;}
break; break;
case 55: case 55:
#line 242 "frame/xyparser.Y" #line 238 "frame/xyparser.Y"
{(yyval.integer) = Coord::WCSN;;} {(yyval.integer) = Coord::WCSN;;}
break; break;
case 56: case 56:
#line 243 "frame/xyparser.Y" #line 239 "frame/xyparser.Y"
{(yyval.integer) = Coord::WCSO;;} {(yyval.integer) = Coord::WCSO;;}
break; break;
case 57: case 57:
#line 244 "frame/xyparser.Y" #line 240 "frame/xyparser.Y"
{(yyval.integer) = Coord::WCSP;;} {(yyval.integer) = Coord::WCSP;;}
break; break;
case 58: case 58:
#line 245 "frame/xyparser.Y" #line 241 "frame/xyparser.Y"
{(yyval.integer) = Coord::WCSQ;;} {(yyval.integer) = Coord::WCSQ;;}
break; break;
case 59: case 59:
#line 246 "frame/xyparser.Y" #line 242 "frame/xyparser.Y"
{(yyval.integer) = Coord::WCSR;;} {(yyval.integer) = Coord::WCSR;;}
break; break;
case 60: case 60:
#line 247 "frame/xyparser.Y" #line 243 "frame/xyparser.Y"
{(yyval.integer) = Coord::WCSS;;} {(yyval.integer) = Coord::WCSS;;}
break; break;
case 61: case 61:
#line 248 "frame/xyparser.Y" #line 244 "frame/xyparser.Y"
{(yyval.integer) = Coord::WCST;;} {(yyval.integer) = Coord::WCST;;}
break; break;
case 62: case 62:
#line 249 "frame/xyparser.Y" #line 245 "frame/xyparser.Y"
{(yyval.integer) = Coord::WCSU;;} {(yyval.integer) = Coord::WCSU;;}
break; break;
case 63: case 63:
#line 250 "frame/xyparser.Y" #line 246 "frame/xyparser.Y"
{(yyval.integer) = Coord::WCSV;;} {(yyval.integer) = Coord::WCSV;;}
break; break;
case 64: case 64:
#line 251 "frame/xyparser.Y" #line 247 "frame/xyparser.Y"
{(yyval.integer) = Coord::WCSW;;} {(yyval.integer) = Coord::WCSW;;}
break; break;
case 65: case 65:
#line 252 "frame/xyparser.Y" #line 248 "frame/xyparser.Y"
{(yyval.integer) = Coord::WCSX;;} {(yyval.integer) = Coord::WCSX;;}
break; break;
case 66: case 66:
#line 253 "frame/xyparser.Y" #line 249 "frame/xyparser.Y"
{(yyval.integer) = Coord::WCSY;;} {(yyval.integer) = Coord::WCSY;;}
break; break;
case 67: case 67:
#line 254 "frame/xyparser.Y" #line 250 "frame/xyparser.Y"
{(yyval.integer) = Coord::WCSZ;;} {(yyval.integer) = Coord::WCSZ;;}
break; break;
case 68: case 68:
#line 257 "frame/xyparser.Y" #line 253 "frame/xyparser.Y"
{(yyval.integer) = Coord::FK4;;} {(yyval.integer) = Coord::FK4;;}
break; break;
case 69: case 69:
#line 258 "frame/xyparser.Y" #line 254 "frame/xyparser.Y"
{(yyval.integer) = Coord::FK4;;} {(yyval.integer) = Coord::FK4;;}
break; break;
case 70: case 70:
#line 259 "frame/xyparser.Y" #line 255 "frame/xyparser.Y"
{(yyval.integer) = Coord::FK5;;} {(yyval.integer) = Coord::FK5;;}
break; break;
case 71: case 71:
#line 260 "frame/xyparser.Y" #line 256 "frame/xyparser.Y"
{(yyval.integer) = Coord::FK5;;} {(yyval.integer) = Coord::FK5;;}
break; break;
case 72: case 72:
#line 261 "frame/xyparser.Y" #line 257 "frame/xyparser.Y"
{(yyval.integer) = Coord::ICRS;;} {(yyval.integer) = Coord::ICRS;;}
break; break;
case 73: case 73:
#line 262 "frame/xyparser.Y" #line 258 "frame/xyparser.Y"
{(yyval.integer) = Coord::GALACTIC;;} {(yyval.integer) = Coord::GALACTIC;;}
break; break;
case 74: case 74:
#line 263 "frame/xyparser.Y" #line 259 "frame/xyparser.Y"
{(yyval.integer) = Coord::ECLIPTIC;;} {(yyval.integer) = Coord::ECLIPTIC;;}
break; break;
case 75: case 75:
#line 266 "frame/xyparser.Y" #line 262 "frame/xyparser.Y"
{fr->createPointCmd(Vector((yyvsp[(1) - (1)].vector)), Point::BOXCIRCLE, POI NTSIZE, {fr->createPointCmd(Vector((yyvsp[(1) - (1)].vector)), Point::BOXCIRCLE, POI NTSIZE,
color,dash,1,font,text, color,dash,1,font,text,
Marker::SELECT | Marker::EDIT | Marker::MOVE | Marker::ROTATE | Marker::SELECT | Marker::EDIT | Marker::MOVE | Marker::ROTATE |
Marker::DELETE | Marker::HIGHLITE | Marker::DELETE | Marker::HIGHLITE |
Marker::INCLUDE | Marker::SOURCE, Marker::INCLUDE | Marker::SOURCE,
"",taglist,cblist); "",taglist,cblist);
;} ;}
break; break;
/* Line 1267 of yacc.c. */ /* Line 1267 of yacc.c. */
#line 1912 "frame/xyparser.C" #line 1908 "frame/xyparser.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 2076 skipping to change at line 2072
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 275 "frame/xyparser.Y" #line 271 "frame/xyparser.Y"
 End of changes. 63 change blocks. 
73 lines changed or deleted 69 lines changed or added

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