histomicsui 1.7.1.dev14__tar.gz → 1.7.2.dev2__tar.gz

{histomicsui-1.7.1.dev14/histomicsui.egg-info → histomicsui-1.7.2.dev2}/PKG-INFO

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

{histomicsui-1.7.1.dev14 → histomicsui-1.7.2.dev2}/docs/config_options.rst

@@ -50,6 +50,7 @@ _________________
           fillColor: rgba(255, 0, 0, 0.25)
           lineColor: rgb(255, 0, 0)
           lineWidth: 2
+          hotkey: r
         -
           id: Green
           fillColor: rgba(0, 128, 0, 0.25)
@@ -61,6 +62,19 @@ _________________
           lineColor: rgb(0, 0, 255)
           lineWidth: 2
 
+If a hotkey is specified for a group, it will only be active if the group was loaded from the config file.  That is, moving to another folder where the config file does not apply will disable the hotkey.  If you want hotkeys to have modifiers (e.g., require that alt, ctrl, or meta be pressed or explicitly NOT pressed), you can add a hotkey section:
+
+::
+
+    ---
+    hotkeys:
+      -
+        key: r
+        ctrl: true
+        alt: false
+        action: group
+        param: Red
+
 UI Settings
 ___________
 

{histomicsui-1.7.1.dev14 → histomicsui-1.7.2.dev2}/histomicsui/web_client/panels/DrawWidget.js

@@ -997,6 +997,14 @@ var DrawWidget = Panel.extend({
         this._setStyleGroup(this._groups.get(prevGroup).toJSON());
     },
 
+    setStyleGroupById(groupId) {
+        const group = this._groups.get(groupId);
+        if (!group) {
+            return;
+        }
+        this._setStyleGroup(group.toJSON());
+    },
+
     getStyleGroup() {
         return this._style;
     },

{histomicsui-1.7.1.dev14 → histomicsui-1.7.2.dev2}/histomicsui/web_client/views/body/ImageView.js

@@ -1168,6 +1168,38 @@ var ImageView = View.extend({
             l: 'line',
             b: 'brush'
         };
+        if (this._hotkeys && this._hotkeys[evt.key.toLowerCase()]) {
+            let used = false;
+            this._hotkeys[evt.key.toLowerCase()].forEach((keyset) => {
+                if (keyset.ctrl !== undefined && evt.originalEvent.ctrlKey !== keyset.ctrl) {
+                    return;
+                }
+                if (keyset.alt !== undefined && evt.originalEvent.altKey !== keyset.alt) {
+                    return;
+                }
+                if (keyset.meta !== undefined && evt.originalEvent.metaKey !== keyset.meta) {
+                    return;
+                }
+                if (keyset.shift !== undefined && evt.originalEvent.shiftKey !== keyset.shift) {
+                    return;
+                }
+                if (keyset.shift === undefined && evt.originalEvent.shiftKey && evt.key.toLowerCase() === keyset.key) {
+                    return;
+                }
+                switch (keyset.action) {
+                    case 'group':
+                        if (this.drawWidget) {
+                            this.drawWidget.setStyleGroupById(keyset.param);
+                            used = true;
+                        }
+                        break;
+                }
+            });
+            if (used) {
+                evt.preventDefault();
+                return;
+            }
+        }
         switch (evt.key) {
             case 'a':
                 this._showOrHideAnnotations();
@@ -1431,7 +1463,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 +1618,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);
@@ -1655,10 +1695,33 @@ var ImageView = View.extend({
             return null;
         });
     },
+    _addHotKey(keyset) {
+        if (keyset.key === undefined || keyset.action === undefined || !keyset.key.length) {
+            return;
+        }
+        keyset = Object.assign({}, keyset);
+        let key = keyset.key;
+        const parts = key.replace(/([+-])(?!$)/g, '\n').split('\n');
+        const modifiers = ['ctrl', 'alt', 'meta', 'shift'];
+        for (let i = 0; i < parts.length - 1; i++) {
+            const mod = parts[i].toLowerCase();
+            if (modifiers.includes(mod)) {
+                keyset[mod] = true;
+            }
+        }
+        key = parts[parts.length - 1];
+        keyset.key = key;
+        key = key.toLowerCase();
+        if (!this._hotkeys[key]) {
+            this._hotkeys[key] = [];
+        }
+        this._hotkeys[key].push(keyset);
+    },
     _getConfig(modelId) {
         if (modelId !== this._folderConfigId) {
             this._folderConfigId = modelId;
             this._folderConfig = {};
+            this._hotkeys = {};
         }
         restRequest({
             url: `folder/${this.model.get('folderId')}/yaml_config/.histomicsui_config.yaml`
@@ -1668,7 +1731,18 @@ var ImageView = View.extend({
                 return;
             }
             this._folderConfig = val;
+            this._hotkeys = {};
+            if (val.hotkeys) {
+                (val.hotkeys || []).forEach((keyset) => {
+                    this._addHotKey(keyset);
+                });
+            }
             if (val.annotationGroups) {
+                (val.annotationGroups.groups || []).forEach((group) => {
+                    if (group.hotkey) {
+                        this._addHotKey({key: group.hotkey, action: 'group', param: group.id});
+                    }
+                });
                 const groups = new StyleCollection();
                 groups.fetch().done(() => {
                     if (!val || this.model.id !== modelId) {
@@ -1703,11 +1777,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.dev14 → histomicsui-1.7.2.dev2/histomicsui.egg-info}/PKG-INFO

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