comparison layer/SliceLayer.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 12ab113ca2b1
comparison
equal deleted inserted replaced
904:e0f08e108064 905:b66fb15de477
60 int value) const; 60 int value) const;
61 virtual RangeMapper *getNewPropertyRangeMapper(const PropertyName &) const; 61 virtual RangeMapper *getNewPropertyRangeMapper(const PropertyName &) const;
62 virtual void setProperty(const PropertyName &, int value); 62 virtual void setProperty(const PropertyName &, int value);
63 virtual void setProperties(const QXmlAttributes &); 63 virtual void setProperties(const QXmlAttributes &);
64 64
65 virtual bool getValueExtents(float &min, float &max, 65 virtual bool getValueExtents(double &min, double &max,
66 bool &logarithmic, QString &unit) const; 66 bool &logarithmic, QString &unit) const;
67 67
68 virtual bool hasTimeXAxis() const { return false; } 68 virtual bool hasTimeXAxis() const { return false; }
69 69
70 virtual bool isLayerScrollable(const View *) const { return false; } 70 virtual bool isLayerScrollable(const View *) const { return false; }
91 91
92 void setBinScale(BinScale scale); 92 void setBinScale(BinScale scale);
93 BinScale getBinScale() const { return m_binScale; } 93 BinScale getBinScale() const { return m_binScale; }
94 94
95 void setThreshold(float); 95 void setThreshold(float);
96 int getThreshold() const { return m_threshold; } 96 float getThreshold() const { return m_threshold; }
97 97
98 void setGain(float gain); 98 void setGain(float gain);
99 float getGain() const; 99 float getGain() const;
100 100
101 void setNormalize(bool n); 101 void setNormalize(bool n);
107 public slots: 107 public slots:
108 void sliceableModelReplaced(const Model *, const Model *); 108 void sliceableModelReplaced(const Model *, const Model *);
109 void modelAboutToBeDeleted(Model *); 109 void modelAboutToBeDeleted(Model *);
110 110
111 protected: 111 protected:
112 virtual float getXForBin(int bin, int totalBins, float w) const; 112 virtual double getXForBin(int bin, int totalBins, double w) const;
113 virtual int getBinForX(float x, int totalBins, float w) const; 113 virtual int getBinForX(double x, int totalBins, double w) const;
114 114
115 virtual float getYForValue(float value, const View *v, float &norm) const; 115 virtual double getYForValue(double value, const View *v, double &norm) const;
116 virtual float getValueForY(float y, const View *v) const; 116 virtual double getValueForY(double y, const View *v) const;
117 117
118 virtual QString getFeatureDescriptionAux(View *v, QPoint &, 118 virtual QString getFeatureDescriptionAux(View *v, QPoint &,
119 bool includeBinDescription, 119 bool includeBinDescription,
120 int &minbin, int &maxbin, 120 int &minbin, int &maxbin,
121 int &range) const; 121 int &range) const;