comparison layer/SpectrogramLayer.cpp @ 607:5b72899d692b

Give a dedicated key to toggling the centre line, and move it out of the overlay level setting -- reducing number of overlay levels to 3. Introduce two distinct vertical scale types (so that we can hide the spectrogram colour scale part easily)

     extents.push_back(vertical);
 
     QRect horizontal(0, cursorPos.y(), cursorPos.x(), 1);
     extents.push_back(horizontal);
 
-    int sw = getVerticalScaleWidth(v, paint);
+    int sw = getVerticalScaleWidth(v, false, paint);//!!!
 
     QRect freq(sw, cursorPos.y() - paint.fontMetrics().ascent() - 2,
                paint.fontMetrics().width("123456 Hz") + 2,
                paint.fontMetrics().height());
     extents.push_back(freq);

 SpectrogramLayer::paintCrosshairs(View *v, QPainter &paint,
                                   QPoint cursorPos) const
 {
     paint.save();
 
-    int sw = getVerticalScaleWidth(v, paint);
+    int sw = getVerticalScaleWidth(v, false, paint); //!!!
 
     QFont fn = paint.font();
     if (fn.pointSize() > 8) {
         fn.setPointSize(fn.pointSize() - 1);
         paint.setFont(fn);

 
     return cw;
 }
 
 int
-SpectrogramLayer::getVerticalScaleWidth(View *, QPainter &paint) const
+SpectrogramLayer::getVerticalScaleWidth(View *, bool detailed, QPainter &paint) const
 {
     if (!m_model || !m_model->isOK()) return 0;
 
-    int cw = getColourScaleWidth(paint);
+    int cw = 0;
+    if (detailed) cw = getColourScaleWidth(paint);
 
     int tw = paint.fontMetrics().width(QString("%1")
 				     .arg(m_maxFrequency > 0 ?
 					  m_maxFrequency - 1 :
 					  m_model->getSampleRate() / 2));

     
     return cw + tickw + tw + 13;
 }
 
 void
-SpectrogramLayer::paintVerticalScale(View *v, QPainter &paint, QRect rect) const
+SpectrogramLayer::paintVerticalScale(View *v, bool detailed, QPainter &paint, QRect rect) const
 {
     if (!m_model || !m_model->isOK()) {
 	return;
     }
 

     if (m_maxFrequency > 0) {
 	bins = int((double(m_maxFrequency) * m_fftSize) / sr + 0.1);
 	if (bins > m_fftSize / 2) bins = m_fftSize / 2;
     }
 
-    int cw = getColourScaleWidth(paint);
+    int cw = 0;
+
+    if (detailed) cw = getColourScaleWidth(paint);
     int cbw = paint.fontMetrics().width("dB");
 
     int py = -1;
     int textHeight = paint.fontMetrics().height();
     int toff = -textHeight + paint.fontMetrics().ascent() + 2;
 
-    if (h > textHeight * 3 + 10) {
+    if (detailed && (h > textHeight * 3 + 10)) {
 
         int topLines = 2;
         if (m_colourScale == PhaseColourScale) topLines = 1;
 
 	int ch = h - textHeight * (topLines + 1) - 8;