Merge pull request #60 from scipp/fix_figsize

Fix figsize arg for figure1d and figure2d

src/plopp/graphics/fig1d.py

@@ -23,6 +23,7 @@ def __init__(self,
  grid=False,
  crop=None,
  title=None,
+ figsize=None,
  **kwargs):
 
  super().__init__(*nodes)
@@ -31,7 +32,7 @@ def __init__(self,
  self._errorbars = errorbars
  self._mask_color = mask_color
  self._kwargs = kwargs
- self.canvas = Canvas(cbar=False, aspect=aspect, grid=grid)
+ self.canvas = Canvas(cbar=False, aspect=aspect, grid=grid, figsize=figsize)
  self.canvas.yscale = norm
 
  self.render()

src/plopp/graphics/fig2d.py

@@ -25,13 +25,18 @@ def __init__(self,
  crop=None,
  cbar=True,
  title=None,
+ figsize=None,
  **kwargs):
 
  super().__init__(*nodes)
 
  self._scale = {} if scale is None else scale
  self._kwargs = kwargs
- self.canvas = Canvas(cbar=cbar, aspect=aspect, grid=grid, title=title)
+ self.canvas = Canvas(cbar=cbar,
+ aspect=aspect,
+ grid=grid,
+ title=title,
+ figsize=figsize)
  self.colormapper = ColorMapper(cmap=cmap,
  mask_cmap=mask_cmap,
  norm=norm,

tests/graphics/fig1d_test.py

@@ -122,3 +122,10 @@ def test_with_strings_as_bin_edges():
  coords={'x': sc.array(dims=['x'], values=strings, unit='m')})
  fig = Figure1d(input_node(da))
  assert [t.get_text() for t in fig.canvas.ax.get_xticklabels()] == strings
+
+
+def test_figsize():
+ da = dense_data_array(ndim=1)
+ size = (6.1, 3.3)
+ fig = Figure1d(input_node(da), figsize=size)
+ assert np.allclose(fig.canvas.fig.get_size_inches(), size)

tests/graphics/fig2d_test.py

@@ -150,3 +150,10 @@ def test_kwargs_are_forwarded_to_artist():
  fig = Figure2d(input_node(da), rasterized=False)
  artist = list(fig.artists.values())[0]
  assert not artist._mesh.get_rasterized()
+
+
+def test_figsize():
+ da = dense_data_array(ndim=2)
+ size = (8.1, 8.3)
+ fig = Figure2d(input_node(da), figsize=size)
+ assert np.allclose(fig.canvas.fig.get_size_inches(), size)