comparison layer/SpectrogramLayer.cpp @ 55:128ebfeeebee

* Add Insert Instant function in main window
* Ensure selections and window geometry are saved in session file
* Add wait cursor on session file save
* Various improvements to display of texts in pane (clearer readability)
* Use commands for setting properties on layers and panes
  (still need to batch up multiple sets on the same property)
* Fix failure of spectrogram to refresh when initial part became visible
* Some fixes & paint optimisations in View &c
* Make curve mode for time value layers work properly when resolution == 1
* Some vague improvements for time value layer vertical scale

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

 	if (value == -50) setThreshold(0.0);
 	else setThreshold(AudioLevel::dB_to_multiplier(value));
     } else if (name == tr("Colour Rotation")) {
 	setColourRotation(value);
     } else if (name == tr("Colour")) {
-//!!!	if (v) v->setLightBackground(value == 2);
 	switch (value) {
 	default:
 	case 0:	setColourScheme(DefaultColours); break;
 	case 1: setColourScheme(WhiteOnBlack); break;
 	case 2: setColourScheme(BlackOnWhite); break;

 }
 
 void
 SpectrogramLayer::setGain(float gain)
 {
+    std::cerr << "SpectrogramLayer::setGain(" << gain << ") (my gain is now "
+	      << m_gain << ")" << std::endl;
+
     if (m_gain == gain) return;
 
     m_mutex.lock();
     m_pixmapCacheInvalid = true;
     

 	if (fillExtent >= m_lastFillExtent) {
 	    if (fillExtent >= m_model->getEndFrame() && m_lastFillExtent > 0) {
 #ifdef DEBUG_SPECTROGRAM_REPAINT
 		std::cerr << "complete!" << std::endl;
 #endif
+		m_pixmapCacheInvalid = true;
 		emit modelChanged();
-		m_pixmapCacheInvalid = true;
 		delete m_updateTimer;
 		m_updateTimer = 0;
 		m_lastFillExtent = 0;
 	    } else if (fillExtent > m_lastFillExtent) {
 #ifdef DEBUG_SPECTROGRAM_REPAINT
 		std::cerr << "SpectrogramLayer: emitting modelChanged("
 			  << m_lastFillExtent << "," << fillExtent << ")" << std::endl;
 #endif
+		m_pixmapCacheInvalid = true;
 		emit modelChanged(m_lastFillExtent, fillExtent);
-		m_pixmapCacheInvalid = true;
 		m_lastFillExtent = fillExtent;
 	    }
 	} else {
 //	    if (v) {
 		size_t sf = 0;
 //!!!		if (v->getStartFrame() > 0) sf = v->getStartFrame();
 #ifdef DEBUG_SPECTROGRAM_REPAINT
 		std::cerr << "SpectrogramLayer: going backwards, emitting modelChanged("
 			  << sf << "," << m_model->getEndFrame() << ")" << std::endl;
 #endif
+		m_pixmapCacheInvalid = true;
 		emit modelChanged(sf, m_model->getEndFrame());
-		m_pixmapCacheInvalid = true;
 //	    }
 	    m_lastFillExtent = fillExtent;
 	}
     }
 }

 }
 
 void
 SpectrogramLayer::Cache::resize(size_t width, size_t height)
 {
-    std::cerr << "SpectrogramLayer::Cache[" << this << "]::resize(" << width << "x" << height << ")" << std::endl;
+    std::cerr << "SpectrogramLayer::Cache[" << this << "]::resize(" << width << "x" << height << " = " << width*height << ")" << std::endl;
     
     if (m_width == width && m_height == height) return;
 
     resize(m_magnitude, width, height);
     resize(m_phase, width, height);

 }
    
 void
 SpectrogramLayer::paint(View *v, QPainter &paint, QRect rect) const
 {
+    if (m_colourScheme == BlackOnWhite) {
+	v->setLightBackground(true);
+    } else {
+	v->setLightBackground(false);
+    }
+
 //    Profiler profiler("SpectrogramLayer::paint", true);
 #ifdef DEBUG_SPECTROGRAM_REPAINT
     std::cerr << "SpectrogramLayer::paint(): m_model is " << m_model << ", zoom level is " << v->getZoomLevel() << ", m_updateTimer " << m_updateTimer << ", pixmap cache invalid " << m_pixmapCacheInvalid << std::endl;
 #endif