comparison layer/SpectrogramLayer.cpp @ 90:7d06e7cf5d5a

* adjustments to facilitate debugging on win32, and some minor fixes

     if (r < 0) r = 0;
     if (r > 256) r = 256;
     int distance = r - m_colourRotation;
 
     if (distance != 0) {
-	rotateCacheColourmap(-distance);
+	rotateColourmap(-distance);
 	m_colourRotation = r;
     }
     
     m_mutex.unlock();
 

 
     m_mutex.lock();
     m_pixmapCacheInvalid = true;
     
     m_colourScheme = scheme;
-    setCacheColourmap();
+    setColourmap();
 
     m_mutex.unlock();
 
     emit layerParametersChanged();
 }

 	}
     }
 }
 
 void
-SpectrogramLayer::setCacheColourmap()
-{
-    if (m_cacheInvalid || !m_cache) return;
-
+SpectrogramLayer::setColourmap()
+{
     int formerRotation = m_colourRotation;
 
     if (m_colourScheme == BlackOnWhite) {
 	m_colourMap.setColour(NO_VALUE, Qt::white);
     } else {

 
 	m_colourMap.setColour(pixel, colour);
     }
 
     m_colourRotation = 0;
-    rotateCacheColourmap(m_colourRotation - formerRotation);
+    rotateColourmap(m_colourRotation - formerRotation);
     m_colourRotation = formerRotation;
 }
 
 void
-SpectrogramLayer::rotateCacheColourmap(int distance)
+SpectrogramLayer::rotateColourmap(int distance)
 {
     if (!m_cache) return;
 
     QColor newPixels[256];
 

             if (m_layer.m_cache) delete m_layer.m_cache;
             m_layer.m_cache = new FFTFileCache
                 (QString("%1").arg(getObjectExportId(&m_layer)),
                  MatrixFile::ReadOnly);
 
-	    m_layer.setCacheColourmap();
+	    m_layer.setColourmap();
 //!!!	    m_layer.m_writeCache->reset();
 
 	    // We don't need a lock when writing to or reading from
 	    // the pixels in the cache.  We do need to ensure we have
 	    // the width and height of the cache and the FFT