histomicsui 1.7.2.dev6__tar.gz → 1.7.2.dev10__tar.gz

{histomicsui-1.7.2.dev6/histomicsui.egg-info → histomicsui-1.7.2.dev10}/PKG-INFO

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

{histomicsui-1.7.2.dev6 → histomicsui-1.7.2.dev10}/histomicsui/web_client/panels/AnnotationSelector.js

@@ -15,11 +15,6 @@ import showSaveAnnotationDialog from '../dialogs/saveAnnotation';
 import annotationSelectorWidget from '../templates/panels/annotationSelector.pug';
 import '../stylesheets/panels/annotationSelector.styl';
 
-// Too many elements in the draw panel will crash the browser,
-// so we only allow editing of annotations with less than this
-// many elements.
-const MAX_ELEMENTS_LIST_LENGTH = 5000;
-
 /**
  * Create a panel controlling the visibility of annotations
  * on the image view.
@@ -401,24 +396,12 @@ var AnnotationSelector = Panel.extend({
     },
 
     _setActiveAnnotationWithoutLoad(model) {
-        const numElements = ((model.get('annotation') || {}).elements || []).length;
         if (this._activeAnnotation && this._activeAnnotation.id !== model.id) {
             return;
         }
         model.set('displayed', true);
 
-        if (numElements > MAX_ELEMENTS_LIST_LENGTH || model._pageElements) {
-            events.trigger('g:alert', {
-                text: 'This annotation has too many elements to be edited.',
-                type: 'warning',
-                timeout: 5000,
-                icon: 'info'
-            });
-            this._activeAnnotation = null;
-            this.trigger('h:editAnnotation', null);
-        } else {
-            this.trigger('h:editAnnotation', model);
-        }
+        this.trigger('h:editAnnotation', model);
     },
 
     createAnnotation(evt) {

{histomicsui-1.7.2.dev6 → histomicsui-1.7.2.dev10}/histomicsui/web_client/panels/DrawWidget.js

@@ -118,7 +118,8 @@ var DrawWidget = Panel.extend({
                 drawingType: this._drawingType,
                 collapsed: this.$('.s-panel-content.collapse').length && !this.$('.s-panel-content').hasClass('in'),
                 firstRender: true,
-                displayIdStart: 0
+                displayIdStart: 0,
+                partialCount: this.annotation && this.annotation._pageElements
             }));
             this.$('.h-dropdown-content').collapse({toggle: false});
         }

{histomicsui-1.7.2.dev6 → histomicsui-1.7.2.dev10}/histomicsui/web_client/templates/panels/drawWidget.pug

@@ -104,7 +104,10 @@ block content
             input.h-brush-screen(type="checkbox", checked=opts.brush_screen ? 'checked' : undefined)
             | Screen
   .h-group-count
-    b.h-group-count-label Count:
+    if partialCount
+      b.h-group-count-label(title='* These counts only apply to loaded elements') Count*:
+    else
+      b.h-group-count-label Count:
     span.h-group-count-options
   .h-elements-container
     include drawWidgetElement.pug

{histomicsui-1.7.2.dev6 → histomicsui-1.7.2.dev10}/histomicsui/web_client/views/body/ImageView.js

@@ -1286,6 +1286,11 @@ var ImageView = View.extend({
                     }
                 }
                 break;
+            case 'D':
+                if (evt.shiftKey && (evt.altKey || evt.metaKey)) {
+                    console.log(this);
+                }
+                break;
             default:
                 if (this.drawWidget && drawModes[evt.key] && this.activeAnnotation) {
                     const mode = drawModes[evt.key];
@@ -1375,6 +1380,9 @@ var ImageView = View.extend({
     getElementsInPolygon(poly) {
         const results = [];
         this.viewerWidget.featureLayer.features().forEach((feature) => {
+            if (feature._centroidFeature) {
+                return;
+            }
             const r = feature.polygonSearch(poly, {partial: false});
             r.found.forEach((feature) => {
                 const annotationId = feature.properties ? feature.properties.annotation : null;

{histomicsui-1.7.2.dev6 → histomicsui-1.7.2.dev10/histomicsui.egg-info}/PKG-INFO

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

{histomicsui-1.7.2.dev6 → histomicsui-1.7.2.dev10}/histomicsui.egg-info/requires.txt

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

{histomicsui-1.7.2.dev6 → histomicsui-1.7.2.dev10}/setup.py

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