Mercurial > hg > svcore
view data/model/test/MockWaveModel.cpp @ 1196:c7b9c902642f spectrogram-minor-refactor
Fix threshold in spectrogram -- it wasn't working in the last release.
There is a new protocol for this. Formerly the threshold parameter had a
range from -50dB to 0 with the default at -50, and -50 treated internally
as "no threshold". However, there was a hardcoded, hidden internal threshold
for spectrogram colour mapping at -80dB with anything below this being rounded
to zero. Now the threshold parameter has range -81 to -1 with the default
at -80, -81 is treated internally as "no threshold", and there is no hidden
internal threshold. So the default behaviour is the same as before, an
effective -80dB threshold, but it is now possible to change this in both
directions. Sessions reloaded from prior versions may look slightly different
because, if the session says there should be no threshold, there will now
actually be no threshold instead of having the hidden internal one.
Still need to do something in the UI to make it apparent that the -81dB
setting removes the threshold entirely. This is at least no worse than the
previous, also obscured, magic -50dB setting.
author | Chris Cannam |
---|---|
date | Mon, 01 Aug 2016 16:21:01 +0100 |
parents | 1309b66eff53 |
children | 54af1e21705c |
line wrap: on
line source
/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */ /* Sonic Visualiser An audio file viewer and annotation editor. Centre for Digital Music, Queen Mary, University of London. This file copyright 2006 Chris Cannam. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. See the file COPYING included with this distribution for more information. */ #include "MockWaveModel.h" #include <cmath> using namespace std; MockWaveModel::MockWaveModel(vector<Sort> sorts, int length, int pad) { for (auto sort: sorts) { m_data.push_back(generate(sort, length, pad)); } } vector<float> MockWaveModel::getData(int channel, sv_frame_t start, sv_frame_t count) const { sv_frame_t i = 0; // cerr << "MockWaveModel::getData(" << channel << "," << start << "," << count << "): "; vector<float> data; while (i < count) { sv_frame_t idx = start + i; if (!in_range_for(m_data[channel], idx)) break; data.push_back(m_data[channel][idx]); // cerr << data[i] << " "; ++i; } // cerr << endl; return data; } vector<vector<float>> MockWaveModel::getMultiChannelData(int fromchannel, int tochannel, sv_frame_t start, sv_frame_t count) const { vector<vector<float>> data(tochannel - fromchannel + 1); for (int c = fromchannel; c <= tochannel; ++c) { data.push_back(getData(c, start, count)); } return data; } vector<float> MockWaveModel::generate(Sort sort, int length, int pad) const { vector<float> data; for (int i = 0; i < pad; ++i) { data.push_back(0.f); } for (int i = 0; i < length; ++i) { double v = 0.0; switch (sort) { case DC: v = 1.0; break; case Sine: v = sin((2.0 * M_PI / 8.0) * i); break; case Cosine: v = cos((2.0 * M_PI / 8.0) * i); break; case Nyquist: v = (i % 2) * 2 - 1; break; case Dirac: v = (i == 0) ? 1.0 : 0.0; break; } data.push_back(float(v)); } for (int i = 0; i < pad; ++i) { data.push_back(0.f); } return data; }