Mercurial > hg > svcore
comparison data/model/ImageModel.h @ 1111:457a1a619c5f simple-fft-model
Merge from default branch
author | Chris Cannam |
---|---|
date | Wed, 07 Jan 2015 17:42:21 +0000 |
parents | 1517d4c60e88 |
children | 48e9f538e6e9 |
comparison
equal
deleted
inserted
replaced
1108:16574eea3229 | 1111:457a1a619c5f |
---|---|
29 */ | 29 */ |
30 | 30 |
31 struct ImagePoint : public XmlExportable | 31 struct ImagePoint : public XmlExportable |
32 { | 32 { |
33 public: | 33 public: |
34 ImagePoint(long _frame) : frame(_frame) { } | 34 ImagePoint(sv_frame_t _frame) : frame(_frame) { } |
35 ImagePoint(long _frame, QString _image, QString _label) : | 35 ImagePoint(sv_frame_t _frame, QString _image, QString _label) : |
36 frame(_frame), image(_image), label(_label) { } | 36 frame(_frame), image(_image), label(_label) { } |
37 | 37 |
38 int getDimensions() const { return 1; } | 38 int getDimensions() const { return 1; } |
39 | 39 |
40 long frame; | 40 sv_frame_t frame; |
41 QString image; | 41 QString image; |
42 QString label; | 42 QString label; |
43 | 43 |
44 QString getLabel() const { return label; } | 44 QString getLabel() const { return label; } |
45 | 45 |