comparison layer/SpectrogramLayer.cpp @ 1029:fdfd84b022df spectrogram-minor-refactor

Fix calculation of repaint area when we haven't scrolled but cache is not complete

                     cerr << "SpectrogramLayer: dx == " << dx << ": scrolled too far for cache to be useful" << endl;
 #endif
 
                     cache.validArea = QRect();
                     recreateWholeImageCache = true;
+
+                } else {
+
+                    // dx == 0, we haven't scrolled but the cache is
+                    // only partly valid
+
+#ifdef DEBUG_SPECTROGRAM_REPAINT
+                    cerr << "SpectrogramLayer: haven't scrolled, but cache is not complete" << endl;
+#endif
+                    if (cache.validArea.x() == 0) {
+                        x0 = cache.validArea.width();
+                    } else {
+                        x1 = cache.validArea.x();
+                    }
                 }
 	    }
 	} else {
 #ifdef DEBUG_SPECTROGRAM_REPAINT
 	    cerr << "SpectrogramLayer: image cache useless" << endl;

     bool rightToLeft = (x0 == 0 && x1 < v->getPaintWidth());
     
 #ifdef DEBUG_SPECTROGRAM_REPAINT
     cerr << "SpectrogramLayer: x0 " << x0 << ", x1 " << x1
          << ", repaintWidth " << repaintWidth << ", h " << h
-         << ", rightToLeft " << rightToLeft << endl;
+         << ", rightToLeft " << rightToLeft
+         << ", recreateWholeImageCache " << recreateWholeImageCache << endl;
 #endif
 
     sv_samplerate_t sr = m_model->getSampleRate();
 
     // Set minFreq and maxFreq to the frequency extents of the possibly

 
     int failedToRepaint = bufwid - attainedBufwid;
     if (failedToRepaint > 0) {
 #ifdef DEBUG_SPECTROGRAM_REPAINT
         cerr << "SpectrogramLayer::paint(): Failed to repaint " << failedToRepaint << " of " << bufwid
-             << " columns in time" << endl;
+             << " columns in time (so managed to repaint " << bufwid - failedToRepaint << ")" << endl;
 #endif
     } else if (failedToRepaint < 0) {
         cerr << "WARNING: failedToRepaint < 0 (= " << failedToRepaint << ")"
              << endl;
         failedToRepaint = 0;

 
 #ifdef DEBUG_SPECTROGRAM_REPAINT
     cerr << "SpectrogramLayer: Cache valid area becomes " << cache.validArea.x()
          << ", " << cache.validArea.y() << ", "
          << cache.validArea.width() << "x"
-         << cache.validArea.height() << endl;
+         << cache.validArea.height() << " (size = "
+         << cache.image.width() << "x" << cache.image.height() << ")"
+         << endl;
 #endif
 
     QRect pr = rect & cache.validArea;
 
 #ifdef DEBUG_SPECTROGRAM_REPAINT