changeset 1549:2fec0d9bd7ac zoom

Merge from default branch
author Chris Cannam
date Fri, 05 Oct 2018 10:25:25 +0100
parents 32400727bcbd (current diff) 51d6551d5244 (diff)
children 4de4284d0596 5f9c9d8c3de6
files
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/data/model/DenseThreeDimensionalModel.h	Mon Oct 01 15:48:02 2018 +0100
+++ b/data/model/DenseThreeDimensionalModel.h	Fri Oct 05 10:25:25 2018 +0100
@@ -137,7 +137,12 @@
         switch (column) {
         case 0: return tr("Time");
         case 1: return tr("Frame");
-        default: return getBinName(column - 2);
+        default:
+            QString name = getBinName(column - 2);
+            if (name == "") {
+                name = tr("(bin %1)").arg(column - 2);
+            }
+            return name;
         }
     }