# HG changeset patch
# User Chris Cannam
# Date 1538731525 -3600
# Node ID 2fec0d9bd7ac1b4b6f0890b2dbe6ac090678632c
# Parent  32400727bcbd2f9b4de784541b5a4aecd9d538ab# Parent  51d6551d524410a742f95d4e3cafc512bcb6e9ac
Merge from default branch

diff -r 32400727bcbd -r 2fec0d9bd7ac data/model/DenseThreeDimensionalModel.h
--- 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;
         }
     }