Mercurial > hg > svgui

comparison layer/Colour3DPlotRenderer.cpp @ 1130:dc4b8fd3fcb7 spectrogram-minor-refactor

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor tidy
author Chris Cannam
date Tue, 02 Aug 2016 09:20:16 +0100
parents 50324fca1328
children ee98d587cd1a
comparison
equal deleted inserted replaced
1129:371320c9f8d9 1130:dc4b8fd3fcb7
361 361
362 column = ColumnOp::applyGain(column, m_params.scaleFactor); 362 column = ColumnOp::applyGain(column, m_params.scaleFactor);
363 363
364 magRange.sample(column); 364 magRange.sample(column);
365 365
366 //!!! fft scale if (m_colourScale != ColourScaleType::Phase) {
367 // column = ColumnOp::fftScale(column, m_fftSize);
368 // }
369
370 // if (m_colourScale != ColourScaleType::Phase) { 366 // if (m_colourScale != ColourScaleType::Phase) {
371 preparedColumn = ColumnOp::normalize(column, m_params.normalization); 367 preparedColumn = ColumnOp::normalize(column, m_params.normalization);
372 // } 368 // }
373 369
374 if (m_params.binDisplay == BinDisplay::PeakBins) { 370 if (m_params.binDisplay == BinDisplay::PeakBins) {
790 vector<float>(fullColumn.data() + minbin, 786 vector<float>(fullColumn.data() + minbin,
791 fullColumn.data() + maxbin + 1); 787 fullColumn.data() + maxbin + 1);
792 788
793 column = ColumnOp::applyGain(column, m_params.scaleFactor); 789 column = ColumnOp::applyGain(column, m_params.scaleFactor);
794 790
795 //!!! fft scale if (m_colourScale != ColourScaleType::Phase) {
796 // column = ColumnOp::fftScale(column, m_fftSize);
797 // }
798
799 magRange.sample(column); 791 magRange.sample(column);
800 792
801 // if (m_colourScale != ColourScaleType::Phase) { 793 // if (m_colourScale != ColourScaleType::Phase) {
802 column = ColumnOp::normalize(column, m_params.normalization); 794 column = ColumnOp::normalize(column, m_params.normalization);
803 // } 795 // }
941 933
942 column = ColumnOp::applyGain(column, m_params.scaleFactor); 934 column = ColumnOp::applyGain(column, m_params.scaleFactor);
943 935
944 magRange.sample(column); 936 magRange.sample(column);
945 937
946 //!!! fft scale if (m_colourScale != ColourScaleType::Phase) {
947 // column = ColumnOp::fftScale(column, getFFTSize());
948 // }
949
950 //!!! if (m_colourScale != ColourScaleType::Phase) { 938 //!!! if (m_colourScale != ColourScaleType::Phase) {
951 preparedColumn = ColumnOp::normalize 939 preparedColumn = ColumnOp::normalize
952 (column, m_params.normalization); 940 (column, m_params.normalization);
953 //!!! } 941 //!!! }
954 942