histomicsui 1.7.3.dev57__tar.gz → 1.7.3.dev64__tar.gz

{histomicsui-1.7.3.dev57 → histomicsui-1.7.3.dev64}/.circleci/config.yml

@@ -38,13 +38,6 @@ commands:
           command: for i in $(seq 1 10); do [ $i -gt 1 ] && echo "retrying $i" && sleep 5; ./codecov --disable search pycov gcov --file .tox/coverage/py_coverage.xml,.tox/coverage/cobertura-coverage.xml && s=0 && break || s=$?; done; (exit $s)
 
 jobs:
-  py39:
-    executor: toxandnode
-    steps:
-      - checkout
-      - tox:
-          env: py39
-      - coverage
   py310:
     executor: toxandnode
     steps:
@@ -101,13 +94,6 @@ workflows:
   version: 2
   ci:
     jobs:
-      - py39:
-          filters:
-            tags:
-              only: /^v.*/
-            branches:
-              ignore:
-                - gh-pages
       - py310:
           filters:
             tags:
@@ -152,7 +138,6 @@ workflows:
                 - gh-pages
       - release:
           requires:
-            - py39
             - py310
             - py311
             - py312

{histomicsui-1.7.3.dev57 → histomicsui-1.7.3.dev64}/.pre-commit-config.yaml

@@ -73,7 +73,7 @@ repos:
   hooks:
     - id: pyupgrade
       args:
-        - --py39-plus
+        - --py310-plus
         - --keep-percent-format
 - repo: https://github.com/pre-commit/mirrors-autopep8
   rev: v2.0.4

{histomicsui-1.7.3.dev57 → histomicsui-1.7.3.dev64}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: histomicsui
-Version: 1.7.3.dev57
+Version: 1.7.3.dev64
 Summary: Organize, visualize, and analyze histology images.
 Home-page: https://github.com/DigitalSlideArchive/histomicsui
 Author: Kitware, Inc.
@@ -11,12 +11,11 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: NOTICE

{histomicsui-1.7.3.dev57 → histomicsui-1.7.3.dev64}/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.dev57 → histomicsui-1.7.3.dev64}/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.dev57 → histomicsui-1.7.3.dev64}/histomicsui.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: histomicsui
-Version: 1.7.3.dev57
+Version: 1.7.3.dev64
 Summary: Organize, visualize, and analyze histology images.
 Home-page: https://github.com/DigitalSlideArchive/histomicsui
 Author: Kitware, Inc.
@@ -11,12 +11,11 @@ Classifier: Development Status :: 5 - Production/Stable
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: NOTICE

{histomicsui-1.7.3.dev57 → histomicsui-1.7.3.dev64}/setup.py

@@ -35,7 +35,6 @@ setup(
         'License :: OSI Approved :: Apache Software License',
         'Natural Language :: English',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
@@ -58,7 +57,7 @@ setup(
     packages=find_packages(exclude=['test', 'test.*']),
     url='https://github.com/DigitalSlideArchive/histomicsui',
     zip_safe=False,
-    python_requires='>=3.9',
+    python_requires='>=3.10',
     entry_points={
         'girder.plugin': [
             'histomicsui = histomicsui:GirderPlugin',

{histomicsui-1.7.3.dev57 → histomicsui-1.7.3.dev64}/tox.ini

@@ -1,6 +1,6 @@
 [tox]
 envlist =
-  py{38,39,310,311,312,313}
+  py{310,311,312,313}
   lint
   lintclient