Merge branch 'develop' into dev-define-engines-abc

Author: shaneahmed

requirements/requirements.txt

@@ -1,7 +1,7 @@
 # torch installation
 --extra-index-url https://download.pytorch.org/whl/cu118; sys_platform != "darwin"
 albumentations>=1.3.0
-bokeh>=3.1.1, <3.5.0
+bokeh>=3.1.1
 Click>=8.1.3
 defusedxml>=0.7.1
 filelock>=3.9.0

tiatoolbox/visualization/bokeh_app/main.py

@@ -28,10 +28,10 @@
     Column,
     ColumnDataSource,
     CustomJS,
+    CustomJSTickFormatter,
     DataTable,
     Div,
     Dropdown,
-    FuncTickFormatter,
     Glyph,
     HoverTool,
     HTMLTemplateFormatter,
@@ -630,7 +630,7 @@ def __init__(self: ViewerState, slide_path: str | Path) -> None:
         self.thickness = -1
         self.model_mpp = 0
         self.init = True
-        self.micron_formatter = FuncTickFormatter(
+        self.micron_formatter = CustomJSTickFormatter(
             args={"mpp": 0.1},
             code="""
                 return Math.round(tick*mpp)