histomicsui 1.5.1.dev16__tar.gz → 1.5.1.dev20__tar.gz

{histomicsui-1.5.1.dev16 → histomicsui-1.5.1.dev20}/PKG-INFO

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

{histomicsui-1.5.1.dev16 → histomicsui-1.5.1.dev20}/histomicsui/__init__.py

@@ -232,6 +232,7 @@ SettingDefault.defaults.update({
     PluginSettings.HUI_HELP_URL,
     PluginSettings.HUI_HELP_TOOLTIP,
     PluginSettings.HUI_HELP_TEXT,
+    PluginSettings.HUI_LOGIN_TEXT,
 })
 def validateHistomicsUIHelp(doc):
     pass

{histomicsui-1.5.1.dev16 → histomicsui-1.5.1.dev20}/histomicsui/constants.py

@@ -19,4 +19,5 @@ class PluginSettings:
     HUI_HELP_URL = 'histomicsui.help_url'
     HUI_HELP_TOOLTIP = 'histomicsui.help_tooltip'
     HUI_HELP_TEXT = 'histomicsui.help_text'
+    HUI_LOGIN_TEXT = 'histomicsui.login_text'
     HUI_LOGIN_SESSION_EXPIRY_MINUTES = 'histomicsui.login_session_expiry_minutes'

{histomicsui-1.5.1.dev16 → histomicsui-1.5.1.dev20}/histomicsui/handlers.py

@@ -6,6 +6,7 @@ import time
 import cachetools
 import cherrypy
 import girder.utility
+import girder_large_image_annotation
 import large_image.config
 import orjson
 from girder import logger
@@ -157,7 +158,9 @@ def process_annotations(event):  # noqa
     if time.time() - startTime > 10:
         logger.info('Decoded json in %5.3fs', time.time() - startTime)
 
-    if not isinstance(data, list):
+    if not isinstance(data, list) or (
+            hasattr(girder_large_image_annotation.utils, 'isGeoJSON') and
+            girder_large_image_annotation.utilsisGeoJSON(data)):
         data = [data]
     # Check some of the early elements to see if there are any girderIds
     # that need resolution.

{histomicsui-1.5.1.dev16 → histomicsui-1.5.1.dev20}/histomicsui/rest/hui_resource.py

@@ -47,6 +47,7 @@ class HistomicsUIResource(Resource):
         keys = [
             PluginSettings.HUI_BRAND_NAME,
             PluginSettings.HUI_DEFAULT_DRAW_STYLES,
+            PluginSettings.HUI_LOGIN_TEXT,
             PluginSettings.HUI_PANEL_LAYOUT,
             PluginSettings.HUI_QUARANTINE_FOLDER,
             PluginSettings.HUI_WEBROOT_PATH,

{histomicsui-1.5.1.dev16 → histomicsui-1.5.1.dev20}/histomicsui/web_client/stylesheets/panels/frameSelectorWidget.styl

@@ -49,6 +49,14 @@
     overflow hidden
     padding 0
 
+  tr.dual-controls
+    td label[for="numberControl"]
+      max-width 100px
+      overflow hidden
+
+    td input[name="numberControl"]
+      margin-right 5px
+
   .picker-offset
     margin-right 50px
     right 0

{histomicsui-1.5.1.dev16 → histomicsui-1.5.1.dev20}/histomicsui/web_client/templates/body/configView.pug

@@ -45,7 +45,7 @@ form#g-hui-form(role="form")
       input#g-hui-help-text.form-control.input-sm(
           type="text", value=settings['histomicsui.help_text'],
           placeholder="The text to display with the help button",
-          title="The text for the optional help buttion in the application.")
+          title="The text for the optional help button in the application.")
       button#g-hui-help-default-text.form-control.input-sm(
           type="button", title="Default text") default
   .form-group
@@ -54,9 +54,16 @@ form#g-hui-form(role="form")
       input#g-hui-help-tooltip.form-control.input-sm(
           type="text", value=settings['histomicsui.help_tooltip'],
           placeholder="The text for the help button's tooltip",
-          title="The tooltip text for the optional help buttion in the application.")
+          title="The tooltip text for the optional help button in the application.")
       button#g-hui-help-default-tooltip.form-control.input-sm(
           type="button", title="Default tooltip") default
+  .form-group
+    label(for="g-hui-login-text") Login Text
+    #g-hui-login-text-container
+      input#g-hui-login-text.form-control.input-sm(
+          type="text", value=settings['histomicsui.login_text'],
+          placeholder="Login or email",
+          title="The text for the login prompt in the login dialog.")
   .form-group
     label
       | Default styles for drawing annotations

{histomicsui-1.5.1.dev16 → histomicsui-1.5.1.dev20}/histomicsui/web_client/views/body/ConfigView.js

@@ -36,6 +36,7 @@ var ConfigView = View.extend({
                     case 'histomicsui.help_url':
                     case 'histomicsui.help_tooltip':
                     case 'histomicsui.help_text':
+                    case 'histomicsui.login_text':
                         result.value = result.value === null || !result.value.trim() ? '' : result.value;
                         break;
                 }
@@ -90,7 +91,8 @@ var ConfigView = View.extend({
             'histomicsui.delete_annotations_after_ingest',
             'histomicsui.help_url',
             'histomicsui.help_tooltip',
-            'histomicsui.help_text'
+            'histomicsui.help_text',
+            'histomicsui.login_text'
         ];
         $.when(
             restRequest({

histomicsui-1.5.1.dev20/histomicsui/web_client/views/layout/LoginView.js

@@ -0,0 +1,16 @@
+import {wrap} from '@girder/core/utilities/PluginUtils';
+import LoginView from '@girder/core/views/layout/LoginView';
+
+import {HuiSettings} from '../utils';
+
+wrap(LoginView, 'render', function (render) {
+    render.call(this);
+    HuiSettings.getSettings().then((settings) => {
+        const loginText = (settings['histomicsui.login_text'] || '');
+        if (loginText) {
+            this.$('#g-login-form label[for="g-login"]').text(loginText);
+            console.log('HERE', loginText); // DWM::
+        }
+        return null;
+    });
+});

{histomicsui-1.5.1.dev16 → histomicsui-1.5.1.dev20}/histomicsui/web_client/views/layout/index.js

@@ -1,7 +1,9 @@
 import HeaderView from './HeaderView';
 import HeaderUserView from './HeaderUserView';
+import LoginView from './LoginView';
 
 export {
     HeaderView,
-    HeaderUserView
+    HeaderUserView,
+    LoginView
 };

{histomicsui-1.5.1.dev16 → histomicsui-1.5.1.dev20}/histomicsui.egg-info/PKG-INFO

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

{histomicsui-1.5.1.dev16 → histomicsui-1.5.1.dev20}/histomicsui.egg-info/SOURCES.txt

@@ -142,6 +142,7 @@ histomicsui/web_client/views/layout/HeaderAnalysesView.js
 histomicsui/web_client/views/layout/HeaderImageView.js
 histomicsui/web_client/views/layout/HeaderUserView.js
 histomicsui/web_client/views/layout/HeaderView.js
+histomicsui/web_client/views/layout/LoginView.js
 histomicsui/web_client/views/layout/index.js
 histomicsui/web_client/views/popover/AnnotationContextMenu.js
 histomicsui/web_client/views/popover/AnnotationPopover.js