comparison layer/SpectrumLayer.cpp @ 1374:631897ba9fca zoom

Merge from default branch

     if (fn.pointSize() > 8) {
         fn.setPointSize(fn.pointSize() - 1);
         paint.setFont(fn);
     }
 
-    ColourMapper mapper(m_colourMap, 0, 1);
+    ColourMapper mapper(m_colourMap, m_colourInverted, 0, 1);
     paint.setPen(mapper.getContrastingColour());
 
     int xorigin = m_xorigins[v->getId()];
     paint.drawLine(xorigin, cursorPos.y(), v->getPaintWidth(), cursorPos.y());
     paint.drawLine(cursorPos.x(), cursorPos.y(), cursorPos.x(), v->getPaintHeight());

         paint.save();
         paint.setRenderHint(QPainter::Antialiasing, false);
 
         ColourMapper mapper =
             hasLightBackground() ?
-            ColourMapper(ColourMapper::BlackOnWhite, 0, 1) :
-            ColourMapper(ColourMapper::WhiteOnBlack, 0, 1);
+            ColourMapper(ColourMapper::BlackOnWhite, m_colourInverted, 0, 1) :
+            ColourMapper(ColourMapper::WhiteOnBlack, m_colourInverted, 0, 1);
         
         int peakminbin = 0;
         int peakmaxbin = fft->getHeight() - 1;
         double peakmaxfreq = Pitch::getFrequencyForPitch(128);
         peakmaxbin = int(((peakmaxfreq * fft->getHeight() * 2) / fft->getSampleRate()));