histomicsui 1.7.3.dev81__tar.gz → 1.7.3.dev85__tar.gz

{histomicsui-1.7.3.dev81 → histomicsui-1.7.3.dev85}/PKG-INFO

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

{histomicsui-1.7.3.dev81 → histomicsui-1.7.3.dev85}/docs/controls.rst

@@ -140,15 +140,22 @@ Annotation Controls
        :alt: Union operation
 
   - **ctrl**: When drawing an annotation element with area, switch to
-    **Subtract** mode.  The drawing annotation will be removed from any
+    **Subtract** mode.  The drawn annotation will be removed from any
     existing elements in the same annotation document and the same style group.
 
     .. image:: images/difference.gif
        :width: 256
        :alt: Difference operation
 
+  - **ctrl**: When drawing a line annotation, switch to **Cut** mode.  The
+    line will be used to split any area annotations with the same style group.
+
+    .. image:: images/cut.gif
+       :width: 256
+       :alt: Cut operation
+
   - **shift+ctrl**: When drawing an annotation element with area, switch to
-    **Union** mode.  The drawing annotation will be combined with nearby
+    **Union** mode.  The drawn annotation will be combined with nearby
     existing annotation elements in the same annotation document and the same
     style group, only keeping area that is in both the new and existing
     elements.
@@ -158,7 +165,7 @@ Annotation Controls
        :alt: Intersect operation
 
   - **shift+alt**: When drawing an annotation element with area, switch to
-    **XOR** mode.  The drawing annotation will be combined with nearby
+    **XOR** mode.  The drawn annotation will be combined with nearby
     existing annotation elements in the same annotation document and the same
     style group, keeping areas that is in either but not both the new and
     existing elements and removing areas that are in both.

{histomicsui-1.7.3.dev81 → histomicsui-1.7.3.dev85}/histomicsui/web_client/panels/AnnotationSelector.js

@@ -325,6 +325,9 @@ var AnnotationSelector = Panel.extend({
                         } else {
                             model._centroids = models[model.id]._centroids;
                             model._elements = models[model.id]._elements;
+                            if (model.bindListeners) {
+                                model.bindListeners();
+                            }
                         }
                     }
                     if (!refreshed) {

{histomicsui-1.7.3.dev81 → histomicsui-1.7.3.dev85}/histomicsui/web_client/panels/DrawWidget.js

@@ -390,14 +390,23 @@ var DrawWidget = Panel.extend({
      * @returns {boolean} true if the operation was handled.
      */
     _applyBooleanOp(annotations, evtOpts) {
-        if (!evtOpts.asPolygonList && (annotations.length !== 1 || !annotations[0].toPolygonList)) {
+        const op = evtOpts.currentBooleanOperation;
+        if (op !== 'cut' && !evtOpts.asPolygonList && (annotations.length !== 1 || !annotations[0].toPolygonList)) {
             return false;
         }
-        const op = evtOpts.currentBooleanOperation;
         const existing = this.viewer._annotations[this.annotation.id].features.filter((f) => ['polygon', 'marker'].indexOf(f.featureType) >= 0);
-        const polylist = evtOpts.asPolygonList ? annotations : annotations[0].toPolygonList({pixelTolerance: this._pixelTolerance()});
-        if (!existing.length && polylist.length < 2) {
-            return false;
+        let polylist;
+        if (op !== 'cut') {
+            polylist = evtOpts.asPolygonList ? annotations : annotations[0].toPolygonList({pixelTolerance: this._pixelTolerance()});
+            if (!existing.length && polylist.length < 2) {
+                return false;
+            }
+        } else {
+            const ptlist = annotations[0].coordinates().map((p) => [p.x, p.y]);
+            if (ptlist.length === 2) {
+                ptlist.splice(1, 0, [(ptlist[0][0] + ptlist[1][0]) / 2, (ptlist[0][1] + ptlist[1][1]) / 2]);
+            }
+            polylist = [[ptlist]];
         }
         const searchPoly = [];
         polylist.forEach((poly) => poly[0].forEach((pt) => searchPoly.push({x: pt[0], y: pt[1]})));
@@ -423,13 +432,21 @@ var DrawWidget = Panel.extend({
         }
         this.viewer.annotationLayer.removeAllAnnotations(undefined, false);
         this.viewer.annotationLayer.geojson(geojson);
-        const opts = {
-            correspond: {},
-            keepAnnotations: 'exact',
-            style: this.viewer.annotationLayer,
-            pixelTolerance: this._pixelTolerance()
-        };
-        geo.util.polyops[op](this.viewer.annotationLayer, polylist, opts);
+        if (op !== 'cut') {
+            const opts = {
+                correspond: {},
+                keepAnnotations: 'exact',
+                style: this.viewer.annotationLayer,
+                pixelTolerance: this._pixelTolerance()
+            };
+            geo.util.polyops[op](this.viewer.annotationLayer, polylist, opts);
+        } else {
+            if (!this.viewer.annotationLayer.cutOperation) {
+                console.warn('Cut operations are not supported');
+                return true;
+            }
+            this.viewer.annotationLayer.cutOperation(annotations[0]);
+        }
         const newAnnot = this.viewer.annotationLayer.annotations();
 
         this.viewer.annotationLayer.removeAllAnnotations(undefined, false);

{histomicsui-1.7.3.dev81 → histomicsui-1.7.3.dev85}/histomicsui.egg-info/PKG-INFO

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

{histomicsui-1.7.3.dev81 → histomicsui-1.7.3.dev85}/histomicsui.egg-info/SOURCES.txt

@@ -17,6 +17,7 @@ tox.ini
 docs/config_options.rst
 docs/controls.rst
 docs/slicer_cli_plugins.rst
+docs/images/cut.gif
 docs/images/difference.gif
 docs/images/intersect.gif
 docs/images/union.gif