diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2017-09-15 19:01:26 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2017-09-15 19:01:26 (GMT) |
| commit | 74c4621a012f71630462290a201aad6974afaa17 (patch) | |
| tree | 9b069a3247f2d39c967236136d5a4993c0f68615 /tksao | |
| parent | 3fc19fef08eb015fca285f1549a89cbdef17cfd0 (diff) | |
| download | blt-74c4621a012f71630462290a201aad6974afaa17.zip blt-74c4621a012f71630462290a201aad6974afaa17.tar.gz blt-74c4621a012f71630462290a201aad6974afaa17.tar.bz2 | |
new AST support
Diffstat (limited to 'tksao')
| -rw-r--r-- | tksao/frame/frame3dbase.C | 21 | ||||
| -rw-r--r-- | tksao/frame/framebase.C | 4 |
2 files changed, 12 insertions, 13 deletions
diff --git a/tksao/frame/frame3dbase.C b/tksao/frame/frame3dbase.C index 8956684..47a4abf 100644 --- a/tksao/frame/frame3dbase.C +++ b/tksao/frame/frame3dbase.C @@ -850,11 +850,6 @@ void Frame3dBase::updatePanner() east = (Vector3d(-1,0)*mm).normalize(); } - cerr << endl; - cerr << north << ' ' << east << endl; - { - } - // and update the panner str << pannerName << " update wcs compass " << north << ' ' << east << ends; @@ -909,13 +904,17 @@ void Frame3dBase::updatePanner() if (keyContext->fits && keyContext->fits->hasWCS(wcsSystem_)) { Matrix3d mx; - switch (keyContext->fits->getWCSOrientation(wcsSystem_, wcsSky_)) { - case Coord::XX: - mx *= FlipX3d(); - break; - default: - break; + Coord::Orientation oo = + keyContext->fits->getWCSOrientation(wcsSystem_, wcsSky_); + if (hasWCSCel(wcsSystem_)) { + if (oo==Coord::XX) + mx *= FlipX3d(); } + else { + if (oo==Coord::NORMAL) + mx *= FlipX3d(); + } + mx *= mm; Vector north = (Vector3d(0,1)*mx).normalize(); Vector east = (Vector3d(-1,0)*mx).normalize(); diff --git a/tksao/frame/framebase.C b/tksao/frame/framebase.C index f855d4c..8b1a25b 100644 --- a/tksao/frame/framebase.C +++ b/tksao/frame/framebase.C @@ -229,9 +229,7 @@ void FrameBase::updatePanner() << xx << ' ' << yy << ';'; if (keyContext->fits && keyContext->fits->hasWCS(wcsSystem_)) { - double rr = keyContext->fits->getWCSRotation(wcsSystem_, wcsSky_); Matrix mx; - Coord::Orientation oo = keyContext->fits->getWCSOrientation(wcsSystem_, wcsSky_); if (hasWCSCel(wcsSystem_)) { @@ -242,6 +240,8 @@ void FrameBase::updatePanner() if (oo==Coord::NORMAL) mx *= FlipX(); } + + double rr = keyContext->fits->getWCSRotation(wcsSystem_, wcsSky_); mx *= Rotate(rr)*mm; Vector north = (Vector(0,1)*mx).normalize(); Vector east = (Vector(-1,0)*mx).normalize(); |