summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Joye <wjoye@cfa.harvard.edu>2018-02-13 20:22:24 (GMT)
committerWilliam Joye <wjoye@cfa.harvard.edu>2018-02-13 20:22:24 (GMT)
commit25b0e0ee78b5a5d8a2088b40299bd7da6706fc05 (patch)
tree8e49728c6054a4cb3a190d8bed05f8be604fe631
parent86fd01170d0377086671cfab94cdd6b363e1ef3d (diff)
downloadblt-25b0e0ee78b5a5d8a2088b40299bd7da6706fc05.zip
blt-25b0e0ee78b5a5d8a2088b40299bd7da6706fc05.tar.gz
blt-25b0e0ee78b5a5d8a2088b40299bd7da6706fc05.tar.bz2
fix panner update problem
-rw-r--r--ds9/doc/release/r7.6.html1
-rw-r--r--tksao/frame/base.C7
-rw-r--r--tksao/frame/frame3dbase.C2
3 files changed, 8 insertions, 2 deletions
diff --git a/ds9/doc/release/r7.6.html b/ds9/doc/release/r7.6.html
index 5f47cda..5c344df 100644
--- a/ds9/doc/release/r7.6.html
+++ b/ds9/doc/release/r7.6.html
@@ -166,6 +166,7 @@
<li><tt>01.12.2018 PREFS: add support for user defined precision.</tt></li>
<li><tt>01.23.2018 XPA: upgrade xpa to fix an issue with gcc 7.2.</tt></li>
<li><tt>02.12.2018 FITSY++: fixed an issue with the logic of locating keywords in current hdu and then the primary hdu.</tt></li>
+ <li><tt>02.13.2018 GUI: fixed an issue with the panner not updating properly on initial load.</tt></li>
<li><tt><b>04.15.2018 RELEASE version 7.6</b></tt></li>
</ol>
</ol>
diff --git a/tksao/frame/base.C b/tksao/frame/base.C
index 1885f8e..5f780a3 100644
--- a/tksao/frame/base.C
+++ b/tksao/frame/base.C
@@ -1933,10 +1933,15 @@ int Base::updatePixmap(const BBox& bb)
updateMatrices();
updatePannerMatrices();
case BASE:
+ updateBase();
updatePanner();
+ case PIXMAP:
+ updatePM(bb);
+ break;
+
case BASEONLY:
+ // specal 3D
updateBase();
- case PIXMAP:
updatePM(bb);
break;
}
diff --git a/tksao/frame/frame3dbase.C b/tksao/frame/frame3dbase.C
index 79af645..248b495 100644
--- a/tksao/frame/frame3dbase.C
+++ b/tksao/frame/frame3dbase.C
@@ -789,7 +789,7 @@ void Frame3dBase::setSlice(int id, int ss)
if (id==2) {
currentContext->updateContours();
- update(BASEONLY);
+ update(PIXMAP);
}
else {
// load the next cube