diff data/model/Model.h @ 1126:39019ce29178 tony-2.0-integration

Merge through to branch for Tony 2.0

--- a/data/model/Model.h	Fri Aug 14 18:16:14 2015 +0100
+++ b/data/model/Model.h	Thu Aug 20 14:54:21 2015 +0100
@@ -24,8 +24,6 @@
 #include "base/BaseTypes.h"
 #include "base/DataExportOptions.h"
 
-typedef std::vector<float> SampleBlock;
-
 class ZoomConstraint;
 class AlignmentModel;
 
@@ -220,10 +218,12 @@
                        QString extraAttributes = "") const;
 
     virtual QString toDelimitedDataString(QString delimiter) const {
-        return toDelimitedDataStringSubset(delimiter, getStartFrame(), getEndFrame());
+        return toDelimitedDataStringSubset
+            (delimiter, getStartFrame(), getEndFrame() + 1);
     }
     virtual QString toDelimitedDataStringWithOptions(QString delimiter, DataExportOptions opts) const {
-        return toDelimitedDataStringSubsetWithOptions(delimiter, opts, getStartFrame(), getEndFrame());
+        return toDelimitedDataStringSubsetWithOptions
+            (delimiter, opts, getStartFrame(), getEndFrame() + 1);
     }
     virtual QString toDelimitedDataStringSubset(QString, sv_frame_t /* f0 */, sv_frame_t /* f1 */) const {
         return "";