Mercurial > hg > svgui

comparison layer/Colour3DPlotRenderer.cpp @ 1125:50324fca1328 spectrogram-minor-refactor

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Scale range matching
author Chris Cannam
date Mon, 01 Aug 2016 15:06:16 +0100
parents b71a0491d287
children dc4b8fd3fcb7
comparison
equal deleted inserted replaced
1124:b71a0491d287 1125:50324fca1328
357 357
358 ColumnOp::Column column = 358 ColumnOp::Column column =
359 vector<float>(fullColumn.data() + minbin, 359 vector<float>(fullColumn.data() + minbin,
360 fullColumn.data() + maxbin + 1); 360 fullColumn.data() + maxbin + 1);
361 361
362 column = ColumnOp::applyGain(column, m_params.scaleFactor);
363
362 magRange.sample(column); 364 magRange.sample(column);
363 365
364 //!!! fft scale if (m_colourScale != ColourScaleType::Phase) { 366 //!!! fft scale if (m_colourScale != ColourScaleType::Phase) {
365 // column = ColumnOp::fftScale(column, m_fftSize); 367 // column = ColumnOp::fftScale(column, m_fftSize);
366 // } 368 // }
786 788
787 ColumnOp::Column column = 789 ColumnOp::Column column =
788 vector<float>(fullColumn.data() + minbin, 790 vector<float>(fullColumn.data() + minbin,
789 fullColumn.data() + maxbin + 1); 791 fullColumn.data() + maxbin + 1);
790 792
793 column = ColumnOp::applyGain(column, m_params.scaleFactor);
794
791 //!!! fft scale if (m_colourScale != ColourScaleType::Phase) { 795 //!!! fft scale if (m_colourScale != ColourScaleType::Phase) {
792 // column = ColumnOp::fftScale(column, m_fftSize); 796 // column = ColumnOp::fftScale(column, m_fftSize);
793 // } 797 // }
794 798
795 magRange.sample(column); 799 magRange.sample(column);
933 937
934 ColumnOp::Column column = 938 ColumnOp::Column column =
935 vector<float>(fullColumn.data() + minbin, 939 vector<float>(fullColumn.data() + minbin,
936 fullColumn.data() + maxbin + 1); 940 fullColumn.data() + maxbin + 1);
937 941
942 column = ColumnOp::applyGain(column, m_params.scaleFactor);
943
938 magRange.sample(column); 944 magRange.sample(column);
939 945
940 //!!! fft scale if (m_colourScale != ColourScaleType::Phase) { 946 //!!! fft scale if (m_colourScale != ColourScaleType::Phase) {
941 // column = ColumnOp::fftScale(column, getFFTSize()); 947 // column = ColumnOp::fftScale(column, getFFTSize());
942 // } 948 // }