histomicsui 1.7.3.dev10__tar.gz → 1.7.3.dev14__tar.gz

{histomicsui-1.7.3.dev10/histomicsui.egg-info → histomicsui-1.7.3.dev14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: histomicsui
-Version: 1.7.3.dev10
+Version: 1.7.3.dev14
 Summary: Organize, visualize, and analyze histology images.
 Home-page: https://github.com/DigitalSlideArchive/histomicsui
 Author: Kitware, Inc.

{histomicsui-1.7.3.dev10 → histomicsui-1.7.3.dev14}/histomicsui/__init__.py

@@ -14,6 +14,7 @@
 #  limitations under the License.
 #############################################################################
 
+import importlib.metadata
 import json
 import logging
 import os
@@ -39,7 +40,6 @@ from girder.utility import path as path_util
 from girder.utility import setting_utilities
 from girder.utility.model_importer import ModelImporter
 from girder.utility.webroot import Webroot
-from pkg_resources import DistributionNotFound, get_distribution
 
 from . import handlers, rest
 from .constants import PluginSettings
@@ -51,8 +51,8 @@ from .models.pathology import Pathology
 from .models.slide import Slide
 
 try:
-    __version__ = get_distribution(__name__).version
-except DistributionNotFound:
+    __version__ = importlib.metadata.version(__name__)
+except importlib.metadata.PackageNotFoundError:
     # package is not installed
     pass
 

{histomicsui-1.7.3.dev10 → histomicsui-1.7.3.dev14}/histomicsui/web_client/templates/layout/headerAnalyses.pug

@@ -1,6 +1,6 @@
-mixin analysisMenu(image, imageName, pos, maxRows)
+mixin analysisMenu(image, imageName, displayName, pos, maxRows)
   li.dropdown-submenu
-    a(tabindex='0', href='#', data-name=imageName) #{imageName}
+    a(tabindex='0', href='#', data-name=imageName) #{displayName}
     -
       let finalv = pos + Object.keys(image).length
       let posv = pos - (finalv > maxRows ? finalv - maxRows : 0)
@@ -27,7 +27,7 @@ a.h-analyses-dropdown-link(data-toggle='dropdown')
 -
   let depth = 0;
   let rows = maxRows;
-  let keyList = Object.keys(analyses).sort();
+  let keyList = Object.keys(keyMap).sort();
   let entries = keyList.length;
   if (entries > maxRows * maxRows * maxRows) {
     rows = Math.ceil(Math.pow(entries, 1./3));
@@ -62,9 +62,9 @@ ul.h-analyses-dropdown.dropdown-menu(role='menu')
               ul.dropdown-menu(row_offset=final0 > maxRows ? final0 - maxRows : 0)
                 for d0v, d0i in Array(end1 - start1)
                   -
-                    let imageName = keyList[start1 + d0i];
+                    let imageName = keyMap[keyList[start1 + d0i]];
                     let image = analyses[imageName];
-                  +analysisMenu(image, imageName, pos0, maxRows)
+                  +analysisMenu(image, imageName, keyList[start1 + d0i], pos0, maxRows)
                   - pos0 += 1
             - pos1 += 1
         - pos2 += 1
@@ -82,14 +82,16 @@ ul.h-analyses-dropdown.dropdown-menu(role='menu')
         ul.dropdown-menu(row_offset=final0 > maxRows ? final0 - maxRows : 0)
           for d0v, d0i in Array(end1 - start1)
             -
-              let imageName = keyList[start1 + d0i];
+              let imageName = keyMap[keyList[start1 + d0i]];
               let image = analyses[imageName];
-            +analysisMenu(image, imageName, pos0, maxRows)
+            +analysisMenu(image, imageName, keyList[start1 + d0i], pos0, maxRows)
             - pos0 += 1
       - pos1 += 1
   else
     - let pos0 = 0
-    each imageName in keyList
-      - let image = analyses[imageName];
-      +analysisMenu(image, imageName, pos0, maxRows)
+    each key in keyList
+      -
+        let imageName = keyMap[key];
+        let image = analyses[imageName];
+      +analysisMenu(image, imageName, key, pos0, maxRows)
       - pos0 += 1

{histomicsui-1.7.3.dev10 → histomicsui-1.7.3.dev14}/histomicsui/web_client/views/layout/HeaderAnalysesView.js

@@ -27,11 +27,22 @@ var HeaderUserView = View.extend({
             restRequest({
                 url: 'slicer_cli_web/docker_image'
             }).then((analyses) => {
+                const keyCount = {};
+                for (const key of Object.keys(analyses)) {
+                    const key2 = key.split('/').slice(-2).join('/');
+                    keyCount[key2] = (keyCount[key2] || 0) + 1;
+                }
+                const keyMap = {};
+                for (const key of Object.keys(analyses)) {
+                    const key2 = key.split('/').slice(-2).join('/');
+                    keyMap[keyCount[key2] === 1 ? key2 : key] = key;
+                }
                 const maxRows = Math.max(5, Math.floor((($('.h-image-view-body').height() || 0) - 8) / 26));
                 if (_.keys(analyses || {}).length > 0) {
                     this.$el.removeClass('hidden');
                     this.$el.html(headerAnalysesTemplate({
                         analyses: analyses || {},
+                        keyMap: keyMap,
                         maxRows: maxRows
                     }));
                     this.$('.h-analyses-dropdown-link').submenupicker();

{histomicsui-1.7.3.dev10 → histomicsui-1.7.3.dev14/histomicsui.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: histomicsui
-Version: 1.7.3.dev10
+Version: 1.7.3.dev14
 Summary: Organize, visualize, and analyze histology images.
 Home-page: https://github.com/DigitalSlideArchive/histomicsui
 Author: Kitware, Inc.