histomicsui 1.7.3.dev68__tar.gz → 1.7.3.dev72__tar.gz

{histomicsui-1.7.3.dev68 → histomicsui-1.7.3.dev72}/PKG-INFO

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

{histomicsui-1.7.3.dev68 → histomicsui-1.7.3.dev72}/histomicsui/web_client/panels/AnnotationSelector.js

@@ -55,8 +55,8 @@ var AnnotationSelector = Panel.extend({
         this.listenTo(this.collection, 'change:highlight', this._changeAnnotationHighlight);
         this.listenTo(eventStream, 'g:event.job_status', _.debounce(this._onJobUpdate, 500));
         this.listenTo(eventStream, 'g:eventStream.start', this._refreshAnnotations);
-        this.listenTo(eventStream, 'g:event.large_image_annotation.create', this._refreshAnnotations);
-        this.listenTo(eventStream, 'g:event.large_image_annotation.remove', this._refreshAnnotations);
+        this.listenTo(eventStream, 'g:event.large_image_annotation.create', this._refreshAnnotationsCheck);
+        this.listenTo(eventStream, 'g:event.large_image_annotation.remove', this._refreshAnnotationsCheck);
         this.listenTo(this.collection, 'h:revert:annotation', this._refreshAnnotations);
         this.listenTo(this.collection, 'change:annotation change:groups', this._saveAnnotation);
         this.listenTo(girderEvents, 'g:login', () => {
@@ -279,6 +279,16 @@ var AnnotationSelector = Panel.extend({
         }
     },
 
+    _refreshAnnotationsCheck(evt) {
+        if (!evt.data || !evt.data.itemId) {
+            return;
+        }
+        if (!this.parentItem || !this.parentItem.id || evt.data.itemId !== this.parentItem.id) {
+            return;
+        }
+        this._refreshAnnotations();
+    },
+
     _refreshAnnotations() {
         if (this._norefresh) {
             delete this._norefresh;

{histomicsui-1.7.3.dev68 → histomicsui-1.7.3.dev72}/histomicsui/web_client/views/body/ImageView.js

@@ -1424,6 +1424,11 @@ var ImageView = View.extend({
             // If still not selected, then the user does not have access.
             return;
         }
+        // must have write access
+        const annotation = (element.collection || {}).annotation;
+        if (!annotation || annotation.get('_accessLevel') < AccessType.WRITE) {
+            return;
+        }
 
         // Defer the context menu action into the next animation frame
         // to work around a problem with preventDefault on Windows
@@ -1540,10 +1545,10 @@ var ImageView = View.extend({
     },
 
     _selectElement(element, options) {
-        // don't allow selecting annotations with no write access or
-        // elements not associated with a real annotation.
+        // don't allow selecting annotations not associated with a real
+        // annotation.
         const annotation = (element.collection || {}).annotation;
-        if (!annotation || annotation.get('_accessLevel') < AccessType.WRITE) {
+        if (!annotation) {
             return;
         }
 

{histomicsui-1.7.3.dev68 → histomicsui-1.7.3.dev72}/histomicsui.egg-info/PKG-INFO

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