Refactor updateLineseries.m

robertoffmoura · robertoffmoura · commit c40ded3835f9 · 2025-04-07T12:11:15.000+01:00
diff --git a/plotly/plotlyfig_aux/core/updateData.m b/plotly/plotlyfig_aux/core/updateData.m
@@ -9,7 +9,7 @@
     elseif ismember("contour3", lower(obj.PlotOptions.TreatAs))
         updateContour3(obj, dataIndex);
     elseif ismember("ezpolar", lower(obj.PlotOptions.TreatAs))
-        updateLineseries(obj, dataIndex);
+        obj.data{dataIndex} = updateLineseries(obj, dataIndex);
     elseif ismember("coneplot", lower(obj.PlotOptions.TreatAs))
         updateConeplot(obj, dataIndex);
     elseif ismember("bar3", lower(obj.PlotOptions.TreatAs))
@@ -58,7 +58,7 @@
                 elseif ismember("ternplot", lower(obj.PlotOptions.TreatAs))
                     updateTernaryPlot(obj, dataIndex);
                 else
-                    updateLineseries(obj, dataIndex);
+                    obj.data{dataIndex} = updateLineseries(obj, dataIndex);
                 end
             case "constantline"
                 updateConstantLine(obj, dataIndex);
@@ -129,7 +129,7 @@
             case "errorbarseries"
                 updateErrorbarseries(obj,dataIndex);
             case "lineseries"
-                updateLineseries(obj, dataIndex);
+                obj.data{dataIndex} = updateLineseries(obj, dataIndex);
             case "quiver"
                 updateQuiver(obj, dataIndex);
             case "quivergroup"
@@ -157,7 +157,7 @@
             case "surfaceplot"
                 updateSurfaceplot(obj,dataIndex);
             case "implicitfunctionline"
-                updateLineseries(obj, dataIndex);
+                obj.data{dataIndex} = updateLineseries(obj, dataIndex);
                 %--Plotly supported MATLAB group plot objects--%
             case {"hggroup","group"}
                 % check for boxplot
diff --git a/plotly/plotlyfig_aux/handlegraphics/updateBaseline.m b/plotly/plotlyfig_aux/handlegraphics/updateBaseline.m
@@ -1,6 +1,6 @@
 function obj = updateBaseline(obj, baseIndex)
     %-UPDATE LINESERIES-%
-    updateLineseries(obj, baseIndex);
+    obj.data{baseIndex} = updateLineseries(obj, baseIndex);
 
     %-baseline showlegend-%
     obj.data{baseIndex}.showlegend = obj.PlotlyDefaults.ShowBaselineLegend;
diff --git a/plotly/plotlyfig_aux/handlegraphics/updateErrorbar.m b/plotly/plotlyfig_aux/handlegraphics/updateErrorbar.m
@@ -12,7 +12,7 @@
 	xNegativeDelta = plotData.XNegativeDelta;
 
 	%-set trace-%
-	updateLineseries(obj, plotIndex);
+	obj.data{plotIndex} = updateLineseries(obj, plotIndex);
 
 	obj.data{plotIndex}.error_y.visible = true;
 	obj.data{plotIndex}.error_x.visible = true;
diff --git a/plotly/plotlyfig_aux/handlegraphics/updateErrorbarseries.m b/plotly/plotlyfig_aux/handlegraphics/updateErrorbarseries.m
@@ -21,7 +21,7 @@
     errorbar_line_child_data = errorbar_child(2);
 
     %-UPDATE LINESERIES-%
-    updateLineseries(obj, errorbarIndex);
+    obj.data{errorbarIndex} = updateLineseries(obj, errorbarIndex);
 
     obj.data{errorbarIndex}.error_y.visible = true;
     obj.data{errorbarIndex}.error_y.type = 'data';
diff --git a/plotly/plotlyfig_aux/handlegraphics/updateLineseries.m b/plotly/plotlyfig_aux/handlegraphics/updateLineseries.m
@@ -1,4 +1,4 @@
-function updateLineseries(obj, plotIndex)
+function data = updateLineseries(obj, plotIndex)
     %-INITIALIZATIONS-%
 
     axIndex = obj.getAxisIndex(obj.State.Plot(plotIndex).AssociatedAxis);
@@ -17,14 +17,11 @@ function updateLineseries(obj, plotIndex)
         [xSource, ySource] = findSourceAxis(obj,axIndex);
     end
 
-    %-check if polar plot-%
     treatAs = lower(obj.PlotOptions.TreatAs);
     isPolar = ismember('compass', treatAs) || ismember('ezpolar', treatAs);
 
-    %-check is 3D plot-%
     isPlot3D = isfield(plotData, "ZData") && ~isempty(plotData.ZData);
 
-    %-get trace data-%
     xData = plotData.XData;
     yData = plotData.YData;
 
@@ -38,55 +35,48 @@ function updateLineseries(obj, plotIndex)
         zData = plotData.ZData;
     end
 
-    %-set trace-%
     if isPolar
-        obj.data{plotIndex}.type = "scatterpolar";
+        data.type = "scatterpolar";
         updateDefaultPolaraxes(obj, plotIndex)
-        obj.data{plotIndex}.subplot = sprintf("polar%d", xSource+1);
+        data.subplot = sprintf("polar%d", xSource+1);
     elseif ~isPlot3D
