comparison layer/SpectrogramLayer.cpp @ 663:1a0fdad4af4d tonioni

Merge from the default branch
author Chris Cannam
date Fri, 12 Jul 2013 13:25:22 +0100
parents d632a1e87018
children 1a0dfcbffaf1
comparison
equal deleted inserted replaced
660:8663a831838f 663:1a0fdad4af4d
2291 } 2291 }
2292 usePeaksCache = (increment * 8) < zoomLevel; 2292 usePeaksCache = (increment * 8) < zoomLevel;
2293 if (m_colourScale == PhaseColourScale) usePeaksCache = false; 2293 if (m_colourScale == PhaseColourScale) usePeaksCache = false;
2294 } 2294 }
2295 2295
2296 m_drawBuffer.setNumColors(256); 2296 // No longer exists in Qt5: m_drawBuffer.setNumColors(256);
2297 for (int pixel = 0; pixel < 256; ++pixel) { 2297 for (int pixel = 0; pixel < 256; ++pixel) {
2298 m_drawBuffer.setColor(pixel, m_palette.getColour(pixel).rgb()); 2298 m_drawBuffer.setColor(pixel, m_palette.getColour(pixel).rgb());
2299 } 2299 }
2300 2300
2301 m_drawBuffer.fill(0); 2301 m_drawBuffer.fill(0);