Mercurial > hg > svgui
view layer/Colour3DPlotLayer.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 | d930ff725f64 |
children | dd3901fe8623 |
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 and 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 COLOUR_3D_PLOT_LAYER_H #define COLOUR_3D_PLOT_LAYER_H #include "SliceableLayer.h" #include "VerticalBinLayer.h" #include "ColourScale.h" #include "Colour3DPlotRenderer.h" #include "data/model/DenseThreeDimensionalModel.h" class View; class QPainter; class QImage; /** * This is a view that displays dense 3-D data (time, some sort of * binned y-axis range, value) as a colour plot with value mapped to * colour range. Its source is a DenseThreeDimensionalModel. * * This was the original implementation for the spectrogram view, but * it was replaced for that purpose with a more efficient * implementation that derived the spectrogram itself from a * DenseTimeValueModel instead of using a three-dimensional model. */ class Colour3DPlotLayer : public VerticalBinLayer { Q_OBJECT public: Colour3DPlotLayer(); ~Colour3DPlotLayer(); virtual const ZoomConstraint *getZoomConstraint() const { return m_model ? m_model->getZoomConstraint() : 0; } virtual const Model *getModel() const { return m_model; } virtual void paint(LayerGeometryProvider *v, QPainter &paint, QRect rect) const; virtual void setSynchronousPainting(bool synchronous); virtual int getVerticalScaleWidth(LayerGeometryProvider *v, bool, QPainter &) const; virtual void paintVerticalScale(LayerGeometryProvider *v, bool, QPainter &paint, QRect rect) const; virtual QString getFeatureDescription(LayerGeometryProvider *v, QPoint &) const; virtual bool snapToFeatureFrame(LayerGeometryProvider *v, sv_frame_t &frame, int &resolution, SnapType snap) const; virtual void setLayerDormant(const LayerGeometryProvider *v, bool dormant); virtual bool isLayerScrollable(const LayerGeometryProvider *v) const; virtual ColourSignificance getLayerColourSignificance() const { return ColourHasMeaningfulValue; } void setModel(const DenseThreeDimensionalModel *model); virtual int getCompletion(LayerGeometryProvider *) const { return m_model->getCompletion(); } virtual PropertyList getProperties() const; virtual PropertyType getPropertyType(const PropertyName &) const; virtual QString getPropertyLabel(const PropertyName &) const; virtual QString getPropertyIconName(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 QString getPropertyValueIconName(const PropertyName &, int value) const; virtual RangeMapper *getNewPropertyRangeMapper(const PropertyName &) const; virtual void setProperty(const PropertyName &, int value); virtual void setProperties(const QXmlAttributes &); void setColourScale(ColourScaleType); ColourScaleType getColourScale() const { return m_colourScale; } void setColourMap(int map); int getColourMap() const; /** * Set the gain multiplier for sample values in this view. * The default is 1.0. */ void setGain(float gain); float getGain() const; /** * Specify the scale for the y axis. */ void setBinScale(BinScale); BinScale getBinScale() const; /** * Specify the normalization mode for individual columns. */ void setNormalization(ColumnNormalization); ColumnNormalization getNormalization() const; /** * Specify whether to normalize the visible area. */ void setNormalizeVisibleArea(bool); bool getNormalizeVisibleArea() const; void setInvertVertical(bool i); bool getInvertVertical() const; void setOpaque(bool i); bool getOpaque() const; void setSmooth(bool i); bool getSmooth() const; virtual bool getValueExtents(double &min, double &max, bool &logarithmic, QString &unit) const; virtual bool getDisplayExtents(double &min, double &max) const; virtual bool setDisplayExtents(double min, double max); virtual bool getYScaleValue(const LayerGeometryProvider *, int /* y */, double &/* value */, QString &/* unit */) const; virtual int getVerticalZoomSteps(int &defaultStep) const; virtual int getCurrentVerticalZoomStep() const; virtual void setVerticalZoomStep(int); virtual RangeMapper *getNewVerticalZoomRangeMapper() const; virtual const Model *getSliceableModel() const { return m_model; } virtual void toXml(QTextStream &stream, QString indent = "", QString extraAttributes = "") const; protected slots: void cacheInvalid(); void cacheInvalid(sv_frame_t startFrame, sv_frame_t endFrame); void modelChanged(); void modelChangedWithin(sv_frame_t, sv_frame_t); protected: const DenseThreeDimensionalModel *m_model; // I do not own this ColourScaleType m_colourScale; bool m_colourScaleSet; int m_colourMap; float m_gain; BinScale m_binScale; ColumnNormalization m_normalization; // of individual columns bool m_normalizeVisibleArea; bool m_invertVertical; bool m_opaque; bool m_smooth; int m_peakResolution; // Minimum and maximum bin numbers visible within the view. We // always snap to whole bins at view edges. int m_miny; int m_maxy; bool m_synchronous; static ColourScaleType convertToColourScale(int value); static int convertFromColourScale(ColourScaleType); static std::pair<ColumnNormalization, bool> convertToColumnNorm(int value); static int convertFromColumnNorm(ColumnNormalization norm, bool visible); mutable Dense3DModelPeakCache *m_peakCache; const int m_peakCacheDivisor; Dense3DModelPeakCache *getPeakCache() const; typedef std::map<int, MagnitudeRange> ViewMagMap; // key is view id mutable ViewMagMap m_viewMags; typedef std::map<int, Colour3DPlotRenderer *> ViewRendererMap; // key is view id mutable ViewRendererMap m_renderers; Colour3DPlotRenderer *getRenderer(const LayerGeometryProvider *) const; void invalidateRenderers(); /** * Return the y coordinate at which the given bin "starts" * (i.e. at the bottom of the bin, if the given bin is an integer * and the vertical scale is the usual way up). Bin number may be * fractional, to obtain a position part-way through a bin. */ double getYForBin(const LayerGeometryProvider *, double bin) const; /** * Return the bin number, possibly fractional, at the given y * coordinate. Note that the whole numbers occur at the positions * at which the bins "start" (i.e. the bottom of the visible bin, * if the vertical scale is the usual way up). */ double getBinForY(const LayerGeometryProvider *, double y) const; DenseThreeDimensionalModel::Column getColumn(int col) const; int getColourScaleWidth(QPainter &) const; void paintWithRenderer(LayerGeometryProvider *v, QPainter &paint, QRect rect) const; }; #endif