diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2018-08-17 19:11:49 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2018-08-17 19:11:49 (GMT) |
| commit | 118e5a85e4732f882ffcda10cb3d1c5bf0324959 (patch) | |
| tree | 117720cd586d003bd1850a64a4d26268b479ea1a /tksao/frame/parser.Y | |
| parent | 61331fa2c608e44eae36a8edbaef63752e635303 (diff) | |
| download | blt-118e5a85e4732f882ffcda10cb3d1c5bf0324959.zip blt-118e5a85e4732f882ffcda10cb3d1c5bf0324959.tar.gz blt-118e5a85e4732f882ffcda10cb3d1c5bf0324959.tar.bz2 | |
simplify cube code
Diffstat (limited to 'tksao/frame/parser.Y')
| -rw-r--r-- | tksao/frame/parser.Y | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/tksao/frame/parser.Y b/tksao/frame/parser.Y index 9aa23be..2fdd86c 100644 --- a/tksao/frame/parser.Y +++ b/tksao/frame/parser.Y @@ -1196,7 +1196,6 @@ getFitsHeader : INT {fr->getFitsHeaderCmd($1);} ; getFitsDepth : /* empty */ {fr->getFitsDepthCmd(2);} - | INT {fr->getFitsDepthCmd($1);} ; getFitsFileName: fileNameType @@ -1208,13 +1207,13 @@ getFitsFileName: fileNameType {fr->getFitsFileNameCmd($2, (Base::FileNameType)$1);} ; -getFitsSlice : /* empty */ {fr->getSliceCmd();} +getFitsSlice : /* empty */ {fr->getFitsSliceCmd();} | numeric coordSystem skyFrame - {fr->getSliceToImageCmd($1, (Coord::CoordSystem)$2, (Coord::SkyFrame)$3);} + {fr->getFitsSliceToImageCmd($1, (Coord::CoordSystem)$2, (Coord::SkyFrame)$3);} | COORDINATES_ coordSystem skyFrame - {fr->getSliceFromImageCmd(2, (Coord::CoordSystem)$2, (Coord::SkyFrame)$3);} + {fr->getFitsSliceFromImageCmd(2, (Coord::CoordSystem)$2, (Coord::SkyFrame)$3);} | COORDINATES_ INT coordSystem skyFrame - {fr->getSliceFromImageCmd($2, (Coord::CoordSystem)$3, (Coord::SkyFrame)$4);} + {fr->getFitsSliceFromImageCmd($2, (Coord::CoordSystem)$3, (Coord::SkyFrame)$4);} ; getGrid : /* empty */ {fr->getGridCmd();} @@ -2759,10 +2758,12 @@ update : /* empty */ {fr->updateFitsCmd(0);} | FITS_ SLICE_ updateFitsSlice ; -updateFitsSlice : INT {fr->sliceCmd(2, $1);} - | numeric coordSystem {fr->sliceCmd(2, $1, (Coord::CoordSystem)$2);} - | INT INT {fr->sliceCmd($1, $2);} - | INT numeric coordSystem {fr->sliceCmd($1, $2, (Coord::CoordSystem)$3);} +updateFitsSlice : INT {fr->sliceCmd($1);} + | INT INT { + // backward compatibility with backup + fr->sliceCmd($2); + } + | numeric coordSystem {fr->sliceCmd($1, (Coord::CoordSystem)$2);} ; warp : numeric numeric {fr->warpCmd(Vector($1,$2));} |