Only list computable plot columns if there are other numeric columns

girder · Sep 11, 2024 · ca2249d · ca2249d
1 parent e298ddb
commit ca2249d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## 1.29.10
+
+### Improvements
+
+- Only list computable plot columns if there are other numeric columns ([#1634](../../pull/1634))
+
 ## 1.29.9
 
 ### Bug Fixes

diff --git a/girder_annotation/girder_large_image_annotation/utils/__init__.py b/girder_annotation/girder_large_image_annotation/utils/__init__.py
@@ -1128,13 +1128,14 @@ def computeSelectorAxis(record, data, row):
             return computeSelectorAxis
 
         if not self._datacolumns:
-            for key in self.computeColumns:
-                title = self.commonColumns[key]
-                self._ensureColumn(
-                    columns, key, title, 'compute', computeGetData,
-                    computeSelector(key), computeLength)
-                columns[key]['count'] = 1
-                columns[key]['min'] = columns[key]['max'] = 0
+            if len([col for col in columns.values() if col['type'] == 'number']) >= 2:
+                for key in self.computeColumns:
+                    title = self.commonColumns[key]
+                    self._ensureColumn(
+                        columns, key, title, 'compute', computeGetData,
+                        computeSelector(key), computeLength)
+                    columns[key]['count'] = 1
+                    columns[key]['min'] = columns[key]['max'] = 0
             return 0
         if self._compute is None or not len(self._requiredColumns & self.computeColumns):
             return 0