histomicsui 1.7.1.dev12__tar.gz → 1.7.1.dev16__tar.gz

{histomicsui-1.7.1.dev12/histomicsui.egg-info → histomicsui-1.7.1.dev16}/PKG-INFO

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

{histomicsui-1.7.1.dev12 → histomicsui-1.7.1.dev16}/histomicsui/web_client/panels/DrawWidget.js

@@ -377,7 +377,7 @@ var DrawWidget = Panel.extend({
     },
 
     /**
-     * Apply a boolean operation to the existign polygons.
+     * Apply a boolean operation to the existing polygons.
      *
      * @param {geo.annotation[]} annotations The list of specified geojs
      *      annotations.
@@ -409,7 +409,7 @@ var DrawWidget = Panel.extend({
             if (element.properties.element && element.properties.element.group !== this._style.get('group')) {
                 return;
             }
-            element.properties.annotationId = element.properties.annotation;
+            element.properties.annotationId = element.properties.annotation.id;
             geojson.features.push(element);
             oldids[element.id] = true;
         }));

{histomicsui-1.7.1.dev12 → histomicsui-1.7.1.dev16}/histomicsui/web_client/views/body/ImageView.js

@@ -1431,7 +1431,9 @@ var ImageView = View.extend({
 
     _editElementShape(element, annotationId) {
         this._preeditDrawMode = this.drawWidget ? this.drawWidget.drawingType() : undefined;
-        this.drawWidget.cancelDrawMode();
+        if (this.drawWidget && this.drawWidget.drawingType()) {
+            this.drawWidget.cancelDrawMode();
+        }
         const annotation = this.annotations.get(element.originalAnnotation || annotationId);
         this._editAnnotation(annotation);
         const geojson = convertToGeojson(element);
@@ -1584,6 +1586,12 @@ var ImageView = View.extend({
         });
     },
     _deselectAnnotationElements(evt) {
+        if (this.viewerWidget && this.viewerWidget.annotationLayer && this.viewerWidget.annotationLayer.mode() !== null) {
+            if (this.drawWidget) {
+                this.drawWidget._drawingType = null;
+            }
+            this.viewerWidget.annotationLayer.mode(null);
+        }
         const model = (evt || {}).model;
         if (this.selectedElements && this.selectedElements.length) {
             const elements = this.selectedElements.models.filter((el) => el.originalAnnotation.id === model.id);
@@ -1703,11 +1711,13 @@ var ImageView = View.extend({
     },
 
     _drawModeChange(evt) {
-        if (this._drawingType) {
+        if (this.drawWidget && this.drawWidget._drawingType) {
             this.viewer.annotationLayer.mode(null);
             this.viewer.annotationLayer.geoOff(geo.event.annotation.state);
         }
-        this._drawingType = null;
+        if (this.drawWidget) {
+            this.drawWidget._drawingType = null;
+        }
         $('#h-analysis-panel .input-group-btn').find('.s-select-region-button').removeClass('active');
     },
 

{histomicsui-1.7.1.dev12 → histomicsui-1.7.1.dev16/histomicsui.egg-info}/PKG-INFO

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