comparison src/Analyser.cpp @ 520:30fbc53d8150

Merge latest SV 3.0 branch code
author Chris Cannam
date Fri, 19 Aug 2016 15:58:57 +0100
parents 7b1dbed4eda8
children c6c8c1645ab6
comparison
equal deleted inserted replaced
519:34668179c803 520:30fbc53d8150
275 275
276 SpectrogramLayer *spectrogram = qobject_cast<SpectrogramLayer *> 276 SpectrogramLayer *spectrogram = qobject_cast<SpectrogramLayer *>
277 (m_document->createMainModelLayer(LayerFactory::MelodicRangeSpectrogram)); 277 (m_document->createMainModelLayer(LayerFactory::MelodicRangeSpectrogram));
278 278
279 spectrogram->setColourMap((int)ColourMapper::BlackOnWhite); 279 spectrogram->setColourMap((int)ColourMapper::BlackOnWhite);
280 spectrogram->setNormalization(SpectrogramLayer::NormalizeHybrid); 280 spectrogram->setNormalization(ColumnNormalization::Hybrid);
281 // This magical-looking scale factor happens to get us an 281 // This magical-looking scale factor happens to get us an
282 // identical display to Tony v1.0 282 // identical display to Tony v1.0
283 spectrogram->setGain(100.f / 4096.f); 283 spectrogram->setGain(100.f / 4096.f);
284 m_document->addLayerToView(m_pane, spectrogram); 284 m_document->addLayerToView(m_pane, spectrogram);
285 spectrogram->setLayerDormant(m_pane, true); 285 spectrogram->setLayerDormant(m_pane, true);