histomicsui 1.5.1.dev20__tar.gz → 1.5.1.dev24__tar.gz

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

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

{histomicsui-1.5.1.dev20 → histomicsui-1.5.1.dev24}/histomicsui/web_client/panels/DrawWidget.js

@@ -662,7 +662,12 @@ var DrawWidget = Panel.extend({
             }
 
             this.viewer.startDrawMode(type, options)
-                .then((element, annotations, opts) => this._addDrawnElements(element, annotations, opts));
+                .then((element, annotations, opts) => this._addDrawnElements(element, annotations, opts))
+                .fail(() => {
+                    if (this._drawingType) {
+                        this.drawElement(undefined, this._drawingType, !!this._drawingType);
+                    }
+                });
         }
         this.$('button.h-draw[data-type]').removeClass('active');
         if (this._drawingType) {
@@ -833,6 +838,12 @@ var DrawWidget = Panel.extend({
      * @param {object} group The new group.
      */
     _setStyleGroup(group) {
+        group = Object.assign({}, group);
+        Object.keys(group).forEach((k) => {
+            if (!['fillColor', 'lineColor', 'lineWidth', 'label', 'group', 'id'].includes(k)) {
+                delete group[k];
+            }
+        });
         this._style.set(group);
         if (!group.group && this._style.id !== this.parentView._defaultGroup) {
             this._style.set('group', this._style.id);

{histomicsui-1.5.1.dev20 → histomicsui-1.5.1.dev24}/histomicsui/web_client/views/body/ImageView.js

@@ -1043,7 +1043,7 @@ var ImageView = View.extend({
 
         window.requestAnimationFrame(() => {
             const {element, annotationId} = this._processMouseClickQueue();
-            if (!evt.mouse.modifiers.shift) {
+            if (!evt.mouse.modifiers.shift && (!evt.sourceEvent || !evt.sourceEvent.handled)) {
                 if (evt.mouse.buttonsDown.right) {
                     this._openContextMenu(element.annotation.elements().get(element.id), annotationId, evt);
                 } else if (evt.mouse.modifiers.ctrl && !this.viewerWidget.annotationLayer.mode()) {

{histomicsui-1.5.1.dev20 → histomicsui-1.5.1.dev24}/histomicsui/web_client/views/popover/AnnotationContextMenu.js

@@ -62,7 +62,11 @@ const AnnotationContextMenu = View.extend({
     _setStyleDefinition(group) {
         const style = this.styles.get({id: group}) || this.styles.get({id: this.parentView._defaultGroup});
         const styleAttrs = Object.assign({}, style ? style.toJSON() : {});
-        delete styleAttrs.id;
+        Object.keys(styleAttrs).forEach((k) => {
+            if (!['fillColor', 'lineColor', 'lineWidth', 'label'].includes(k)) {
+                delete styleAttrs[k];
+            }
+        });
         let refresh = false;
         this.collection.each((element) => { /* eslint-disable backbone/no-silent */
             if (this.parentView.drawWidget && this.parentView.activeAnnotation.id === element.originalAnnotation.id &&

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

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