Mercurial > hg > svgui
changeset 1002:dc8092488005 3.0-integration
Merge from branch "tony-2.0-integration"
| author | Chris Cannam |
|---|---|
| date | Wed, 14 Oct 2015 10:12:59 +0100 |
| parents | 8588b97f1d1c (current diff) 89f44d182d37 (diff) |
| children | 5fdf5cd032ac |
| files | |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/layer/SpectrogramLayer.cpp Tue Aug 04 16:39:40 2015 +0100 +++ b/layer/SpectrogramLayer.cpp Wed Oct 14 10:12:59 2015 +0100 @@ -1512,7 +1512,7 @@ } if (m_fftModels[view]->getHeight() != fftSize / 2 + 1) { #ifdef DEBUG_SPECTROGRAM_REPAINT - cerr << "SpectrogramLayer::getFFTModel(" << v << "): Found a model with the wrong height (" << m_fftModels[view].first->getHeight() << ", wanted " << (fftSize / 2 + 1) << ")" << endl; + cerr << "SpectrogramLayer::getFFTModel(" << v << "): Found a model with the wrong height (" << m_fftModels[view]->getHeight() << ", wanted " << (fftSize / 2 + 1) << ")" << endl; #endif delete m_fftModels[view]; m_fftModels.erase(view); @@ -2571,7 +2571,7 @@ fft->getNormalizedMagnitudesAt(sx, autoarray, minbin, maxbin - minbin + 1); float max = fft->getMaximumMagnitudeAt(sx); float scale = log10f(max + 1.f); - cout << "sx = " << sx << ", max = " << max << ", log10(max) = " << log10(max) << ", scale = " << scale << endl; +// cout << "sx = " << sx << ", max = " << max << ", log10(max) = " << log10(max) << ", scale = " << scale << endl; for (int i = minbin; i <= maxbin; ++i) { autoarray[i - minbin] *= scale; }
--- a/view/ViewProxy.h Tue Aug 04 16:39:40 2015 +0100 +++ b/view/ViewProxy.h Wed Oct 14 10:12:59 2015 +0100 @@ -71,11 +71,11 @@ return m_view->getValueExtents(unit, min, max, log); } virtual int getZoomLevel() const { - //!!! aarg, what if it's already 1? int z = m_view->getZoomLevel(); - cerr << "getZoomLevel: from " << z << " to "; +// cerr << "getZoomLevel: from " << z << " to "; z = z / m_scaleFactor; - cerr << z << endl; +// cerr << z << endl; + if (z < 1) z = 1; return z; } virtual QRect getPaintRect() const {