comparison data/fft/FFTDataServer.cpp @ 217:b3dfc3714006

* Fix a crash in spectrogram
* Don't clear background of curved area of thumbwheel (this way it looks better
  on a dark background)

 float
 FFTDataServer::getMagnitudeAt(size_t x, size_t y)
 {
     Profiler profiler("FFTDataServer::getMagnitudeAt", false);
 
+    if (x >= m_width || y >= m_height) return 0;
+
     size_t col;
     FFTCache *cache = getCache(x, col);
     if (!cache) return 0;
 
     if (!cache->haveSetColumnAt(col)) {

 float
 FFTDataServer::getNormalizedMagnitudeAt(size_t x, size_t y)
 {
     Profiler profiler("FFTDataServer::getNormalizedMagnitudeAt", false);
 
+    if (x >= m_width || y >= m_height) return 0;
+
     size_t col;
     FFTCache *cache = getCache(x, col);
     if (!cache) return 0;
 
     if (!cache->haveSetColumnAt(col)) {

 float
 FFTDataServer::getMaximumMagnitudeAt(size_t x)
 {
     Profiler profiler("FFTDataServer::getMaximumMagnitudeAt", false);
 
+    if (x >= m_width) return 0;
+
     size_t col;
     FFTCache *cache = getCache(x, col);
     if (!cache) return 0;
 
     if (!cache->haveSetColumnAt(col)) {

 
 float
 FFTDataServer::getPhaseAt(size_t x, size_t y)
 {
     Profiler profiler("FFTDataServer::getPhaseAt", false);
+
+    if (x >= m_width || y >= m_height) return 0;
 
     size_t col;
     FFTCache *cache = getCache(x, col);
     if (!cache) return 0;
 

 bool
 FFTDataServer::isColumnReady(size_t x)
 {
     Profiler profiler("FFTDataServer::isColumnReady", false);
 
+    if (x >= m_width) return true;
+
     if (!haveCache(x)) {
         if (m_lastUsedCache == -1) {
             if (m_suspended) {
                 std::cerr << "FFTDataServer::isColumnReady(" << x << "): no cache, calling resume" << std::endl;
                 resume();

 
 void
 FFTDataServer::fillColumn(size_t x)
 {
     Profiler profiler("FFTDataServer::fillColumn", false);
+
+    if (!m_fftInput) {
+        std::cerr << "WARNING: FFTDataServer::fillColumn(" << x << "): "
+                  << "input has already been completed and discarded?"
+                  << std::endl;
+        return;
+    }
+
+    if (x >= m_width) {
+        std::cerr << "WARNING: FFTDataServer::fillColumn(" << x << "): "
+                  << "x > width (" << x << " > " << m_width << ")"
+                  << std::endl;
+        return;
+    }
 
     size_t col;
 #ifdef DEBUG_FFT_SERVER_FILL
     std::cout << "FFTDataServer::fillColumn(" << x << ")" << std::endl;
 #endif