Mercurial > hg > svgui
changeset 978:64c2b3a4435a 3.0-integration
Merge from branch osx-retina
| author | Chris Cannam |
|---|---|
| date | Fri, 26 Jun 2015 14:10:40 +0100 |
| parents | f40ccbf228c2 (diff) bc23c2cfff65 (current diff) |
| children | 98827470ada2 |
| files | layer/SpectrogramLayer.cpp layer/SpectrumLayer.cpp |
| diffstat | 4 files changed, 5 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/layer/SpectrogramLayer.cpp Wed Jun 10 14:27:55 2015 +0100 +++ b/layer/SpectrogramLayer.cpp Fri Jun 26 14:10:40 2015 +0100 @@ -1633,10 +1633,7 @@ m_windowType, m_windowSize, getWindowIncrement(), - fftSize, - true, // polar - StorageAdviser::SpeedCritical, - m_candidateFillStartFrame); + fftSize); if (!model->isOK()) { QMessageBox::critical @@ -1658,8 +1655,6 @@ m_fftModels[view] = FFTFillPair(model, 0); - model->resume(); - delete m_updateTimer; m_updateTimer = new QTimer((SpectrogramLayer *)this); connect(m_updateTimer, SIGNAL(timeout()), @@ -2453,8 +2448,6 @@ (void)gettimeofday(&tv, 0); m_lastPaintTime = RealTime::fromTimeval(tv) - mainPaintStart; } - -//!!! if (fftSuspended) fft->resume(); } bool
--- a/layer/SpectrumLayer.cpp Wed Jun 10 14:27:55 2015 +0100 +++ b/layer/SpectrumLayer.cpp Fri Jun 26 14:10:40 2015 +0100 @@ -112,11 +112,7 @@ m_windowType, m_windowSize, getWindowIncrement(), - m_windowSize, - false, - StorageAdviser::Criteria - (StorageAdviser::SpeedCritical | - StorageAdviser::FrequentLookupLikely)); + m_windowSize); setSliceableModel(newFFT); @@ -125,8 +121,6 @@ m_biasCurve.push_back(1.f / (float(m_windowSize)/2.f)); } - newFFT->resume(); - m_newFFTNeeded = false; }
--- a/widgets/WindowShapePreview.cpp Wed Jun 10 14:27:55 2015 +0100 +++ b/widgets/WindowShapePreview.cpp Fri Jun 26 14:10:40 2015 +0100 @@ -209,7 +209,6 @@ void WindowShapePreview::setWindowType(WindowType type) { - if (m_windowType == type) return; m_windowType = type; updateLabels(); }
--- a/widgets/WindowTypeSelector.cpp Wed Jun 10 14:27:55 2015 +0100 +++ b/widgets/WindowTypeSelector.cpp Fri Jun 26 14:10:40 2015 +0100 @@ -78,7 +78,9 @@ connect(m_windowCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(windowIndexChanged(int))); - windowIndexChanged(index); + + m_windowType = defaultType; + m_windowShape->setWindowType(m_windowType); } WindowTypeSelector::~WindowTypeSelector()