comparison layer/SpectrogramLayer.cpp @ 1145:17f999cd0a22 spectrogram-minor-refactor

Since 1d317e717fe4 we no longer want to fft scale in hybrid mode. (This might also restore compatibility with Tony and prior SV save sessions -- test this.)
author Chris Cannam
date Fri, 05 Aug 2016 14:54:24 +0100
parents 6eef0330ef12
children 1badacff7ab2
comparison
equal deleted inserted replaced
1144:6eef0330ef12 1145:17f999cd0a22
1466 params.alwaysOpaque = true; 1466 params.alwaysOpaque = true;
1467 params.invertVertical = false; 1467 params.invertVertical = false;
1468 params.scaleFactor = 1.0; 1468 params.scaleFactor = 1.0;
1469 params.colourRotation = m_colourRotation; 1469 params.colourRotation = m_colourRotation;
1470 1470
1471 if (m_colourScale != ColourScaleType::Phase) { 1471 if (m_colourScale != ColourScaleType::Phase &&
1472 m_normalization != ColumnNormalization::Hybrid) {
1472 params.scaleFactor *= 2.f / float(getFFTSize()); 1473 params.scaleFactor *= 2.f / float(getFFTSize());
1473 } 1474 }
1474 1475
1475 Preferences::SpectrogramSmoothing smoothing = 1476 Preferences::SpectrogramSmoothing smoothing =
1476 Preferences::getInstance()->getSpectrogramSmoothing(); 1477 Preferences::getInstance()->getSpectrogramSmoothing();