histomicsui 1.6.1.dev58__tar.gz → 1.6.1.dev62__tar.gz

{histomicsui-1.6.1.dev58 → histomicsui-1.6.1.dev62}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: histomicsui
-Version: 1.6.1.dev58
+Version: 1.6.1.dev62
 Summary: Organize, visualize, and analyze histology images.
 Home-page: https://github.com/DigitalSlideArchive/histomicsui
 Author: Kitware, Inc.
@@ -21,11 +21,23 @@ Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: NOTICE
-Requires-Dist: girder-large-image-annotation>=1.30.1
+Requires-Dist: girder-large-image-annotation>=1.31.0
 Requires-Dist: girder-slicer-cli-web[girder]>=1.4.0
 Requires-Dist: cachetools
 Requires-Dist: orjson
 Provides-Extra: analysis
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 ===========
 HistomicsUI

{histomicsui-1.6.1.dev58 → histomicsui-1.6.1.dev62}/histomicsui/web_client/panels/FrameSelectorWidget.js

@@ -1,7 +1,14 @@
 import _ from 'underscore';
+import Vue from 'vue';
 
+import {restRequest} from '@girder/core/rest';
 import Panel from '@girder/slicer_cli_web/views/Panel';
-import FrameSelector from '@girder/large_image/vue/components/FrameSelector.vue';
+import FrameSelector from '@girder/large_image/widgets/FrameSelector.vue';
+import DualInput from '@girder/large_image/widgets/DualInput.vue';
+import CompositeLayers from '@girder/large_image/widgets/CompositeLayers.vue';
+import HistogramEditor from '@girder/large_image/widgets/HistogramEditor.vue';
+import PresetsMenu from '@girder/large_image/vue/components/PresetsMenu.vue';
+import colors from '@girder/large_image/widgets/colors.json';
 
 import frameSelectorWidget from '../templates/panels/frameSelectorWidget.pug';
 import '../stylesheets/panels/frameSelectorWidget.styl';
@@ -23,14 +30,35 @@ var FrameSelectorWidget = Panel.extend({
             collapsed: this.$('.s-panel-content.collapse').length && !this.$('.s-panel-content').hasClass('in')
         }));
         const el = this.$('#vue-container').get(0);
-        const vm = new FrameSelector({
+        const getFrameHistogram = (params) => {
+            params = Object.assign({}, params);
+            restRequest({
+                type: 'GET',
+                url: 'item/' + this._itemId + '/tiles/histogram',
+                data: params
+            }).then((response) => {
+                const frameHistograms = this.vueApp._props.frameHistograms || {};
+                frameHistograms[params.frame] = response;
+                this.vueApp._props.frameHistograms = Object.assign({}, frameHistograms);
+                return undefined;
+            });
+        };
+        CompositeLayers.components = {HistogramEditor};
+        FrameSelector.components = {DualInput, CompositeLayers, HistogramEditor, PresetsMenu};
+        const Component = Vue.extend(FrameSelector);
+        const vm = new Component({
             el,
             propsData: {
+                currentFrame: 0,
                 itemId: this._itemId,
                 imageMetadata: this._tiles,
                 frameUpdate: (frame, style) => {
                     this.viewer.frameUpdate(frame, style);
-                }
+                },
+                liConfig: this._liConfig,
+                frameHistograms: undefined,
+                getFrameHistogram,
+                colors
             }
         });
         this.vueApp = vm;

{histomicsui-1.6.1.dev58 → histomicsui-1.6.1.dev62}/histomicsui/web_client/panels/MetadataPlot.js

@@ -564,13 +564,16 @@ var MetadataPlot = Panel.extend({
             };
             plotData.data.forEach((d) => {
                 const s = plotData.series.s && plotData.series.s.distinct ? plotData.series.s.distinct.indexOf(d[plotData.series.s.index]) : 0;
+                if (!isFinite(d[plotData.series.y.index]) || (plotData.series.x && !isFinite(d[plotData.series.x.index])) || (plotData.series.r && plotData.series.r === 'number' && !isFinite(d[plotData.series.r.index])) || (plotData.series.c && plotData.series.c === 'number' && !isFinite(d[plotData.series.c.index]))) {
+                    return;
+                }
                 if (pv.dd[s] === undefined) {
                     pv.dd[s] = d;
                 }
                 if (plotData.series.x) {
-                    pv.xd[s].push(d[plotData.series.x.index]);
+                    pv.xd[s].push(+d[plotData.series.x.index]);
                 }
-                pv.yd[s].push(d[plotData.series.y.index]);
+                pv.yd[s].push(+d[plotData.series.y.index]);
                 if (plotData.series.c) {
                     pv.cd[s].push(d[plotData.series.c.index]);
                 }

{histomicsui-1.6.1.dev58 → histomicsui-1.6.1.dev62}/histomicsui/web_client/stylesheets/panels/frameSelectorWidget.styl

@@ -32,12 +32,20 @@
   .table-container td, .table-container th
     padding 0 5px 0 0
 
+  .table-row
+    height unset
+    vertical-align unset
+    border-bottom 1px solid #ddd !important
+
   td
     padding 2px
 
   .current-color, .color-col
     width 25px
 
+  .color-col
+    padding unset
+
   .enable-col
     width initial
 
@@ -83,6 +91,7 @@
 
     .canvas
       width calc(100% - 120px)
+      left 65px
 
     .percentage-input
       width unset
@@ -93,10 +102,24 @@
     .percentage-input:after
       left 42px
 
+  .auto-range-col
+    min-width unset
+    display inline-block
+
+  .switch
+    width 45px
+
+  .onoff-slider.checked:before
+    transform translateX(22px)
+
+  .expand-btn
+    font-size unset
+    font-weight unset
+
   .auto-range-label > .small-text
     display none
 
-  .auto-range-toggle
+  .auto-range-label
     min-width 60px
     display block
 

{histomicsui-1.6.1.dev58 → histomicsui-1.6.1.dev62}/histomicsui.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: histomicsui
-Version: 1.6.1.dev58
+Version: 1.6.1.dev62
 Summary: Organize, visualize, and analyze histology images.
 Home-page: https://github.com/DigitalSlideArchive/histomicsui
 Author: Kitware, Inc.
@@ -21,11 +21,23 @@ Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: NOTICE
-Requires-Dist: girder-large-image-annotation>=1.30.1
+Requires-Dist: girder-large-image-annotation>=1.31.0
 Requires-Dist: girder-slicer-cli-web[girder]>=1.4.0
 Requires-Dist: cachetools
 Requires-Dist: orjson
 Provides-Extra: analysis
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 ===========
 HistomicsUI

{histomicsui-1.6.1.dev58 → histomicsui-1.6.1.dev62}/histomicsui.egg-info/requires.txt

@@ -1,4 +1,4 @@
-girder-large-image-annotation>=1.30.1
+girder-large-image-annotation>=1.31.0
 girder-slicer-cli-web[girder]>=1.4.0
 cachetools
 orjson

{histomicsui-1.6.1.dev58 → histomicsui-1.6.1.dev62}/setup.py

@@ -43,7 +43,7 @@ setup(
         'Programming Language :: Python :: 3.13',
     ],
     install_requires=[
-        'girder-large-image-annotation>=1.30.1',
+        'girder-large-image-annotation>=1.31.0',
         'girder-slicer-cli-web[girder]>=1.4.0',
         'cachetools',
         'orjson',