comparison data/model/ImageModel.h @ 1126:39019ce29178 tony-2.0-integration

Merge through to branch for Tony 2.0
author Chris Cannam
date Thu, 20 Aug 2015 14:54:21 +0100
parents 1517d4c60e88
children 48e9f538e6e9
comparison
equal deleted inserted replaced
1119:e22bfe8ca248 1126:39019ce29178
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