diff data/model/SparseModel.h @ 1074:b792ea8243be

Merge

--- a/data/model/SparseModel.h	Thu May 21 16:38:07 2015 +0100
+++ b/data/model/SparseModel.h	Thu May 21 16:38:52 2015 +0100
@@ -153,18 +153,20 @@
                        QString extraAttributes = "") const;
 
     virtual QString toDelimitedDataString(QString delimiter) const {
-        return toDelimitedDataStringWithOptions(delimiter, DataExportDefaults);
+        return toDelimitedDataStringWithOptions
+            (delimiter, DataExportDefaults);
     }
 
     virtual QString toDelimitedDataStringWithOptions(QString delimiter,
                                                      DataExportOptions opts) const {
         return toDelimitedDataStringSubsetWithOptions
             (delimiter, opts,
-             std::min(getStartFrame(), sv_frame_t(0)), getEndFrame());
+             std::min(getStartFrame(), sv_frame_t(0)), getEndFrame() + 1);
     }
 
     virtual QString toDelimitedDataStringSubset(QString delimiter, sv_frame_t f0, sv_frame_t f1) const {
-        return toDelimitedDataStringSubsetWithOptions(delimiter, DataExportDefaults, f0, f1);
+        return toDelimitedDataStringSubsetWithOptions
+            (delimiter, DataExportDefaults, f0, f1);
     }
 
     virtual QString toDelimitedDataStringSubsetWithOptions(QString delimiter, DataExportOptions opts, sv_frame_t f0, sv_frame_t f1) const {