Fix missing heatmap cell annotations, only add heatmap title annotation if there is a title

Author: robertoffmoura

plotly/Test_plotlyfig.m

@@ -2589,9 +2589,9 @@ function testHeatmapTextColorBrightCells(tc)
 
             p = plotlyfig(fig,"visible","off");
 
-            tc.verifyNumElements(p.layout.annotations, numel(data)+1);
+            tc.verifyNumElements(p.layout.annotations, numel(data));
             % All cells should have black text due to bright background
-            for i = 2:numel(p.layout.annotations)-1
+            for i = 1:numel(p.layout.annotations)
                 ann = p.layout.annotations{i};
                 tc.verifyEqual(ann.font.color, "rgb(0,0,0)"); % Black text
             end
@@ -2605,12 +2605,39 @@ function testHeatmapTextColorDarkCells(tc)
 
             p = plotlyfig(fig,"visible","off");
 
-            tc.verifyNumElements(p.layout.annotations, numel(data)+1);
+            tc.verifyNumElements(p.layout.annotations, numel(data));
             % All cells should have white text due to dark background
-            for i = 2:numel(p.layout.annotations)-1
+            for i = 1:numel(p.layout.annotations)
                 ann = p.layout.annotations{i};
                 tc.verifyEqual(ann.font.color, "rgb(255,255,255)"); % White text
             end
         end
+
+        function testHeatmapCellTextAnnotations(tc)
+            fig = figure("Visible","off");
+            data = [1 2; 3 4];
+            heatmap(data);
+
+            p = plotlyfig(fig,"visible","off");
+
+            tc.verifyNumElements(p.layout.annotations, numel(data));
+            actualStrings = cellfun(@(ann) ann.text, p.layout.annotations);
+            expectedStrings = arrayfun(@(v) string(v), data(:));
+            tc.verifyEqual(sort(actualStrings(:)), sort(expectedStrings(:)));
+        end
+
+        function testHeatmapTitleAnnotation(tc)
+            fig = figure("Visible","off");
+            data = [1 2; 3 4];
+            titleString = "title";
+            heatmap(data);
+            title(titleString);
+
+            p = plotlyfig(fig,"visible","off");
+
+            tc.verifyNumElements(p.layout.annotations, numel(data)+1);
+            actualStrings = cellfun(@(ann) ann.text, p.layout.annotations);
+            tc.verifyNotEmpty(actualStrings(contains(actualStrings, titleString)));
+        end
     end
 end

plotly/plotlyfig.m

@@ -629,7 +629,11 @@ function validate(obj)
             for n = 1:obj.State.Figure.NumTexts
                 try
                     if obj.PlotOptions.is_headmap_axis
-                        updateHeatmapAnnotation(obj,n);
+                        if ~isempty(obj.State.Text(n).Handle)
+                            nanns = length(obj.layout.annotations);
+                            axIndex = nanns + obj.getAxisIndex(obj.State.Text(n).AssociatedAxis);
+                            obj.layout.annotations{axIndex} = getHeatmapTitleAnnotation(obj,n);
+                        end
                         obj.PlotOptions.CleanFeedTitle = false;
                     elseif obj.PlotlyDefaults.isGeoaxis
                         % TODO

plotly/plotlyfig_aux/core/updateHeatmapAnnotation.m renamed to plotly/plotlyfig_aux/core/getHeatmapTitleAnnotation.m

@@ -1,4 +1,4 @@
-function obj = updateHeatmapAnnotation(obj,anIndex)
+function ann = getHeatmapTitleAnnotation(obj,anIndex)
     %-------X/YLABEL FIELDS--------%
     % title...[DONE]
     % titlefont.size...[DONE]
@@ -29,42 +29,35 @@
     % bgcolor: ...[DONE]
     % opacity: ...[NOT SUPPORTED IN MATLAB]
 
-    %-AXIS INDEX-%
-    nanns = length(obj.layout.annotations);
-    axIndex = nanns + obj.getAxisIndex(obj.State.Text(anIndex).AssociatedAxis);
-
-    %-CHECK FOR MULTIPLE AXES-%
     [xsource, ysource] = findSourceAxis(obj,anIndex);
 
-    %-get heatmap title name-%
     title_name = obj.State.Text(anIndex).Handle;
-
-    obj.layout.annotations{axIndex}.showarrow = false;
+    ann.showarrow = false;
 
     %-anchor title to paper-%
     if obj.State.Text(anIndex).Title
-        obj.layout.annotations{axIndex}.xref = "paper";
-        obj.layout.annotations{axIndex}.yref = "paper";
+        ann.xref = "paper";
+        ann.yref = "paper";
     else
-        obj.layout.annotations{axIndex}.xref = "x" + xsource;
-        obj.layout.annotations{axIndex}.yref = "y" + ysource;
+        ann.xref = "x" + xsource;
+        ann.yref = "y" + ysource;
     end
 
-    obj.layout.annotations{axIndex}.xanchor = "middle";
-    obj.layout.annotations{axIndex}.align = "middle";
-    obj.layout.annotations{axIndex}.yanchor = "top";
-    obj.layout.annotations{axIndex}.text = sprintf("<b>%s</b>", title_name);
-    obj.layout.annotations{axIndex}.font.size = 14;
+    ann.xanchor = "middle";
+    ann.align = "middle";
+    ann.yanchor = "top";
+    ann.text = sprintf("<b>%s</b>", title_name);
+    ann.font.size = 14;
 
     if obj.State.Text(anIndex).Title
         %-AXIS DATA-%
         xaxis = obj.layout.("xaxis" + xsource);
         yaxis = obj.layout.("yaxis" + ysource);
 
-        obj.layout.annotations{axIndex}.x = mean(xaxis.domain);
-        obj.layout.annotations{axIndex}.y = (yaxis.domain(2) + 0.04);
+        ann.x = mean(xaxis.domain);
+        ann.y = (yaxis.domain(2) + 0.04);
     else
-        obj.layout.annotations{axIndex}.x = text_data.Position(1);
-        obj.layout.annotations{axIndex}.y = text_data.Position(2);
+        ann.x = text_data.Position(1);
+        ann.y = text_data.Position(2);
     end
 end

plotly/plotlyfig_aux/handlegraphics/updateHeatmap.m

@@ -68,7 +68,7 @@
     values = heat_data.ColorDisplayData';
     for i = 1:m
         for j = 1:n
-            ann.text = num2str(round(cdata(j,i), 2));
+            ann.text = string(num2str(round(cdata(j,i), 2)));
             ann.x = i-1;
             ann.y = j-1;
             ann.showarrow = false;
@@ -81,7 +81,7 @@
                 col = [255,255,255];
             end
             ann.font.color = getStringColor(col);
-            annotations{i*(m-1)+j} = ann;
+            annotations{(i-1)*n+j} = ann;
         end
     end