histomicsui 1.5.1.dev22__tar.gz → 1.5.1.dev26__tar.gz

{histomicsui-1.5.1.dev22 → histomicsui-1.5.1.dev26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: histomicsui
-Version: 1.5.1.dev22
+Version: 1.5.1.dev26
 Summary: Organize, visualize, and analyze histology images.
 Home-page: https://github.com/DigitalSlideArchive/histomicsui
 Author: Kitware, Inc.
@@ -26,9 +26,22 @@ Requires-Dist: cachetools
 Requires-Dist: orjson
 Provides-Extra: analysis
 
-=======================================
-HistomicsUI |build-status| |codecov-io|
-=======================================
+===========
+HistomicsUI
+===========
+
+|build-status| |codecov-io| |doi-badge|
+
+.. |build-status| image:: https://circleci.com/gh/DigitalSlideArchive/HistomicsUI.svg?style=svg
+    :target: https://circleci.com/gh/DigitalSlideArchive/HistomicsUI
+    :alt: Build Status
+
+.. |codecov-io| image:: https://img.shields.io/codecov/c/github/DigitalSlideArchive/HistomicsUI.svg
+    :target: https://codecov.io/github/DigitalSlideArchive/HistomicsUI?branch=master
+    :alt: codecov.io
+
+.. |doi-badge| image:: https://img.shields.io/badge/DOI-10.5281%2Fzenodo.5474914-blue.svg
+   :target: https://zenodo.org/doi/10.5281/zenodo.5474914
 
 Organize, visualize, and analyze histology images.
 
@@ -143,11 +156,3 @@ This work was funded in part by the NIH grant U24-CA194362-01_.
 .. _celery: http://www.celeryproject.org/
 .. _HistomicsTK: https://github.com/DigitalSlideArchive/HistomicsTK
 .. _Digital Slide Archive: https://github.com/DigitalSlideArchive/digital_slide_archive
-
-.. |build-status| image:: https://circleci.com/gh/DigitalSlideArchive/HistomicsUI.svg?style=svg
-    :target: https://circleci.com/gh/DigitalSlideArchive/HistomicsUI
-    :alt: Build Status
-
-.. |codecov-io| image:: https://img.shields.io/codecov/c/github/DigitalSlideArchive/HistomicsUI.svg
-    :target: https://codecov.io/github/DigitalSlideArchive/HistomicsUI?branch=master
-    :alt: codecov.io

{histomicsui-1.5.1.dev22 → histomicsui-1.5.1.dev26}/README.rst

@@ -1,6 +1,19 @@
-=======================================
-HistomicsUI |build-status| |codecov-io|
-=======================================
+===========
+HistomicsUI
+===========
+
+|build-status| |codecov-io| |doi-badge|
+
+.. |build-status| image:: https://circleci.com/gh/DigitalSlideArchive/HistomicsUI.svg?style=svg
+    :target: https://circleci.com/gh/DigitalSlideArchive/HistomicsUI
+    :alt: Build Status
+
+.. |codecov-io| image:: https://img.shields.io/codecov/c/github/DigitalSlideArchive/HistomicsUI.svg
+    :target: https://codecov.io/github/DigitalSlideArchive/HistomicsUI?branch=master
+    :alt: codecov.io
+
+.. |doi-badge| image:: https://img.shields.io/badge/DOI-10.5281%2Fzenodo.5474914-blue.svg
+   :target: https://zenodo.org/doi/10.5281/zenodo.5474914
 
 Organize, visualize, and analyze histology images.
 
@@ -115,11 +128,3 @@ This work was funded in part by the NIH grant U24-CA194362-01_.
 .. _celery: http://www.celeryproject.org/
 .. _HistomicsTK: https://github.com/DigitalSlideArchive/HistomicsTK
 .. _Digital Slide Archive: https://github.com/DigitalSlideArchive/digital_slide_archive
-
-.. |build-status| image:: https://circleci.com/gh/DigitalSlideArchive/HistomicsUI.svg?style=svg
-    :target: https://circleci.com/gh/DigitalSlideArchive/HistomicsUI
-    :alt: Build Status
-
-.. |codecov-io| image:: https://img.shields.io/codecov/c/github/DigitalSlideArchive/HistomicsUI.svg
-    :target: https://codecov.io/github/DigitalSlideArchive/HistomicsUI?branch=master
-    :alt: codecov.io

{histomicsui-1.5.1.dev22 → histomicsui-1.5.1.dev26}/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.dev22 → histomicsui-1.5.1.dev26}/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.dev22 → histomicsui-1.5.1.dev26}/histomicsui.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: histomicsui
-Version: 1.5.1.dev22
+Version: 1.5.1.dev26
 Summary: Organize, visualize, and analyze histology images.
 Home-page: https://github.com/DigitalSlideArchive/histomicsui
 Author: Kitware, Inc.
@@ -26,9 +26,22 @@ Requires-Dist: cachetools
 Requires-Dist: orjson
 Provides-Extra: analysis
 
-=======================================
-HistomicsUI |build-status| |codecov-io|
-=======================================
+===========
+HistomicsUI
+===========
+
+|build-status| |codecov-io| |doi-badge|
+
+.. |build-status| image:: https://circleci.com/gh/DigitalSlideArchive/HistomicsUI.svg?style=svg
+    :target: https://circleci.com/gh/DigitalSlideArchive/HistomicsUI
+    :alt: Build Status
+
+.. |codecov-io| image:: https://img.shields.io/codecov/c/github/DigitalSlideArchive/HistomicsUI.svg
+    :target: https://codecov.io/github/DigitalSlideArchive/HistomicsUI?branch=master
+    :alt: codecov.io
+
+.. |doi-badge| image:: https://img.shields.io/badge/DOI-10.5281%2Fzenodo.5474914-blue.svg
+   :target: https://zenodo.org/doi/10.5281/zenodo.5474914
 
 Organize, visualize, and analyze histology images.
 
@@ -143,11 +156,3 @@ This work was funded in part by the NIH grant U24-CA194362-01_.
 .. _celery: http://www.celeryproject.org/
 .. _HistomicsTK: https://github.com/DigitalSlideArchive/HistomicsTK
 .. _Digital Slide Archive: https://github.com/DigitalSlideArchive/digital_slide_archive
-
-.. |build-status| image:: https://circleci.com/gh/DigitalSlideArchive/HistomicsUI.svg?style=svg
-    :target: https://circleci.com/gh/DigitalSlideArchive/HistomicsUI
-    :alt: Build Status
-
-.. |codecov-io| image:: https://img.shields.io/codecov/c/github/DigitalSlideArchive/HistomicsUI.svg
-    :target: https://codecov.io/github/DigitalSlideArchive/HistomicsUI?branch=master
-    :alt: codecov.io