Mercurial > hg > svgui

changeset 1145:17f999cd0a22 spectrogram-minor-refactor

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 74f2706995b7
files layer/SpectrogramLayer.cpp
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/layer/SpectrogramLayer.cpp	Fri Aug 05 14:36:28 2016 +0100
+++ b/layer/SpectrogramLayer.cpp	Fri Aug 05 14:54:24 2016 +0100
@@ -1468,7 +1468,8 @@
         params.scaleFactor = 1.0;
         params.colourRotation = m_colourRotation;
 
-        if (m_colourScale != ColourScaleType::Phase) {
+        if (m_colourScale != ColourScaleType::Phase &&
+            m_normalization != ColumnNormalization::Hybrid) {
             params.scaleFactor *= 2.f / float(getFFTSize());
         }