histomicsui 1.7.3.dev38__tar.gz → 1.7.3.dev47__tar.gz

{histomicsui-1.7.3.dev38 → histomicsui-1.7.3.dev47}/.circleci/config.yml

@@ -37,13 +37,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:
-  py38:
-    executor: toxandnode
-    steps:
-      - checkout
-      - tox:
-          env: py38
-      - coverage
   py39:
     executor: toxandnode
     steps:
@@ -107,13 +100,6 @@ workflows:
   version: 2
   ci:
     jobs:
-      - py38:
-          filters:
-            tags:
-              only: /^v.*/
-            branches:
-              ignore:
-                - gh-pages
       - py39:
           filters:
             tags:
@@ -165,7 +151,6 @@ workflows:
                 - gh-pages
       - release:
           requires:
-            - py38
             - py39
             - py310
             - py311

{histomicsui-1.7.3.dev38 → histomicsui-1.7.3.dev47}/.pre-commit-config.yaml

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

{histomicsui-1.7.3.dev38/histomicsui.egg-info → histomicsui-1.7.3.dev47}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: histomicsui
-Version: 1.7.3.dev38
+Version: 1.7.3.dev47
 Summary: Organize, visualize, and analyze histology images.
 Home-page: https://github.com/DigitalSlideArchive/histomicsui
 Author: Kitware, Inc.
@@ -11,13 +11,12 @@ 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.8
 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.8
+Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: NOTICE
@@ -81,7 +80,7 @@ Installation
 Linux
 =====
 
-In linux with Python 3.8 or newer:
+In linux with Python 3.9 or newer:
 
 Prerequisites:
 

{histomicsui-1.7.3.dev38 → histomicsui-1.7.3.dev47}/README.rst

@@ -39,7 +39,7 @@ Installation
 Linux
 =====
 
-In linux with Python 3.8 or newer:
+In linux with Python 3.9 or newer:
 
 Prerequisites:
 

{histomicsui-1.7.3.dev38 → histomicsui-1.7.3.dev47}/histomicsui/web_client/panels/ZoomWidget.js

@@ -34,6 +34,8 @@ var ZoomWidget = Panel.extend({
     events: _.extend(Panel.prototype.events, {
         'click .h-zoom-button': '_zoomButton',
         'input .h-zoom-slider': '_zoomSliderInput',
+        'focus .h-zoom-value': '_zoomTextFocus',
+        'blur .h-zoom-value': '_zoomTextInput',
         'click .h-download-button-view': '_downloadView',
         'click .h-download-button-area': '_downloadArea',
         'click #h-zoom-range-increase': '_increaseZoomRange',
@@ -45,6 +47,7 @@ var ZoomWidget = Panel.extend({
         this._maxZoom = 8;
         this._minZoom = 0;
         this._cancelSelection = false;
+        this._userEditingText = false;
         // bind the context of the viewer zoom handler
         this._zoomChanged = _.bind(this._zoomChanged, this);
     },
@@ -130,9 +133,9 @@ var ZoomWidget = Panel.extend({
     /**
      * Set the controls to the given magnification level.
      */
-    setMagnification(val) {
+    setMagnification(val, textInput = false) {
         this._setSliderValue(val);
-        this._zoomSliderInput();
+        this._zoomSliderInput(textInput);
     },
 
     /**
@@ -159,13 +162,15 @@ var ZoomWidget = Panel.extend({
     /**
      * Set the slider value to a specific magnification.
      */
-    _setSliderValue(val) {
+    _setSliderValue(val, textInput = false) {
         if (val > 0) {
             val = Math.log2(val) - Math.log2(this._maxMag);
         } else {
             val = 0;
         }
-        this.$('.h-zoom-slider').val(val);
+        if (!textInput) {
+            this.$('.h-zoom-slider').val(val);
+        }
     },
 
     /**
@@ -176,7 +181,9 @@ var ZoomWidget = Panel.extend({
             return;
         }
         this._inZoomChange = true;
-        this.setMagnification(this.zoomToMagnification(this.renderer.zoom()));
+        if (!this._userEditingText) {
+            this.setMagnification(this.zoomToMagnification(this.renderer.zoom()));
+        }
         this._inZoomChange = false;
     },
 
@@ -250,12 +257,14 @@ var ZoomWidget = Panel.extend({
     /**
      * A handler called as the slider is moved.
      */
-    _zoomSliderInput() {
+    _zoomSliderInput(textInput = false) {
         var val = this._getSliderValue();
         if (this.renderer && !this._inZoomChange) {
             this.renderer.zoom(this.magnificationToZoom(val));
         }
-        this.$('.h-zoom-value').text(val.toFixed(1));
+        if (!textInput) {
+            this.$('.h-zoom-value').val(val.toFixed(1));
+        }
     },
 
     _zoomRangeControls() {
@@ -265,6 +274,18 @@ var ZoomWidget = Panel.extend({
         }
     },
 
+    _zoomTextFocus() {
+        this._userEditingText = true;
+    },
+
+    _zoomTextInput() {
+        var val = parseFloat(this.$('.h-zoom-value').val());
+        if (this.renderer && !this._inZoomChange) {
+            this.setMagnification(val, true);
+        }
+        this._userEditingText = false;
+    },
+
     _increaseZoomRange() {
         if (this._increaseZoom2x < this._increaseZoom2xRange.max) {
             this._increaseZoom2x += 1;

{histomicsui-1.7.3.dev38 → histomicsui-1.7.3.dev47}/histomicsui/web_client/stylesheets/panels/zoomWidget.styl

@@ -2,6 +2,7 @@
   .h-zoom-slider
     padding 0
     box-shadow none
+    width calc(100% - 76px)
 
   .h-zoom-value
     border 1px solid #ccc
@@ -9,6 +10,7 @@
     min-width 4em
     padding-left 0
     padding-right 0
+    background-color #fff
 
   .h-zoom-buttons
     margin-top 10px
@@ -31,9 +33,9 @@
   .h-zoom-range-controls
     line-height 0
     display table-cell
-    float left
+    float right
     width 12px
-    padding-left 4px
+    margin-right 4px
 
     button
       padding 0

{histomicsui-1.7.3.dev38 → histomicsui-1.7.3.dev47}/histomicsui/web_client/templates/panels/zoomWidget.pug

@@ -7,7 +7,7 @@ block content
   .input-group
     input.h-zoom-slider.form-control(
       type="range", min=min, max=max, step=step, value=value, disabled=disabled)
-    span.h-zoom-value.input-group-addon #{value}
+    input.h-zoom-value.input-group-addon(value=value)
     span.h-zoom-range-controls
       button#h-zoom-range-increase.btn.btn-sm.btn-default.disabled(title="Increase maximum zoom")
         i.icon-plus

{histomicsui-1.7.3.dev38 → histomicsui-1.7.3.dev47/histomicsui.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: histomicsui
-Version: 1.7.3.dev38
+Version: 1.7.3.dev47
 Summary: Organize, visualize, and analyze histology images.
 Home-page: https://github.com/DigitalSlideArchive/histomicsui
 Author: Kitware, Inc.
@@ -11,13 +11,12 @@ 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.8
 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.8
+Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 License-File: NOTICE
@@ -81,7 +80,7 @@ Installation
 Linux
 =====
 
-In linux with Python 3.8 or newer:
+In linux with Python 3.9 or newer:
 
 Prerequisites:
 

{histomicsui-1.7.3.dev38 → histomicsui-1.7.3.dev47}/setup.py

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