comparison data/model/EditableDenseThreeDimensionalModel.h @ 1038:cc27f35aa75c cxx11

Introducing the signed 64-bit frame index type, and fixing build failures from inclusion of -Wconversion with -Werror. Not finished yet.
author Chris Cannam
date Tue, 03 Mar 2015 15:18:24 +0000
parents 59e7fe1b1003
children a1cd5abcb38b
comparison
equal deleted inserted replaced
1037:bf0e5944289b 1038:cc27f35aa75c
49 bool notifyOnAdd = true); 49 bool notifyOnAdd = true);
50 50
51 virtual bool isOK() const; 51 virtual bool isOK() const;
52 52
53 virtual int getSampleRate() const; 53 virtual int getSampleRate() const;
54 virtual int getStartFrame() const; 54 virtual sv_frame_t getStartFrame() const;
55 virtual int getEndFrame() const; 55 virtual sv_frame_t getEndFrame() const;
56 56
57 virtual Model *clone() const; 57 virtual Model *clone() const;
58 58
59 59
60 /** 60 /**
61 * Set the frame offset of the first column. 61 * Set the frame offset of the first column.
62 */ 62 */
63 virtual void setStartFrame(int); 63 virtual void setStartFrame(sv_frame_t);
64 64
65 /** 65 /**
66 * Return the number of sample frames covered by each set of bins. 66 * Return the number of sample frames covered by each set of bins.
67 */ 67 */
68 virtual int getResolution() const; 68 virtual int getResolution() const;
188 virtual int getCompletion() const { return m_completion; } 188 virtual int getCompletion() const { return m_completion; }
189 189
190 QString getTypeName() const { return tr("Editable Dense 3-D"); } 190 QString getTypeName() const { return tr("Editable Dense 3-D"); }
191 191
192 virtual QString toDelimitedDataString(QString delimiter) const; 192 virtual QString toDelimitedDataString(QString delimiter) const;
193 virtual QString toDelimitedDataStringSubset(QString delimiter, int f0, int f1) const; 193 virtual QString toDelimitedDataStringSubset(QString delimiter, sv_frame_t f0, sv_frame_t f1) const;
194 194
195 virtual void toXml(QTextStream &out, 195 virtual void toXml(QTextStream &out,
196 QString indent = "", 196 QString indent = "",
197 QString extraAttributes = "") const; 197 QString extraAttributes = "") const;
198 198
214 214
215 std::vector<QString> m_binNames; 215 std::vector<QString> m_binNames;
216 std::vector<float> m_binValues; 216 std::vector<float> m_binValues;
217 QString m_binValueUnit; 217 QString m_binValueUnit;
218 218
219 int m_startFrame; 219 sv_frame_t m_startFrame;
220 int m_sampleRate; 220 int m_sampleRate;
221 int m_resolution; 221 int m_resolution;
222 int m_yBinCount; 222 int m_yBinCount;
223 CompressionType m_compression; 223 CompressionType m_compression;
224 float m_minimum; 224 float m_minimum;