diff layer/SpectrogramLayer.cpp @ 160:f4be20ebdfa4

* Some dull work to continue unifying the fft model and editable dense 3d model interfaces
author Chris Cannam
date Mon, 09 Oct 2006 10:49:46 +0000
parents 9c3a4b42d8f8
children dc2fe023a14f
line wrap: on
line diff
--- a/layer/SpectrogramLayer.cpp	Fri Oct 06 16:53:25 2006 +0000
+++ b/layer/SpectrogramLayer.cpp	Mon Oct 09 10:49:46 2006 +0000
@@ -21,7 +21,6 @@
 #include "base/Window.h"
 #include "base/Pitch.h"
 #include "base/Preferences.h"
-#include "data/fft/FFTDataServer.h"
 
 #include <QPainter>
 #include <QImage>
@@ -1410,7 +1409,7 @@
 
 	for (int s = s0i; s <= s1i; ++s) {
 
-            if (!fft->isColumnReady(s)) continue;
+            if (!fft->isColumnAvailable(s)) continue;
 
 	    float binfreq = (sr * q) / m_windowSize;
 	    if (q == q0i) freqMin = binfreq;
@@ -1488,7 +1487,7 @@
             for (int s = s0i; s <= s1i; ++s) {
                 if (s >= 0 && q >= 0 && s < cw && q < ch) {
 
-                    if (!fft->isColumnReady(s)) continue;
+                    if (!fft->isColumnAvailable(s)) continue;
                     
                     float value;
 
@@ -1992,7 +1991,7 @@
 
         for (int s = s0i; s <= s1i; ++s) {
 
-            if (!fft->isColumnReady(s)) continue;
+            if (!fft->isColumnAvailable(s)) continue;
             MagnitudeRange mag;
 
             for (size_t q = minbin; q < bins; ++q) {