comparison layer/SpectrogramLayer.cpp @ 10:8f5b812baaee

* Hook up SV file i/o.  You can now save and load sessions.
  Some problems -- gain is not reloaded correctly for waveforms,
  reloaded panes are not properly reconnected to the panner, and
  no doubt plenty of others.

 SpectrogramLayer::getPropertyRangeAndValue(const PropertyName &name,
 					    int *min, int *max) const
 {
     int deft = 0;
 
+    int throwaway;
+    if (!min) min = &throwaway;
+    if (!max) max = &throwaway;
+
     if (name == tr("Gain")) {
 
 	*min = -50;
 	*max = 50;
 

 
     m_mutex.lock();
     // don't need to invalidate main cache here
     m_pixmapCacheInvalid = true;
     
-    int formerColourRotation = m_colourRotation;
-
     m_colourScheme = scheme;
     setCacheColourmap();
-
-    int distance = formerColourRotation - m_colourRotation;
-
-    if (distance != 0) {
-	rotateCacheColourmap(-distance);
-	m_colourRotation = formerColourRotation;
-    }
 
     m_mutex.unlock();
 
     emit layerParametersChanged();
 }

 void
 SpectrogramLayer::setCacheColourmap()
 {
     if (m_cacheInvalid || !m_cache) return;
 
+    int formerRotation = m_colourRotation;
+
     m_cache->setNumColors(256);
     
     m_cache->setColor(0, qRgb(255, 255, 255));
 
     for (int pixel = 1; pixel < 256; ++pixel) {

 	m_cache->setColor
 	    (pixel, qRgb(colour.red(), colour.green(), colour.blue()));
     }
 
     m_colourRotation = 0;
+    rotateCacheColourmap(m_colourRotation - formerRotation);
+    m_colourRotation = formerRotation;
 }
 
 void
 SpectrogramLayer::rotateCacheColourmap(int distance)
 {
+    if (!m_cache) return;
+
     QRgb newPixels[256];
 
     newPixels[0] = m_cache->color(0);
 
     for (int pixel = 1; pixel < 256; ++pixel) {

 	    // unlocked in the first place.
 	    //!!! hm, I don't think this is working.
 	    MUNLOCK((void *)m_layer.m_cache, width * height);
     
 	    m_layer.setCacheColourmap();
-    
+
 	    m_layer.m_cache->fill(0);
 	    m_layer.m_mutex.unlock();
 
 	    double *input = (double *)
 		fftw_malloc(windowSize * sizeof(double));

 		    }
 		}
 	    }
 		    
 	    if (divisor > 0.0) {
-
+/*
 		int pixel = int(total / divisor);
 		if (pixel > 255) pixel = 255;
 		if (pixel < 1) pixel = 1;
 		assert(x <= scaled.width());
 		scaled.setPixel(x, y, m_cache->color(pixel));
-/*
+*/
 		float pixel = total / divisor;
 		float lq = pixel - int(pixel);
 		float hq = int(pixel) + 1 - pixel;
 		int pixNum = int(pixel);
 		QRgb low = m_cache->color(pixNum > 255 ? 255 : pixNum);

 		QRgb mixed = qRgb
 		    (qRed(low) * lq + qRed(high) * hq + 0.01,
 		     qGreen(low) * lq + qGreen(high) * hq + 0.01,
 		     qBlue(low) * lq + qBlue(high) * hq + 0.01);
 		scaled.setPixel(x, y, mixed);
-*/
+
 	    } else {
 		assert(x <= scaled.width());
 		scaled.setPixel(x, y, qRgb(0, 0, 0));
 	    }
 	}