comparison layer/Colour3DPlotRenderer.cpp @ 1330:c1f719094c25 zoom

Ensure getFrameForX returns value on zoom blocksize boundary; take advantage of that (this is essentially reverting to the same behaviour as in the default branch, which we should probably have done all along)

     sv_frame_t rightBoundaryFrame = -1, rightCropFrame = -1;
 
     int drawBufferWidth;
     int binResolution = model->getResolution();
 
-    int limitOverrun = 100; // overrun from edge before we decide this
-                            // isn't going to work out
-    int leftLimit = -limitOverrun;
-    int rightLimit = v->getPaintWidth() + limitOverrun;
-    
-    for (int x = x0; x > leftLimit; --x) {
+    // These loops should eventually terminate provided that
+    // getFrameForX always returns a multiple of the zoom level,
+    // i.e. there is some x for which getFrameForX(x) == 0 and
+    // subsequent return values are equally spaced
+    
+    for (int x = x0; ; --x) {
         sv_frame_t f = v->getFrameForX(x);
-        if ((f / binResolution) * binResolution == f || x-1 == leftLimit) {
+        if ((f / binResolution) * binResolution == f) {
             if (leftCropFrame == -1) leftCropFrame = f;
             else if (x < x0 - 2) {
                 leftBoundaryFrame = f;
                 break;
             }
         }
     }
     
-    for (int x = x0 + repaintWidth; x < rightLimit; ++x) {
+    for (int x = x0 + repaintWidth; ; ++x) {
         sv_frame_t f = v->getFrameForX(x);
-        if ((f / binResolution) * binResolution == f || x+1 == rightLimit) {
+        if ((f / binResolution) * binResolution == f) {
             if (rightCropFrame == -1) rightCropFrame = f;
             else if (x > x0 + repaintWidth + 2) {
                 rightBoundaryFrame = f;
                 break;
             }
         }
     }
 
-    if (leftBoundaryFrame == -1 || rightBoundaryFrame == -1) {
-        SVCERR << "WARNING: failed to set left or right boundary frame (values are " << leftBoundaryFrame << " and " << rightBoundaryFrame << " respectively)" << endl;
-        return;
-    }
-    
     drawBufferWidth = int
         ((rightBoundaryFrame - leftBoundaryFrame) / binResolution);
     
     int h = v->getPaintHeight();