# HG changeset patch
# User Chris Cannam
# Date 1146838212 0
# Node ID 7d06e7cf5d5af89ead8a705beb330d74b9b6083a
# Parent  803830f186efcabca7badf75d3606db94bc663db
* adjustments to facilitate debugging on win32, and some minor fixes

diff -r 803830f186ef -r 7d06e7cf5d5a layer/SpectrogramLayer.cpp
--- a/layer/SpectrogramLayer.cpp	Fri May 05 13:06:47 2006 +0000
+++ b/layer/SpectrogramLayer.cpp	Fri May 05 14:10:12 2006 +0000
@@ -715,7 +715,7 @@
     int distance = r - m_colourRotation;
 
     if (distance != 0) {
-	rotateCacheColourmap(-distance);
+	rotateColourmap(-distance);
 	m_colourRotation = r;
     }
     
@@ -755,7 +755,7 @@
     m_pixmapCacheInvalid = true;
     
     m_colourScheme = scheme;
-    setCacheColourmap();
+    setColourmap();
 
     m_mutex.unlock();
 
@@ -942,10 +942,8 @@
 }
 
 void
-SpectrogramLayer::setCacheColourmap()
+SpectrogramLayer::setColourmap()
 {
-    if (m_cacheInvalid || !m_cache) return;
-
     int formerRotation = m_colourRotation;
 
     if (m_colourScheme == BlackOnWhite) {
@@ -1015,12 +1013,12 @@
     }
 
     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;
 
@@ -1311,7 +1309,7 @@
                 (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
diff -r 803830f186ef -r 7d06e7cf5d5a layer/SpectrogramLayer.h
--- a/layer/SpectrogramLayer.h	Fri May 05 13:06:47 2006 +0000
+++ b/layer/SpectrogramLayer.h	Fri May 05 14:10:12 2006 +0000
@@ -272,8 +272,8 @@
     size_t m_lastFillExtent;
     bool m_exiting;
 
-    void setCacheColourmap();
-    void rotateCacheColourmap(int distance);
+    void setColourmap();
+    void rotateColourmap(int distance);
 
     void fillCacheColumn(int column,
 			 double *inputBuffer,