# HG changeset patch
# User Chris Cannam
# Date 1432222732 -3600
# Node ID b792ea8243be7865170c39e9d958c1dc4d245518
# Parent  d4212687520eefc2d03e6d6675deae286ce87f76# Parent  882d448c8a6da6a92202efcf7d5c68551091267a
Merge

diff -r d4212687520e -r b792ea8243be data/model/Model.h
--- a/data/model/Model.h	Thu May 21 16:38:07 2015 +0100
+++ b/data/model/Model.h	Thu May 21 16:38:52 2015 +0100
@@ -220,10 +220,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 "";
diff -r d4212687520e -r b792ea8243be data/model/SparseModel.h
--- 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 {