histomicsui 1.5.1.dev30__tar.gz → 1.5.1.dev33__tar.gz

{histomicsui-1.5.1.dev30 → histomicsui-1.5.1.dev33}/PKG-INFO

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

{histomicsui-1.5.1.dev30 → histomicsui-1.5.1.dev33}/histomicsui/web_client/panels/DrawWidget.js

@@ -140,6 +140,12 @@ var DrawWidget = Panel.extend({
             this.$('button.h-draw[data-type="' + this._drawingType + '"]').addClass('active');
             this.drawElement(undefined, this._drawingType);
         }
+        this._bindHUIModeChange();
+        this._updateConstraintValueInputs();
+        return this;
+    },
+
+    _bindHUIModeChange() {
         if (this.viewer.annotationLayer && this.viewer.annotationLayer._boundHUIModeChange !== this) {
             this.viewer.annotationLayer._boundHUIModeChange = this;
             this.viewer.annotationLayer.geoOff(geo.event.annotation.mode);
@@ -160,8 +166,6 @@ var DrawWidget = Panel.extend({
                 }
             });
         }
-        this._updateConstraintValueInputs();
-        return this;
     },
 
     /**
@@ -626,6 +630,9 @@ var DrawWidget = Panel.extend({
      *      if it hasn't changed.
      */
     drawElement(evt, type, forceRefresh) {
+        if (type) {
+            this._bindHUIModeChange();
+        }
         var $el;
         if (evt) {
             $el = this.$(evt.currentTarget);
@@ -664,7 +671,7 @@ var DrawWidget = Panel.extend({
             this.viewer.startDrawMode(type, options)
                 .then((element, annotations, opts) => this._addDrawnElements(element, annotations, opts))
                 .fail(() => {
-                    if (this._drawingType && this._drawingType !== this.viewer.annotationLayer.mode()) {
+                    if (this._drawingType && this._drawingType !== this.viewer.annotationLayer.mode() && this.viewer.annotationLayer.mode() !== 'edit') {
                         this.drawElement(undefined, this._drawingType, !!this._drawingType);
                     }
                 });
@@ -682,6 +689,7 @@ var DrawWidget = Panel.extend({
         this.drawElement(undefined, null);
         this.viewer.annotationLayer._boundHUIModeChange = false;
         this.viewer.annotationLayer.geoOff(geo.event.annotation.state);
+        this.viewer.annotationLayer.geoOff(geo.event.annotation.mode);
     },
 
     drawingType() {
@@ -935,13 +943,7 @@ var DrawWidget = Panel.extend({
 
         this._updateConstraintValueInputs();
 
-        if (opts.size_mode === 'fixed_aspect_ratio') {
-            this.viewer.startDrawMode(this._drawingType, {modeOptions: {constraint: opts.fixed_width / opts.fixed_height}});
-        } else if (opts.size_mode === 'fixed_size') {
-            this.viewer.startDrawMode(this._drawingType, {modeOptions: {constraint: {width: opts.fixed_width, height: opts.fixed_height}}});
-        } else {
-            this.viewer.startDrawMode(this._drawingType);
-        }
+        this.drawElement(null, this._drawingType, true);
     },
 
     /**

{histomicsui-1.5.1.dev30 → histomicsui-1.5.1.dev33}/histomicsui/web_client/stylesheets/layout/layout.styl

@@ -106,4 +106,5 @@ body.hui-body[view-mode="dark"]
         background-color #4672cc
 
   .region-dropdown
-    z-index 100
+    position relative
+    z-index auto

{histomicsui-1.5.1.dev30 → histomicsui-1.5.1.dev33}/histomicsui/web_client/views/body/ImageView.js

@@ -1429,6 +1429,8 @@ var ImageView = View.extend({
     },
 
     _editElementShape(element, annotationId) {
+        this._preeditDrawMode = this.drawWidget ? this.drawWidget.drawingType() : undefined;
+        this.drawWidget.cancelDrawMode();
         const annotation = this.annotations.get(element.originalAnnotation || annotationId);
         this._editAnnotation(annotation);
         const geojson = convertToGeojson(element);
@@ -1471,6 +1473,14 @@ var ImageView = View.extend({
         this._currentAnnotationEditShape = null;
         this.viewerWidget.annotationLayer.removeAllAnnotations();
         this.viewerWidget.hideAnnotation();
+        if (this.drawWidget) {
+            this.drawWidget.cancelDrawMode();
+            if (this._preeditDrawMode) {
+                window.setTimeout(() => {
+                    this.drawWidget.drawElement(undefined, this._preeditDrawMode);
+                }, 0);
+            }
+        }
     },
 
     _redrawSelection() {

{histomicsui-1.5.1.dev30 → histomicsui-1.5.1.dev33}/histomicsui.egg-info/PKG-INFO

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