comparison layer/SpectrogramLayer.cpp @ 1027:dade9bfc7695 spectrogram-minor-refactor

Fix return value from paintDrawBuffer in rightToLeft case; propagate timing change to PeakFrequencies version as well

     float values[maxbin - minbin + 1];
 #else
     float *values = (float *)alloca((maxbin - minbin + 1) * sizeof(float));
 #endif
 
+    int minColumns = 4;
+    double maxTime = 0.15; // seconds; only for non-synchronous drawing
+    auto startTime = chrono::steady_clock::now();
+    
     int start = 0;
     int finish = w;
     int step = 1;
 
     if (rightToLeft) {
         start = w-1;
         finish = -1;
         step = -1;
     }
     
+    int columnCount = 0;
+    
     for (int x = start; x != finish; x += step) {
+        
+        ++columnCount;
         
         if (binforx[x] < 0) continue;
 
         int sx0 = binforx[x];
         int sx1 = sx0;

                     m_columnMags[sx].sample(mag);
                     if (overallMag.sample(mag)) overallMagChanged = true;
                 }
             }
         }
-    }
-
-    return w;
+
+        if (!m_synchronous) {
+            if (columnCount >= minColumns) {
+                auto t = chrono::steady_clock::now();
+                double diff = chrono::duration<double>(t - startTime).count();
+                if (diff > maxTime) {
+#ifdef DEBUG_SPECTROGRAM_REPAINT
+                    cerr << "SpectrogramLayer::paintDrawBufferPeakFrequencies: Max time " << maxTime << " sec exceeded after "
+                         << x << " columns with time " << diff << endl;
+#endif
+                    return columnCount;
+                }
+            }
+        }
+    }
+
+    return columnCount;
 }
 
 int
 SpectrogramLayer::paintDrawBuffer(LayerGeometryProvider *v,
                                   int w,

                                   bool &overallMagChanged,
                                   bool rightToLeft) const
 {
     Profiler profiler("SpectrogramLayer::paintDrawBuffer");
 
-    //!!! todo: propagate to paintDrawBufferPeakFrequencies
-
-    int minColumns = 4;
-    double maxTime = 0.1; // seconds; only for non-synchronous drawing
-
-    auto startTime = chrono::steady_clock::now();
-    
     int minbin = int(binfory[0] + 0.0001);
     int maxbin = int(binfory[h-1]);
 
 #ifdef DEBUG_SPECTROGRAM_REPAINT
     cerr << "SpectrogramLayer::paintDrawBuffer: minbin " << minbin << ", maxbin " << maxbin << "; w " << w << ", h " << h << endl;

 #endif
 
     const float *values = autoarray;
     DenseThreeDimensionalModel::Column c;
 
+    int minColumns = 4;
+    double maxTime = 0.1; // seconds; only for non-synchronous drawing
+    auto startTime = chrono::steady_clock::now();
+    
     int start = 0;
     int finish = w;
     int step = 1;
 
     if (rightToLeft) {
         start = w-1;
         finish = -1;
         step = -1;
     }
+
+    int columnCount = 0;
     
     for (int x = start; x != finish; x += step) {
+
+        ++columnCount;
         
         if (binforx[x] < 0) continue;
 
 //        float columnGain = m_gain;
         float columnMax = 0.f;

 
             m_drawBuffer.setPixel(x, h-y-1, peakpix);
         }
 
         if (!m_synchronous) {
-            if (x >= minColumns) {
+            if (columnCount >= minColumns) {
                 auto t = chrono::steady_clock::now();
                 double diff = chrono::duration<double>(t - startTime).count();
                 if (diff > maxTime) {
 #ifdef DEBUG_SPECTROGRAM_REPAINT
                     cerr << "SpectrogramLayer::paintDrawBuffer: Max time " << maxTime << " sec exceeded after "
                          << x << " columns with time " << diff << endl;
 #endif
-                    return x;
+                    return columnCount;
                 }
             }
         }
     }
 
-    return w;
+    return columnCount;
 }
 
 void
 SpectrogramLayer::illuminateLocalFeatures(LayerGeometryProvider *v, QPainter &paint) const
 {