comparison layer/SpectrogramLayer.cpp @ 287:cd2492c5fe45

* Add SingleColourLayer to manage colours for layers that have a single
  predominant colour (i.e. most of them).

 }
 
 bool
 SpectrogramLayer::hasLightBackground() const 
 {
-    return (m_colourMap == (int)ColourMapper::BlackOnWhite);
+    return ColourMapper(m_colourMap, 1.f, 255.f).hasLightBackground();
 }
 
 void
 SpectrogramLayer::initialisePalette()
 {

         int y0 = int(getYForFrequency(v, f0));
         
 //        std::cerr << "SpectrogramLayer: illuminate "
 //                  << x0 << "," << y1 << " -> " << x1 << "," << y0 << std::endl;
         
-        paint.setPen(Qt::white);
+        paint.setPen(v->getForeground());
 
         //!!! should we be using paintCrosshairs for this?
 
         paint.drawRect(x0, y1, x1 - x0 + 1, y0 - y1 + 1);
     }

                        idb != lastdb &&
                        ((abs(y - lasty) > textHeight && 
                          idb % 10 == 0) ||
                         (abs(y - lasty) > paint.fontMetrics().ascent() && 
                          idb % 5 == 0))) {
-                paint.setPen(Qt::black);
+                paint.setPen(v->getBackground());
                 QString text = QString("%1").arg(idb);
                 paint.drawText(3 + cw - cbw - paint.fontMetrics().width(text),
                                y + toff + textHeight/2, text);
-                paint.setPen(Qt::white);
+                paint.setPen(v->getForeground());
                 paint.drawLine(5 + cw - cbw, y, 8 + cw - cbw, y);
                 lasty = y;
                 lastdb = idb;
             }
 	}