-        obj.data{plotIndex}.type = "scatter";
-        obj.data{plotIndex}.xaxis = "x" + xSource;
-        obj.data{plotIndex}.yaxis = "y" + ySource;
+        data.type = "scatter";
+        data.xaxis = "x" + xSource;
+        data.yaxis = "y" + ySource;
     else
-        obj.data{plotIndex}.type = "scatter3d";
-        obj.data{plotIndex}.scene = "scene" + xSource;
+        data.type = "scatter3d";
+        data.scene = "scene" + xSource;
         updateScene(obj, plotIndex);
     end
 
-    obj.data{plotIndex}.visible = strcmp(plotData.Visible,"on");
-    obj.data{plotIndex}.name = plotData.DisplayName;
-    obj.data{plotIndex}.mode = getScatterMode(plotData);
+    data.visible = plotData.Visible == "on";
+    data.name = plotData.DisplayName;
+    data.mode = getScatterMode(plotData);
 
-    %-set trace data-%
     if isPolar
-        obj.data{plotIndex}.r = rData;
-        obj.data{plotIndex}.theta = thetaData;
+        data.r = rData;
+        data.theta = thetaData;
     else
-        obj.data{plotIndex}.x = xData;
-        obj.data{plotIndex}.y = yData;
+        data.x = xData;
+        data.y = yData;
 
         if isscalar(xData) % plotly has trouble plotting a single point
-            obj.data{plotIndex}.x = repmat(obj.data{plotIndex}.x,[1,2]);
-            obj.data{plotIndex}.y = repmat(obj.data{plotIndex}.y,[1,2]);
+            data.x = repmat(data.x,[1,2]);
+            data.y = repmat(data.y,[1,2]);
         end
 
         if isPlot3D
-            obj.data{plotIndex}.z = zData;
+            data.z = zData;
             obj.PlotOptions.is3d = true;
         end
     end
 
-    %-set trace line-%
-    obj.data{plotIndex}.line = extractLineLine(plotData);
+    data.line = extractLineLine(plotData);
     if isPolar
-        obj.data{plotIndex}.line.width = obj.data{plotIndex}.line.width * 1.5;
+        data.line.width = data.line.width * 1.5;
     end
-
-    %-set trace marker-%
-    obj.data{plotIndex}.marker = extractLineMarker(plotData);
-
-    %-set trace legend-%
-    obj.data{plotIndex}.showlegend = getShowLegend(plotData);
+    data.marker = extractLineMarker(plotData);
+    data.showlegend = getShowLegend(plotData);
 end
 
 function updateScene(obj, dataIndex)
diff --git a/plotly/plotlyfig_aux/handlegraphics/updateQuivergroup.m b/plotly/plotlyfig_aux/handlegraphics/updateQuivergroup.m
@@ -11,7 +11,7 @@
     for n = 1:2;
         %-update line -%
         obj.State.Plot(quiverIndex).Handle = quiver_child(n);
-        updateLineseries(obj,quiverIndex);
+        obj.data{quiverIndex} = updateLineseries(obj,quiverIndex);
 
         %update xdata and ydata
         xdata = [xdata obj.data{quiverIndex}.x];
diff --git a/plotly/plotlyfig_aux/handlegraphics/updateStair.m b/plotly/plotlyfig_aux/handlegraphics/updateStair.m
@@ -1,7 +1,4 @@
 function obj = updateStair(obj, dataIndex)
-    %-update line-%
-    updateLineseries(obj, dataIndex);
-
-    %-stair shape-%
+    obj.data{dataIndex} = updateLineseries(obj, dataIndex);
     obj.data{dataIndex}.line.shape = "hv";
 end
diff --git a/plotly/plotlyfig_aux/handlegraphics/updateStairseries.m b/plotly/plotlyfig_aux/handlegraphics/updateStairseries.m
@@ -2,12 +2,9 @@
     %-store original stair handle-%
     stair_group = obj.State.Plot(dataIndex).Handle;
 
-    %-get children-%
-    stair_child = stair_group.Children;
-
     %-update line -%
-    obj.State.Plot(dataIndex).Handle = stair_child(1);
-    updateLineseries(obj,dataIndex);
+    obj.State.Plot(dataIndex).Handle = stair_group.Children(1);
+    obj.data{dataIndex} = updateLineseries(obj,dataIndex);
 
     %-revert handle-%
     obj.State.Plot(dataIndex).Handle = stair_group;
diff --git a/plotly/plotlyfig_aux/handlegraphics/updateStemseries.m b/plotly/plotlyfig_aux/handlegraphics/updateStemseries.m
@@ -7,15 +7,14 @@
 
     %-update line-%
     obj.State.Plot(dataIndex).Handle = stem_child(1);
-    updateLineseries(obj,dataIndex);
-    stem_temp_data = obj.data{dataIndex};
+    stem_temp_data = updateLineseries(obj,dataIndex);
 
     %-scatter mode-%
     stem_temp_data.mode = 'lines+markers';
 
     %-update marker-%
     obj.State.Plot(dataIndex).Handle = stem_child(2);
-    updateLineseries(obj,dataIndex);
+    stem_temp_data = updateLineseries(obj,dataIndex);
 
     stem_temp_data.marker = obj.data{dataIndex}.marker;
 
