Mercurial > hg > svgui
view layer/SliceLayer.h @ 1127:9fb8dfd7ce4c 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 | 4fe7a09be0fe |
children | 4d0ca1ab4cd0 |
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 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 _SLICE_LAYER_H_ #define _SLICE_LAYER_H_ #include "SingleColourLayer.h" #include "base/Window.h" #include "data/model/DenseThreeDimensionalModel.h" #include <QColor> class SliceLayer : public SingleColourLayer { Q_OBJECT public: SliceLayer(); ~SliceLayer(); // virtual void setModel(const Model *model); // virtual const Model *getModel() const { return m_model; } virtual const Model *getModel() const { return 0; } void setSliceableModel(const Model *model); virtual void paint(LayerGeometryProvider *v, QPainter &paint, QRect rect) const; virtual QString getFeatureDescription(LayerGeometryProvider *v, QPoint &) const; virtual int getVerticalScaleWidth(LayerGeometryProvider *v, bool, QPainter &) const; virtual void paintVerticalScale(LayerGeometryProvider *v, bool, QPainter &paint, QRect rect) const; virtual ColourSignificance getLayerColourSignificance() const { return ColourAndBackgroundSignificant; } virtual PropertyList getProperties() const; virtual QString getPropertyLabel(const PropertyName &) const; virtual QString getPropertyIconName(const PropertyName &) const; virtual PropertyType getPropertyType(const PropertyName &) const; virtual QString getPropertyGroupName(const PropertyName &) const; virtual int getPropertyRangeAndValue(const PropertyName &, int *min, int *max, int *deflt) const; virtual QString getPropertyValueLabel(const PropertyName &, int value) const; virtual RangeMapper *getNewPropertyRangeMapper(const PropertyName &) const; virtual void setProperty(const PropertyName &, int value); virtual void setProperties(const QXmlAttributes &); virtual bool getValueExtents(double &min, double &max, bool &logarithmic, QString &unit) const; virtual bool hasTimeXAxis() const { return false; } virtual bool isLayerScrollable(const LayerGeometryProvider *) const { return false; } enum EnergyScale { LinearScale, MeterScale, dBScale, AbsoluteScale }; enum SamplingMode { NearestSample, SampleMean, SamplePeak }; enum PlotStyle { PlotLines, PlotSteps, PlotBlocks, PlotFilledBlocks }; enum BinScale { LinearBins, LogBins, InvertedLogBins }; void setFillColourMap(int); int getFillColourMap() const { return m_colourMap; } void setEnergyScale(EnergyScale); EnergyScale getEnergyScale() const { return m_energyScale; } void setSamplingMode(SamplingMode); SamplingMode getSamplingMode() const { return m_samplingMode; } void setPlotStyle(PlotStyle style); PlotStyle getPlotStyle() const { return m_plotStyle; } void setBinScale(BinScale scale); BinScale getBinScale() const { return m_binScale; } void setThreshold(float); float getThreshold() const { return m_threshold; } void setGain(float gain); float getGain() const; void setNormalize(bool n); bool getNormalize() const; virtual void toXml(QTextStream &stream, QString indent = "", QString extraAttributes = "") const; public slots: void sliceableModelReplaced(const Model *, const Model *); void modelAboutToBeDeleted(Model *); protected: virtual double getXForBin(int bin, int totalBins, double w) const; virtual int getBinForX(double x, int totalBins, double w) const; virtual double getYForValue(double value, const LayerGeometryProvider *v, double &norm) const; virtual double getValueForY(double y, const LayerGeometryProvider *v) const; virtual QString getFeatureDescriptionAux(LayerGeometryProvider *v, QPoint &, bool includeBinDescription, int &minbin, int &maxbin, int &range) const; // This curve may, of course, be flat -- the spectrum uses it for // normalizing the fft results by the fft size (with 1/(fftsize/2) // in each bin). typedef std::vector<float> BiasCurve; virtual void getBiasCurve(BiasCurve &) const { return; } virtual float getThresholdDb() const; virtual int getDefaultColourHint(bool dark, bool &impose); const DenseThreeDimensionalModel *m_sliceableModel; int m_colourMap; EnergyScale m_energyScale; SamplingMode m_samplingMode; PlotStyle m_plotStyle; BinScale m_binScale; bool m_normalize; float m_threshold; float m_initialThreshold; float m_gain; mutable std::vector<int> m_scalePoints; mutable std::map<const LayerGeometryProvider *, int> m_xorigins; mutable std::map<const LayerGeometryProvider *, int> m_yorigins; mutable std::map<const LayerGeometryProvider *, int> m_heights; mutable sv_frame_t m_currentf0; mutable sv_frame_t m_currentf1; mutable std::vector<float> m_values; }; #endif