histomicsui 1.6.1.dev30__tar.gz → 1.6.1.dev34__tar.gz

{histomicsui-1.6.1.dev30 → histomicsui-1.6.1.dev34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: histomicsui
-Version: 1.6.1.dev30
+Version: 1.6.1.dev34
 Summary: Organize, visualize, and analyze histology images.
 Home-page: https://github.com/DigitalSlideArchive/histomicsui
 Author: Kitware, Inc.
@@ -20,7 +20,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: NOTICE
-Requires-Dist: girder-large-image-annotation>=1.29.10
+Requires-Dist: girder-large-image-annotation>=1.30.1
 Requires-Dist: girder-slicer-cli-web[girder]>=1.4.0
 Requires-Dist: cachetools
 Requires-Dist: orjson

{histomicsui-1.6.1.dev30 → histomicsui-1.6.1.dev34}/histomicsui/rest/system.py

@@ -17,6 +17,7 @@
 import datetime
 import os
 
+from girder import logger
 from girder.api import access
 from girder.api.describe import Description, autoDescribeRoute, describeRoute
 from girder.api.rest import RestException, boundHandler, filtermodel
@@ -458,5 +459,12 @@ def getMultipleResourcePaths(self, resources):
         model = ModelImporter.model(kind)
         for id in resources[kind]:
             doc = model.load(id=id, user=user, level=AccessType.READ)
-            results[kind][id] = path_util.getResourcePath(kind, doc, user=user)
+            if doc is None:
+                logger.info(f'Failed to load {kind} {id}')
+                continue
+            try:
+                results[kind][id] = path_util.getResourcePath(kind, doc, user=user)
+            except Exception:
+                logger.info(f'Failed to resolve path for {kind} {id} {doc}')
+                continue
     return results

{histomicsui-1.6.1.dev30 → histomicsui-1.6.1.dev34}/histomicsui/web_client/views/itemList.js

@@ -4,7 +4,7 @@ import {wrap} from '@girder/core/utilities/PluginUtils';
 import {AccessType} from '@girder/core/constants';
 import {restRequest} from '@girder/core/rest';
 import events from '@girder/core/events';
-import ItemListWidget from '@girder/core/views/widgets/ItemListWidget';
+import ItemListWidget from '@girder/large_image/views/itemList';
 
 import {HuiSettings} from './utils';
 
@@ -63,17 +63,32 @@ wrap(ItemListWidget, 'render', function (render) {
     }
 
     HuiSettings.getSettings().then((settings) => {
-        const brandName = (settings['histomicsui.brand_name'] || '');
-        const webrootPath = (settings['histomicsui.webroot_path'] || '');
-        if (!this.$el.closest('.modal-dialog').length) {
-            for (let ix = 0; ix < this.collection.length; ix++) {
-                if (!this.$el.find('.g-item-list li.g-item-list-entry:eq(' + ix + ') .g-hui-open-link').length && this.collection.models[ix].attributes.largeImage) {
-                    this.$el.find('.g-item-list li.g-item-list-entry:eq(' + ix + ') a[class^=g-]:last').after(
-                        `<a class="g-hui-open-link" title="Open in ${brandName}" href="${webrootPath}#?image=${this.collection.models[ix].id}" target="_blank"><i class="icon-link-ext"></i></a>`
-                    );
+        const brandName = (settings['histomicsui.brand_name'] || 'HistomicsUI');
+        const webrootPath = (settings['histomicsui.webroot_path'] || 'histomics');
+
+        ItemListWidget.registeredApplications.histomicsui = {
+            name: brandName,
+            // icon:
+            check: (modelType, model) => {
+                if (modelType !== 'item' || !model.get('largeImage')) {
+                    return false;
+                }
+                const li = model.get('largeImage');
+                if (!li.fileId || li.expected === true) {
+                    return false;
                 }
+                let priority = 0;
+                try {
+                    if (model.get('meta') && model.get('meta').dicom && model.get('meta').dicom.Modality && model.get('meta').dicom.Modality !== 'SM') {
+                        priority = 1;
+                    }
+                } catch (e) {}
+                return {
+                    url: `${webrootPath}#?image=${model.id}`,
+                    priority: priority
+                };
             }
-        }
+        };
         if (this.accessLevel >= AccessType.WRITE) {
             adjustView.call(this, settings);
         }

{histomicsui-1.6.1.dev30 → histomicsui-1.6.1.dev34}/histomicsui.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: histomicsui
-Version: 1.6.1.dev30
+Version: 1.6.1.dev34
 Summary: Organize, visualize, and analyze histology images.
 Home-page: https://github.com/DigitalSlideArchive/histomicsui
 Author: Kitware, Inc.
@@ -20,7 +20,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: NOTICE
-Requires-Dist: girder-large-image-annotation>=1.29.10
+Requires-Dist: girder-large-image-annotation>=1.30.1
 Requires-Dist: girder-slicer-cli-web[girder]>=1.4.0
 Requires-Dist: cachetools
 Requires-Dist: orjson

{histomicsui-1.6.1.dev30 → histomicsui-1.6.1.dev34}/histomicsui.egg-info/requires.txt

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

{histomicsui-1.6.1.dev30 → histomicsui-1.6.1.dev34}/setup.py

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