histomicsui 1.7.3.dev93__tar.gz → 1.7.3.dev97__tar.gz

{histomicsui-1.7.3.dev93 → histomicsui-1.7.3.dev97}/PKG-INFO

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

{histomicsui-1.7.3.dev93 → histomicsui-1.7.3.dev97}/docs/controls.rst

@@ -154,6 +154,10 @@ Annotation Controls
        :width: 256
        :alt: Cut operation
 
+  - **ctrl+alt**: When drawing an annotation with area, switch to **Cut** mode.
+    The drawn annotation will be used to split any area annotations with the
+    same style group.
+
   - **shift+ctrl**: When drawing an annotation element with area, switch to
     **Union** mode.  The drawn annotation will be combined with nearby
     existing annotation elements in the same annotation document and the same

{histomicsui-1.7.3.dev93 → histomicsui-1.7.3.dev97}/histomicsui/web_client/dialogs/editElement.js

@@ -80,7 +80,9 @@ var EditElement = View.extend({
             data.fillColor = this.convertColor(fillColor);
         }
         var pattern = this.$('#h-element-fill-pattern').val();
-        data.pattern = pattern === 'none' ? undefined : pattern;
+        if (this.annotationElement.get('type') !== 'point') {
+            data.pattern = pattern === 'none' ? '' : pattern;
+        }
 
         if (validation) {
             this.$('.g-validation-failed-message').text(validation)

{histomicsui-1.7.3.dev93 → histomicsui-1.7.3.dev97}/histomicsui/web_client/dialogs/editStyleGroups.js

@@ -89,7 +89,7 @@ const EditStyleGroups = View.extend({
             data.fillColor = this.convertColor(fillColor);
         }
         var pattern = this.$('#h-element-fill-pattern').val();
-        data.pattern = pattern === 'none' ? undefined : pattern;
+        data.pattern = pattern === 'none' ? '' : pattern;
 
         if (validation) {
             this.$('.g-validation-failed-message').text(validation)

{histomicsui-1.7.3.dev93 → histomicsui-1.7.3.dev97}/histomicsui/web_client/panels/AnnotationSelector.js

@@ -455,7 +455,7 @@ var AnnotationSelector = Panel.extend({
         if (options && options.delaySave) {
             return;
         }
-        if (annotation._fromFetch) {
+        if (annotation._fromFetch || annotation._inBooleanOp) {
             return;
         }
         if (this.viewer && !this.viewer._saving) {

{histomicsui-1.7.3.dev93 → histomicsui-1.7.3.dev97}/histomicsui/web_client/panels/DrawWidget.js

@@ -345,6 +345,11 @@ var DrawWidget = Panel.extend({
      *    collection.
      */
     addElements(elements) {
+        elements.forEach((el) => {
+            if (el.pattern === '' || el.type === 'point') {
+                delete el.pattern;
+            }
+        });
         this._skipRenderHTML = this._skipRenderHTML || true;
         elements = this.collection.add(elements);
         this.$el.find('.h-elements-container').append(
@@ -396,7 +401,7 @@ var DrawWidget = Panel.extend({
         }
         const existing = this.viewer._annotations[this.annotation.id].features.filter((f) => ['polygon', 'marker'].indexOf(f.featureType) >= 0);
         let polylist;
-        if (op !== 'cut') {
+        if (op !== 'cut' || !(annotations[0] instanceof window.geo.annotation.lineAnnotation)) {
             polylist = evtOpts.asPolygonList ? annotations : annotations[0].toPolygonList({pixelTolerance: this._pixelTolerance()});
             if (!existing.length && polylist.length < 2) {
                 return false;
@@ -457,6 +462,9 @@ var DrawWidget = Panel.extend({
             }
             return result;
         }).filter((annot) => !annot.points || annot.points.length);
+        if (this.parentView.annotationSelector) {
+            this.annotation._inBooleanOp = true;
+        }
         Object.keys(oldids).forEach((id) => this.deleteElement(undefined, id, {delaySave: elements.length}));
         this.addElements(
             _.map(elements, (el) => {
@@ -467,11 +475,15 @@ var DrawWidget = Panel.extend({
                 return el;
             })
         );
+        if (this.parentView.annotationSelector) {
+            delete this.annotation._inBooleanOp;
+            this.parentView.annotationSelector._saveAnnotation(this.annotation);
+        }
         return true;
     },
 
     /**
-     * When the brish is set to a specific screen size, adjust the size on zoom
+     * When the brush is set to a specific screen size, adjust the size on zoom
      * events.
      */
     _brushPan() {

{histomicsui-1.7.3.dev93 → histomicsui-1.7.3.dev97}/histomicsui.egg-info/PKG-INFO

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