comparison view/View.cpp @ 1329:344f29e46258 zoom

Responding to a hang due to mismatching zoom and block sizes

 
 #include <iostream>
 #include <cassert>
 #include <cmath>
 
-//#define DEBUG_VIEW 1
+#define DEBUG_VIEW 1
 //#define DEBUG_VIEW_WIDGET_PAINT 1
 
 View::View(QWidget *w, bool showProgress) :
     QFrame(w),
     m_id(getNextId()),

 bool
 View::setCentreFrame(sv_frame_t f, bool e)
 {
     bool changeVisible = false;
 
+#ifdef DEBUG_VIEW
+    SVCERR << "View::setCentreFrame: from " << m_centreFrame
+           << " to " << f << endl;
+#endif
+
     if (m_centreFrame != f) {
 
         sv_frame_t formerCentre = m_centreFrame;
         m_centreFrame = f;
         

             if (newPixel != formerPixel) {
 
 #ifdef DEBUG_VIEW_WIDGET_PAINT
                 SVCERR << "View(" << this << ")::setCentreFrame: newPixel " << newPixel << ", formerPixel " << formerPixel << endl;
 #endif
+                // ensure the centre frame is a multiple of the zoom level
+                m_centreFrame = sv_frame_t(newPixel) * m_zoomLevel.level;
+                
                 update();
                 changeVisible = true;
             }
         }