Merge pull request #405 from DigitalSlideArchive/update-plottable

Update plottable data to match changes in large_image.

Author: manthey

histomicsui/web_client/panels/MetadataPlot.js

@@ -156,12 +156,12 @@ var MetadataPlot = Panel.extend({
                 requiredKeys.push(this.plotConfig[k]);
             }
         });
-        keys = keys.concat(['_0_item.name', '_2_item.id', '_bbox.x0', '_bbox.y0', '_bbox.x1', '_bbox.y1']);
+        keys = keys.concat(['item.name', 'item.id', 'bbox.x0', 'bbox.y0', 'bbox.x1', 'bbox.y1']);
         if (this._currentAnnotations && this._currentAnnotations.length > 1) {
-            keys = keys.concat(['_1_annotation.name']);
+            keys = keys.concat(['annotation.name']);
         }
         if (this._currentAnnotations && this._currentAnnotations.length >= 1) {
-            keys = keys.concat(['_3_annotation.id', '_5_annotationelement.id']);
+            keys = keys.concat(['annotation.id', 'annotationelement.id']);
         }
         const fetch = {
             adjacentItems: !!this.plotConfig.folder,
@@ -250,7 +250,7 @@ var MetadataPlot = Panel.extend({
             }
             return;
         }
-        if (plotData.colDict['_3_annotation.id'] === undefined || plotData.colDict['_5_annotationelement.id'] === undefined) {
+        if (plotData.colDict['annotation.id'] === undefined || plotData.colDict['annotationelement.id'] === undefined) {
             return;
         }
         // evt is undefined when the selection is cleared
@@ -263,8 +263,8 @@ var MetadataPlot = Panel.extend({
         const elements = [];
         evt.points.forEach((pt) => {
             const row = plotData.data[pt.pointIndex];
-            const annotid = row[plotData.colDict['_3_annotation.id'].index];
-            const elid = row[plotData.colDict['_5_annotationelement.id'].index];
+            const annotid = row[plotData.colDict['annotation.id'].index];
+            const elid = row[plotData.colDict['annotationelement.id'].index];
             if (annotid === undefined || elid === undefined) {
                 return;
             }
@@ -286,14 +286,14 @@ var MetadataPlot = Panel.extend({
     },
 
     onElementSelect: function (elements) {
-        if (!this.lastPlotData || !this.lastPlotData.colDict['_5_annotationelement.id'] || !elements.models) {
+        if (!this.lastPlotData || !this.lastPlotData.colDict['annotationelement.id'] || !elements.models) {
             return;
         }
         const ids = {};
         elements.models.forEach((el) => {
             ids[el.id] = true;
         });
-        const colidx = this.lastPlotData.colDict['_5_annotationelement.id'].index;
+        const colidx = this.lastPlotData.colDict['annotationelement.id'].index;
         const points = this.lastPlotData.data.map((row, idx) => ids[row[colidx]] ? idx : null).filter((idx) => idx !== null);
         if (!points.length) {
             return;
@@ -335,12 +335,12 @@ var MetadataPlot = Panel.extend({
     _hoverText: function (d, plotData) {
         const used = {};
         let parts = [];
-        let key = '_0_item.name';
+        let key = 'item.name';
         if (plotData.adjacentItems && plotData.colDict[key] && d[plotData.colDict[key].index] !== undefined && plotData.colDict[key].distinctcount !== 1) {
             used[key] = true;
             parts.push(plotData.colDict[key]);
         }
-        key = '_1_annotation.name';
+        key = 'annotation.name';
         if (plotData.colDict[key] && d[plotData.colDict[key].index] !== undefined) {
             used[key] = true;
             parts.push(plotData.colDict[key]);
@@ -354,11 +354,11 @@ var MetadataPlot = Panel.extend({
         parts = parts.map((col) => `${col.title}: ${col.type === 'number' ? this._formatNumber(d[col.index]) : d[col.index]}`);
 
         const imageDict = {
-            id: '_2_item.id',
-            left: '_bbox.x0',
-            top: '_bbox.y0',
-            right: '_bbox.x1',
-            bottom: '_bbox.y1'
+            id: 'item.id',
+            left: 'bbox.x0',
+            top: 'bbox.y0',
+            right: 'bbox.x1',
+            bottom: 'bbox.y1'
         };
         if (Object.values(imageDict).every((v) => plotData.colDict[v] && d[plotData.colDict[v].index] !== undefined)) {
             d.image = {};

histomicsui/web_client/templates/dialogs/metadataPlot.pug

@@ -22,6 +22,10 @@
             {key: 'r', label: 'Radius'},
             {key: 'c', label: 'Color'},
             {key: 's', label: 'Symbol', string: true, comment: 'Grouping for violin plots'}]
+        -
+          var numNumbers = 0;
+          var numIndex = [];
+          plotOptions.forEach((po, idx) => { numIndex.push(numNumbers);  if (po.type === 'number') { numNumbers += 1; }});
         for series, seriesidx in seriesList
           .form-group
             label(for='h-plot-series-' + series.key) #{series.label}
@@ -33,7 +37,7 @@
               each opt, optidx in plotOptions
                 if (!series.number || opt.type === 'number') && (!series.string || opt.type === 'string' || opt.distinct)
                   - var selected = plotConfig[series.key] === opt.key
-                  - if (plotConfig[series.key] === undefined && series.number === true && optidx === seriesidx) { selected = true; }
+                  - if (plotConfig[series.key] === undefined && series.number === true && numIndex[optidx] === seriesidx) { selected = true; }
                   option(value=opt.key, selected=selected) #{opt.title}
         .form-group
           label(for='h-plot-folder')

setup.py

@@ -42,7 +42,7 @@ def prerelease_local_scheme(version):
         'Programming Language :: Python :: 3.12',
     ],
     install_requires=[
-        'girder-large-image-annotation>=1.29.2',
+        'girder-large-image-annotation>=1.29.4',
         'girder-slicer-cli-web[girder]>=1.4.0',
         'cachetools',
         'orjson',

tests/web_client_specs/metadataPlotSpec.js

@@ -103,11 +103,11 @@ girderTest.promise.done(function () {
                     return $('#h-plot-series-x').length;
                 }, 'dialog controls to exist');
                 runs(function () {
-                    $('#h-plot-series-x').val('gloms.pas.item');
-                    $('#h-plot-series-y').val('gloms.area.item');
-                    $('#h-plot-series-r').val('gloms.aspect.item');
-                    $('#h-plot-series-c').val('gloms.label.item');
-                    $('#h-plot-series-s').val('_0_item.name');
+                    $('#h-plot-series-x').val('data.gloms.0.pas');
+                    $('#h-plot-series-y').val('data.gloms.0.area');
+                    $('#h-plot-series-r').val('data.gloms.0.aspect');
+                    $('#h-plot-series-c').val('data.gloms.0.label');
+                    $('#h-plot-series-s').val('item.name');
                     $('.h-submit').click();
                 });
                 girderTest.waitForLoad();
@@ -130,8 +130,8 @@ girderTest.promise.done(function () {
                 girderTest.waitForDialog();
                 runs(function () {
                     // switch some other options, too.
-                    $('#h-plot-series-r').val('gloms.label.item');
-                    $('#h-plot-series-c').val('gloms.average.item');
+                    $('#h-plot-series-r').val('data.gloms.0.label');
+                    $('#h-plot-series-c').val('data.gloms.0.average');
                     $('#h-plot-folder').prop('checked', false);
                     $('.h-submit').click();
                 });