Convert x and y to cell if scalar after the data is updated

robertoffmoura · robertoffmoura · commit 0473653c4a16 · 2025-04-07T12:11:16.000+01:00
diff --git a/plotly/Test_plotlyfig.m b/plotly/Test_plotlyfig.m
@@ -218,6 +218,19 @@ function testScatterPlotData(tc)
             ));
         end
 
+        function testSingleScatterPlotData(tc)
+            fig = figure("Visible","off");
+            x = 1;
+            y = 1;
+            scatter(x,y);
+
+            p = plotlyfig(fig,"visible","off");
+
+            tc.verifyNumElements(p.data, 1);
+            tc.verifyEqual(p.data{1}.x, {x});
+            tc.verifyEqual(p.data{1}.y, {y});
+        end
+
         function testScatter3DPlotData(tc)
             fig = figure("Visible","off");
             [X,Y,Z] = sphere(16);
@@ -410,6 +423,36 @@ function testSingleBarPlotData(tc)
             ));
         end
 
+        function testDateBarPlotData(tc)
+            fig = figure("Visible","off");
+            x = datetime("today");
+            y = 1;
+            bar(x,y)
+
+            p = plotlyfig(fig,"visible","off");
+
+            tc.verifyNumElements(p.data, 1);
+            tc.verifyEqual(p.data{1}, struct( ...
+                "xaxis", "x1", ...
+                "yaxis", "y1", ...
+                "type", "bar", ...
+                "name", '', ...
+                "visible", true, ...
+                "orientation", "v", ...
+                "x", {{x}}, ...
+                "y", {{y}}, ...
+                "marker", struct( ...
+                    "line", struct( ...
+                        "width", 0.5, ...
+                        "color", "rgba(0,0,0,1.000000)", ...
+                        "dash", "solid" ...
+                    ), ...
+                    "color", "rgba(0,114,189,1.000000)" ...
+                ), ...
+                "showlegend", true ...
+            ));
+        end
+
         function testVerticalBarPlotData(tc)
             fig = figure("Visible","off");
             x = 1:12;
diff --git a/plotly/plotlyfig_aux/core/updateData.m b/plotly/plotlyfig_aux/core/updateData.m
@@ -201,6 +201,14 @@
             obj.data{dataIndex}.x = convertDuration(obj.data{dataIndex}.x);
         end
 
+        % Plotly requires x and y to be iterable
+        if isscalar(obj.data{dataIndex}.x)
+            obj.data{dataIndex}.x = {obj.data{dataIndex}.x};
+        end
+        if isscalar(obj.data{dataIndex}.y)
+            obj.data{dataIndex}.y = {obj.data{dataIndex}.y};
+        end
+
         % check for xaxis categories
         if strcmpi(xaxis.type, "category") && ...
                 ~any(strcmp(obj.data{dataIndex}.type,["heatmap" "box"]))
diff --git a/plotly/plotlyfig_aux/handlegraphics/updateBar.m b/plotly/plotlyfig_aux/handlegraphics/updateBar.m
@@ -79,14 +79,6 @@
             obj.data{barIndex}.y = xData;
     end
 
-    % Plotly requires x and y to be iterable
-    if isscalar(obj.data{barIndex}.x)
-        obj.data{barIndex}.x = {obj.data{barIndex}.x};
-    end
-    if isscalar(obj.data{barIndex}.y)
-        obj.data{barIndex}.y = {obj.data{barIndex}.y};
-    end
-
     %-trace settings-%
     markerline = extractAreaLine(barData);
 
diff --git a/plotly/plotlyfig_aux/handlegraphics/updateLineseries.m b/plotly/plotlyfig_aux/handlegraphics/updateLineseries.m
@@ -59,12 +59,6 @@
     else
         data.x = xData;
         data.y = yData;
-
-        if isscalar(xData) % plotly has trouble plotting a single point
-            data.x = repmat(data.x,[1,2]);
-            data.y = repmat(data.y,[1,2]);
-        end
-
         if isPlot3D
             data.z = zData;
             obj.PlotOptions.is3d = true;
diff --git a/plotly/plotlyfig_aux/handlegraphics/updateScatter.m b/plotly/plotlyfig_aux/handlegraphics/updateScatter.m
@@ -29,17 +29,8 @@
     data.x = xData;
     data.y = yData;
 
-    isSingle = isscalar(data.x);
-    if isSingle % fix single point plots
-        data.x = repelem(data.x,1,2);
-        data.y = repelem(data.y,1,2);
-    end
-
     if isScatter3D
         data.z = plotData.ZData;
-        if isSingle
-            data.z = repelem(data.z,1,2);
-        end
     end
 
     %-set trace marker-%
