Merge branch 'master' into imshow-animation

doc/requirements.txt

@@ -29,3 +29,4 @@ cufflinks==0.17.3
 kaleido
 umap-learn
 pooch
+wget

packages/python/plotly/plotly/express/_imshow.py

@@ -1,12 +1,11 @@
 import plotly.graph_objs as go
 from _plotly_utils.basevalidators import ColorscaleValidator
 from ._core import apply_default_cascade, init_figure, configure_animation_controls
-from io import BytesIO
-import base64
 from .imshow_utils import rescale_intensity, _integer_ranges, _integer_types
 import pandas as pd
 import numpy as np
 import itertools
+from plotly.utils import image_array_to_data_uri
 
 try:
     import xarray
@@ -247,9 +246,11 @@ def imshow(
     )  # 0, 1, or 2
     facet_label = None
     animation_label = None
+    img_is_xarray = False
     # ----- Define x and y, set labels if img is an xarray -------------------
     if xarray_imported and isinstance(img, xarray.DataArray):
         dims = list(img.dims)
+        img_is_xarray = True
         if facet_col is not None:
             facet_slices = img.coords[img.dims[facet_col]].values
             _ = dims.pop(facet_col)
@@ -462,7 +463,7 @@ def imshow(
                     axis=-1,
                 )
             img_str = [
-                _array_to_b64str(
+                image_array_to_data_uri(
                     img_rescaled[index_tup],
                     backend=binary_backend,
                     compression=binary_compression_level,
@@ -472,13 +473,22 @@ def imshow(
             ]
 
             traces = [
-                go.Image(source=img_str_slice, name=str(i))
+                go.Image(source=img_str_slice, name=str(i), x0=x0, y0=y0, dx=dx, dy=dy)
                 for i, img_str_slice in enumerate(img_str)
             ]
         else:
             colormodel = "rgb" if img.shape[-1] == 3 else "rgba256"
             traces = [
-                go.Image(z=img[index_tup], zmin=zmin, zmax=zmax, colormodel=colormodel)
+                go.Image(
+                    z=img[index_tup],
+                    zmin=zmin,
+                    zmax=zmax,
+                    colormodel=colormodel,
+                    x0=x0,
+                    y0=y0,
+                    dx=dx,
+                    dy=dy,
+                )
                 for index_tup in itertools.product(*iterables)
             ]
         layout = {}