Merge branch 'master' into 28470_axis_scale_settings_swapped

docs/source/release/v5.1.0/mantidworkbench.rst

@@ -39,5 +39,6 @@ Bugfixes
 - Opening figure options on a plot with an empty legend no longer causes an unhandled exception.
 - Fixed being able to zoom in and out of colorbars on colorfill plots.
 - Fixed the default axis scale settings applying to the wrong axis.
+- Performing an overplot by dragging workspaces onto colorfill plots now correctly replaces the workspace.
 
 :ref:`Release 5.1.0 <v5.1.0>`

qt/applications/workbench/workbench/plotting/figurewindow.py

@@ -126,7 +126,7 @@ class FigureWindow(QMainWindow, ObservingView):
         fig = self._canvas.figure
         fig_type = figure_type(fig, ax)
         if fig_type == FigureType.Image:
-            pcolormesh_from_names(names, fig=fig, ax=ax)
+            pcolormesh_from_names(names, fig=fig)
         else:
             plot_from_names(names, errors=(fig_type == FigureType.Errorbar),
                             overplot=ax, fig=fig)