comparison layer/SpectrogramLayer.cpp @ 41:f2c416cbdaa9

* Add time/Hz description for waveform model to the bottom right of a pane
  containing a waveform (also tried this in the status bar, wasn't so good)
* Further spectrogram fixes

 	setWindowOverlap(90);
 	setWindowType(BlackmanWindow);
 	setMaxFrequency(2000);
 	setMinFrequency(40);
 	setFrequencyScale(LogFrequencyScale);
-	setColourScale(dBColourScale);
+	setColourScale(MeterColourScale);
 	setBinDisplay(PeakFrequencies);
 	setNormalizeColumns(true);
     }
 
     if (m_view) m_view->setLightBackground(false);

 
     m_factor = (float *)realloc(m_factor, width * sizeof(float));
 
     m_width = width;
     m_height = height;
+
+    std::cerr << "done, width = " << m_width << " height = " << m_height << std::endl;
 }
 
 void
 SpectrogramLayer::Cache::resize(uint16_t **&array, size_t width, size_t height)
 {

 
 	    std::cerr << "SpectrogramLayer::CacheFillThread::run: model is ready" << std::endl;
 
 	    size_t start = m_layer.m_model->getStartFrame();
 	    size_t end = m_layer.m_model->getEndFrame();
+
+	    std::cerr << "start = " << start << ", end = " << end << std::endl;
 
 	    WindowType windowType = m_layer.m_windowType;
 	    size_t windowSize = m_layer.m_windowSize;
 	    size_t windowIncrement = m_layer.getWindowIncrement();
 

 
     // Each pixel column covers an exact range of sample frames:
     int f0 = getFrameForX(x) - modelStart;
     int f1 = getFrameForX(x + 1) - modelStart - 1;
 
-    if (f1 < int(modelStart) || f0 > int(modelEnd)) return false;
+    if (f1 < int(modelStart) || f0 > int(modelEnd)) {
+	return false;
+    }
       
     // And that range may be drawn from a possibly non-integral
     // range of spectrogram windows:
 
     size_t windowIncrement = getWindowIncrement();

     int h = y1 - y0;
 
 //    std::cerr << "x0 " << x0 << ", x1 " << x1 << ", w " << w << ", h " << h << std::endl;
 
     QImage scaled(w, h, QImage::Format_RGB32);
-    scaled.fill(0);
+    scaled.fill(m_cache->getColour(0).rgb());
 
     float ymag[h];
     float ydiv[h];
 
     int sr = m_model->getSampleRate();

 
 	float s0 = 0, s1 = 0;
 
 	if (!getXBinRange(x0 + x, s0, s1)) {
 	    assert(x <= scaled.width());
-	    for (int y = 0; y < h; ++y) {
-		scaled.setPixel(x, y, qRgb(0, 0, 0));
-	    }
 	    m_mutex.unlock();
 	    continue;
 	}
 
 	int s0i = int(s0 + 0.001);

 	    int y = lrintf(m_view->getYForFrequency(f, minf, maxf, true));
 	    int n = (i % 12);
 	    if (n == 1 || n == 3 || n == 6 || n == 8 || n == 10) {
 		// black notes
 		paint.drawLine(w - pkw, y, w, y);
-		paint.drawRect(w - pkw, y - (py-y)/4, pkw/2, 2*((py-y)/4));
+		int rh = ((py - y) / 4) * 2;
+		if (rh < 2) rh = 2;
+		paint.drawRect(w - pkw, y - (py-y)/4, pkw/2, rh);
 	    } else if (n == 0 || n == 5) {
 		// C, A
 		if (py < h) {
 		    paint.drawLine(w - pkw, (y + py) / 2, w, (y + py) / 2);
 		}