Fix axis detection logic for heatmaps

Author: robertoffmoura

plotly/Test_plotlyfig.m

@@ -1139,6 +1139,8 @@ function testHeatmapData(tc)
 
             tc.verifyNumElements(p.data, 1);
             tc.verifyEqual(rmfield(p.data{1}, "colorscale"), struct( ...
+                xaxis = "x1", ...
+                yaxis = "y1", ...
                 type = "heatmap", ...
                 x = {num2cell(num2str((1:5)'))}, ...
                 y = {num2cell(num2str(flip(1:5)'))}, ...
@@ -2443,6 +2445,47 @@ function testSemilogxPlotData(tc)
             ), AbsTol=1e-15);
         end
 
+        function testTiledLayoutHeatmap(tc)
+            fig = figure("Visible","off");
+            data = [1 2; 3 4];
+            tiledlayout(2,2);
+            for i = 1:4
+                nexttile;
+                heatmap(data);
+            end
+
+            p = plotlyfig(fig,"visible","off");
+
+            tc.verifyNumElements(p.data, 4);
+            tc.verifyEqual(rmfield(p.data{1}, "colorscale"), struct( ...
+                xaxis = "x1", ...
+                yaxis = "y1", ...
+                type = "heatmap", ...
+                x = {num2cell(num2str((1:2)'))}, ...
+                y = {num2cell(num2str(flip(1:2)'))}, ...
+                z = flip(data), ...
+                connectgaps = false, ...
+                hoverongaps = false, ...
+                hoverinfo = "text", ...
+                text = flip(data), ...
+                hoverlabel = struct( ...
+                    bgcolor = "white" ...
+                ), ...
+                showscale = true, ...
+                colorbar = struct( ...
+                    x = 0.87, ...
+                    y = 0.52, ...
+                    ypad = 55, ...
+                    xpad = 0, ...
+                    outlinecolor = "rgb(150,150,150)" ...
+                ), ...
+                visible = true, ...
+                opacity = 0.9500, ...
+                showlegend = false, ...
+                name = "" ...
+            ));
+        end
+
         function testGroupedBarPlotData(tc)
             fig = figure("Visible","off");
             y = [2 5 3; 6 1 4; 3 7 2];

plotly/plotlyfig.m

@@ -409,7 +409,7 @@ function validate(obj)
 
             % find axes of figure
             ax = findobj(obj.State.Figure.Handle, ...
-                {'Type','axes','-or','Type','PolarAxes'}, ...
+                {'Type','axes','-or','Type','PolarAxes','-or','Type','heatmap'}, ...
                 '-and',{'Tag','','-or','Tag','PlotMatrixBigAx', ...
                         '-or','Tag','PlotMatrixScatterAx', ...
                         '-or','Tag','PlotMatrixHistAx'});

plotly/plotlyfig_aux/core/updateAxis.m

@@ -52,7 +52,7 @@
         axisData.FontUnits = 'points';
     end
 
-    %-check if headmap axis-%
+    %-check if heatmap axis-%
     isHeatmapAxis = axisData.Type == "heatmap";
     obj.PlotOptions.is_headmap_axis = isHeatmapAxis;
 
@@ -64,13 +64,10 @@
     if isHeatmapAxis
         xaxis = extractHeatmapAxisData(obj,axisData, 'X');
         xExponentFormat = 0;
-    else
-        [xaxis, xExponentFormat] = extractAxisData(obj,axisData, 'X');
-    end
-    if isHeatmapAxis
         yaxis = extractHeatmapAxisData(obj,axisData, 'Y');
         yExponentFormat = 0;
     else
+        [xaxis, xExponentFormat] = extractAxisData(obj,axisData, 'X');
         [yaxis, yExponentFormat] = extractAxisData(obj,axisData, 'Y');
     end
 

plotly/plotlyfig_aux/handlegraphics/updateHeatmap.m

@@ -1,6 +1,11 @@
 function data = updateHeatmap(obj,heatIndex)
     %-HEATMAP DATA STRUCTURE- %
     heat_data = obj.State.Plot(heatIndex).Handle;
+    axIndex = obj.getAxisIndex(obj.State.Plot(heatIndex).AssociatedAxis);
+    [xSource, ySource] = findSourceAxis(obj,axIndex);
+
+    data.xaxis = "x" + xSource;
+    data.yaxis = "y" + ySource;
 
     data.type = "heatmap";