comparison layer/SpectrumLayer.h @ 905:b66fb15de477 cxx11

Working through the float/double and int/sv_frame_t fixes
author Chris Cannam
date Mon, 09 Mar 2015 14:35:21 +0000
parents 1d526ba11a24
children 94e4952a6774
comparison
equal deleted inserted replaced
904:e0f08e108064 905:b66fb15de477
62 int value) const; 62 int value) const;
63 virtual RangeMapper *getNewPropertyRangeMapper(const PropertyName &) const; 63 virtual RangeMapper *getNewPropertyRangeMapper(const PropertyName &) const;
64 virtual void setProperty(const PropertyName &, int value); 64 virtual void setProperty(const PropertyName &, int value);
65 virtual void setProperties(const QXmlAttributes &); 65 virtual void setProperties(const QXmlAttributes &);
66 66
67 virtual bool getValueExtents(float &min, float &max, 67 virtual bool getValueExtents(double &min, double &max,
68 bool &logarithmic, QString &unit) const; 68 bool &logarithmic, QString &unit) const;
69 69
70 virtual bool getXScaleValue(const View *v, int x, 70 virtual bool getXScaleValue(const View *v, int x,
71 float &value, QString &unit) const; 71 double &value, QString &unit) const;
72 72
73 virtual bool getYScaleValue(const View *, int y, 73 virtual bool getYScaleValue(const View *, int y,
74 float &value, QString &unit) const; 74 double &value, QString &unit) const;
75 75
76 virtual bool getYScaleDifference(const View *, int y0, int y1, 76 virtual bool getYScaleDifference(const View *, int y0, int y1,
77 float &diff, QString &unit) const; 77 double &diff, QString &unit) const;
78 78
79 virtual bool isLayerScrollable(const View *) const { return false; } 79 virtual bool isLayerScrollable(const View *) const { return false; }
80 80
81 void setChannel(int); 81 void setChannel(int);
82 int getChannel() const { return m_channel; } 82 int getChannel() const { return m_channel; }
121 void setupFFT(); 121 void setupFFT();
122 122
123 virtual void getBiasCurve(BiasCurve &) const; 123 virtual void getBiasCurve(BiasCurve &) const;
124 BiasCurve m_biasCurve; 124 BiasCurve m_biasCurve;
125 125
126 virtual float getXForBin(int bin, int totalBins, float w) const; 126 virtual double getXForBin(int bin, int totalBins, double w) const;
127 virtual int getBinForX(float x, int totalBins, float w) const; 127 virtual int getBinForX(double x, int totalBins, double w) const;
128 128
129 float getFrequencyForX(float x, float w) const; 129 double getFrequencyForX(double x, double w) const;
130 float getXForFrequency(float freq, float w) const; 130 double getXForFrequency(double freq, double w) const;
131 131
132 int getWindowIncrement() const { 132 int getWindowIncrement() const {
133 if (m_windowHopLevel == 0) return m_windowSize; 133 if (m_windowHopLevel == 0) return m_windowSize;
134 else if (m_windowHopLevel == 1) return (m_windowSize * 3) / 4; 134 else if (m_windowHopLevel == 1) return (m_windowSize * 3) / 4;
135 else return m_windowSize / (1 << (m_windowHopLevel - 1)); 135 else return m_windowSize / (1 << (m_windowHopLevel - 1));