comparison data/model/ImageModel.h @ 1057:5c5d4863b428 tonioni

Merge from cxx11 branch

             .arg(encodeEntities(image))
             .arg(encodeEntities(label))
             .arg(extraAttributes);
     }
 
-    QString toDelimitedDataString(QString delimiter, int sampleRate) const
+    QString toDelimitedDataString(QString delimiter, sv_samplerate_t sampleRate) const
     {
         QStringList list;
         list << RealTime::frame2RealTime(frame, sampleRate).toString().c_str();
         list << image;
         if (label != "") list << label;

 class ImageModel : public SparseModel<ImagePoint>
 {
     Q_OBJECT
 
 public:
-    ImageModel(int sampleRate, int resolution, bool notifyOnAdd = true) :
+    ImageModel(sv_samplerate_t sampleRate, int resolution, bool notifyOnAdd = true) :
 	SparseModel<ImagePoint>(sampleRate, resolution, notifyOnAdd)
     { }
 
     QString getTypeName() const { return tr("Image"); }