histomicsui 1.7.3.dev59__tar.gz → 1.7.3.dev66__tar.gz

{histomicsui-1.7.3.dev59 → histomicsui-1.7.3.dev66}/PKG-INFO

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

{histomicsui-1.7.3.dev59 → histomicsui-1.7.3.dev66}/histomicsui/web_client/panels/DrawWidget.js

@@ -682,6 +682,18 @@ var DrawWidget = Panel.extend({
                 });
         }
         this.$('button.h-draw[data-type]').removeClass('active');
+        this.viewer.annotationLayer.geoOn(geo.event.annotation.mode, (evt) => {
+            if (evt.reason === 'escape') {
+                if (evt.oldCoordinates.length > 0) {
+                    // If we have started drawing, cancel the annotation but keep the mode
+                    return;
+                }
+                this._drawingType = null;
+                this.viewer.annotationLayer.mode(null);
+                this.viewer.annotationLayer.geoOff(geo.event.annotation.state);
+                $el.removeClass('active');
+            }
+        });
         if (this._drawingType) {
             if (this.parentView.annotationSelector) {
                 this.parentView.annotationSelector.selectAnnotationByRegionCancel();

{histomicsui-1.7.3.dev59 → histomicsui-1.7.3.dev66}/histomicsui/web_client/stylesheets/popover/annotationPopover.styl

@@ -3,6 +3,7 @@
   pointer-events none
   margin-left 15px
   z-index 1000
+  --arrow-offset 0.001px
 
   .h-annotation-popover
     position absolute
@@ -14,28 +15,29 @@
     border-radius 3px
     border 1px solid #000
     box-shadow 0 5px 10px rgba(0, 0, 0, 0.5)
+    --arrow-size 13px
 
     &:before
       content ""
       border-color transparent #000 transparent transparent
       border-style solid
-      border-width 13px
+      border-width var(--arrow-size)
       height 0
       width 0
       position absolute
-      left -26px
-      top calc(50% - 13px)
+      left calc(-2 * var(--arrow-size))
+      top calc(50% - var(--arrow-size) + var(--arrow-offset))
 
     &:after
       content ""
       border-color transparent #fff transparent transparent
       border-style solid
-      border-width 13px
+      border-width var(--arrow-size)
       height 0
       width 0
       position absolute
-      left -25px
-      top calc(50% - 13px)
+      left calc(-2 * var(--arrow-size) + 1px)
+      top calc(50% - var(--arrow-size) + var(--arrow-offset))
 
     > :not(.h-annotation-name)
       padding 0 20px

{histomicsui-1.7.3.dev59 → histomicsui-1.7.3.dev66}/histomicsui/web_client/templates/popover/annotationPopover.pug

@@ -46,4 +46,5 @@
                       td #{value}
               - var add = elementAdditionalValues(element, annotation)
               if add
-                | !{add}
+                .additionalData
+                  | !{add}

{histomicsui-1.7.3.dev59 → histomicsui-1.7.3.dev66}/histomicsui/web_client/views/body/ImageView.js

@@ -1281,7 +1281,6 @@ var ImageView = View.extend({
                         ) {
                             annotation.state(geo.annotation.state.done).modified().draw();
                         }
-
                         this.drawWidget.cancelDrawMode();
                     }
                 }
@@ -1291,6 +1290,15 @@ var ImageView = View.extend({
                     console.log(this);
                 }
                 break;
+            case 'Escape':
+                // When geojs is engaged, this value will be false. This allows us to handle events where geojs is not engaged separately.
+                if (this.viewerWidget.annotationLayer.geoIsOn(geo.event.annotation.mode)) {
+                    const button = this.$el.find('button.h-draw.active');
+                    button.removeClass('active');
+                    this.drawWidget._drawingType = null;
+                    this.drawWidget.viewer.annotationLayer.mode(null);
+                }
+                break;
             default:
                 if (this.drawWidget && drawModes[evt.key] && this.activeAnnotation) {
                     const mode = drawModes[evt.key];

{histomicsui-1.7.3.dev59 → histomicsui-1.7.3.dev66}/histomicsui/web_client/views/popover/AnnotationPopover.js

@@ -121,7 +121,19 @@ var AnnotationPopover = View.extend({
         if (!this._visible()) {
             this._hide();
         }
-        this._height = this.$('.h-annotation-popover').height();
+        this.$('.h-annotation-popover .additionalData').css('font-size', '');
+        this._height = this.$('.h-annotation-popover').outerHeight(true);
+        if (this._height > window.innerHeight) {
+            this.$('.h-annotation-popover .additionalData').css('font-size', '90%');
+            const delta = (this._height - this.$('.h-annotation-popover').outerHeight(true)) / 10;
+            if (delta > 0) {
+                const scale = 100 - (this._height - window.innerHeight) / delta;
+                if (scale > 10 && scale < 100) {
+                    this.$('.h-annotation-popover .additionalData').css('font-size', `${scale}%`);
+                }
+            }
+            this._height = this.$('.h-annotation-popover').outerHeight(true);
+        }
         this._position();
         return this;
     },
@@ -275,10 +287,13 @@ var AnnotationPopover = View.extend({
         } else {
             evt = this._lastPositionEvt;
         }
-        if (evt && this._visible()) {
+        if (evt && this._visible() && this._height) {
+            const idealPos = evt.pageY - this._height / 2;
+            const pos = Math.max(0, Math.min(window.innerHeight - this._height, idealPos));
             this.$el.css({
                 left: evt.pageX + 5,
-                top: evt.pageY - this._height / 2
+                top: pos,
+                '--arrow-offset': (idealPos - pos) + 'px'
             });
         }
     },

{histomicsui-1.7.3.dev59 → histomicsui-1.7.3.dev66}/histomicsui.egg-info/PKG-INFO

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