Mercurial > hg > svcore
view data/model/AggregateWaveModel.h @ 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 | 4d9816ba0ebe |
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 2007 QMUL. 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. */ #ifndef _AGGREGATE_WAVE_MODEL_H_ #define _AGGREGATE_WAVE_MODEL_H_ #include "RangeSummarisableTimeValueModel.h" #include "PowerOfSqrtTwoZoomConstraint.h" #include <vector> class AggregateWaveModel : public RangeSummarisableTimeValueModel { Q_OBJECT public: struct ModelChannelSpec { ModelChannelSpec(RangeSummarisableTimeValueModel *m, int c) : model(m), channel(c) { } RangeSummarisableTimeValueModel *model; int channel; }; typedef std::vector<ModelChannelSpec> ChannelSpecList; AggregateWaveModel(ChannelSpecList channelSpecs); ~AggregateWaveModel(); bool isOK() const; bool isReady(int *) const; QString getTypeName() const { return tr("Aggregate Wave"); } int getComponentCount() const; ModelChannelSpec getComponent(int c) const; const ZoomConstraint *getZoomConstraint() const { return &m_zoomConstraint; } sv_frame_t getFrameCount() const; int getChannelCount() const; sv_samplerate_t getSampleRate() const; float getValueMinimum() const { return -1.0f; } float getValueMaximum() const { return 1.0f; } virtual sv_frame_t getStartFrame() const { return 0; } virtual sv_frame_t getEndFrame() const { return getFrameCount(); } virtual std::vector<float> getData(int channel, sv_frame_t start, sv_frame_t count) const; virtual std::vector<std::vector<float>> getMultiChannelData(int fromchannel, int tochannel, sv_frame_t start, sv_frame_t count) const; virtual int getSummaryBlockSize(int desired) const; virtual void getSummaries(int channel, sv_frame_t start, sv_frame_t count, RangeBlock &ranges, int &blockSize) const; virtual Range getSummary(int channel, sv_frame_t start, sv_frame_t count) const; virtual void toXml(QTextStream &out, QString indent = "", QString extraAttributes = "") const; signals: void modelChanged(); void modelChangedWithin(sv_frame_t, sv_frame_t); void completionChanged(); protected slots: void componentModelChanged(); void componentModelChangedWithin(sv_frame_t, sv_frame_t); void componentModelCompletionChanged(); protected: ChannelSpecList m_components; static PowerOfSqrtTwoZoomConstraint m_zoomConstraint; }; #endif