histomicsui 1.6.1.dev34__tar.gz → 1.6.1.dev38__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: histomicsui
-Version: 1.6.1.dev34
+Version: 1.6.1.dev38
 Summary: Organize, visualize, and analyze histology images.
 Home-page: https://github.com/DigitalSlideArchive/histomicsui
 Author: Kitware, Inc.

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

@@ -63,32 +63,6 @@ wrap(ItemListWidget, 'render', function (render) {
     }
 
     HuiSettings.getSettings().then((settings) => {
-        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);
         }
@@ -100,3 +74,33 @@ wrap(ItemListWidget, 'render', function (render) {
         this.delegateEvents();
     }
 });
+
+HuiSettings.getSettings().then((settings) => {
+    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
+            };
+        }
+    };
+    return settings;
+});

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: histomicsui
-Version: 1.6.1.dev34
+Version: 1.6.1.dev38
 Summary: Organize, visualize, and analyze histology images.
 Home-page: https://github.com/DigitalSlideArchive/histomicsui
 Author: Kitware, Inc.

{histomicsui-1.6.1.dev34 → histomicsui-1.6.1.dev38}/tests/web_client_specs/annotationSpec.js

@@ -1506,7 +1506,11 @@ girderTest.promise.done(function () {
                     // remock Webgl
                     huiTest.app.bodyView.once('h:viewerWidgetCreated', function (viewerWidget) {
                         viewerWidget.once('g:beforeFirstRender', function () {
-                            window.geo.util.mockWebglRenderer();
+                            try {
+                                window.geo.util.mockWebglRenderer();
+                            } catch (err) {
+                                // if this is already mocked, do nothing.
+                            }
                         });
                     });
                     $el.click();

{histomicsui-1.6.1.dev34 → histomicsui-1.6.1.dev38}/tests/web_client_specs/girderUISpec.js

@@ -9,7 +9,11 @@ describe('itemList', function () {
         var GeojsViewer = window.girder.plugins.large_image.views.imageViewerWidget.geojs;
         window.girder.utilities.PluginUtils.wrap(GeojsViewer, 'initialize', function (initialize) {
             this.once('g:beforeFirstRender', function () {
-                window.geo.util.mockWebglRenderer();
+                try {
+                    window.geo.util.mockWebglRenderer();
+                } catch (err) {
+                    // if this is already mocked, do nothing.
+                }
             });
             initialize.apply(this, _.rest(arguments));
         });

{histomicsui-1.6.1.dev34 → histomicsui-1.6.1.dev38}/tests/web_client_specs/huiTest.js

@@ -49,7 +49,11 @@
         runs(function () {
             app.bodyView.once('h:viewerWidgetCreated', function (viewerWidget) {
                 viewerWidget.once('g:beforeFirstRender', function () {
-                    window.geo.util.mockWebglRenderer();
+                    try {
+                        window.geo.util.mockWebglRenderer();
+                    } catch (err) {
+                        // if this is already mocked, do nothing.
+                    }
                 });
             });
             $('.h-open-image').click();

{histomicsui-1.6.1.dev34 → histomicsui-1.6.1.dev38}/tests/web_client_specs/itemSpec.js

@@ -58,7 +58,11 @@ describe('Test the HistomicsUI itemUI screen', function () {
         var GeojsViewer = window.girder.plugins.large_image.views.imageViewerWidget.geojs;
         window.girder.utilities.PluginUtils.wrap(GeojsViewer, 'initialize', function (initialize) {
             this.once('g:beforeFirstRender', function () {
-                window.geo.util.mockWebglRenderer();
+                try {
+                    window.geo.util.mockWebglRenderer();
+                } catch (err) {
+                    // if this is already mocked, do nothing.
+                }
             });
             initialize.apply(this, _.rest(arguments));
         });