Skip to content

Commit a0c4687

Browse files
Replace inefficient eval statements
1 parent 7466f65 commit a0c4687

40 files changed

+112
-121
lines changed

plotly/plotlyfig_aux/core/updateHeatmapAnnotation.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@
8383
if obj.State.Text(anIndex).Title
8484

8585
%-AXIS DATA-%
86-
eval(['xaxis = obj.layout.xaxis' num2str(xsource) ';']);
87-
eval(['yaxis = obj.layout.yaxis' num2str(ysource) ';']);
86+
xaxis = obj.layout.("xaxis" + xsource);
87+
yaxis = obj.layout.("yaxis" + ysource);
8888

8989
%-x position-%
9090
obj.layout.annotations{axIndex}.x = mean(xaxis.domain);

plotly/plotlyfig_aux/core/updateLegendMultipleAxes.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626

2727
axIndex = obj.getAxisIndex(obj.State.Plot(traceIndex).AssociatedAxis);
2828
[xSource, ySource] = findSourceAxis(obj, axIndex);
29-
xAxis = eval(sprintf('obj.layout.xaxis%d', xSource));
30-
yAxis = eval(sprintf('obj.layout.yaxis%d', xSource));
29+
xAxis = obj.layout.("xaxis" + xSource);
30+
yAxis = obj.layout.("yaxis" + xSource);
3131

3232
allDomain(traceIndex, 1) = max(xAxis.domain);
3333
allDomain(traceIndex, 2) = max(yAxis.domain);

plotly/plotlyfig_aux/handlegraphics/updateAnimatedLine.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ function updateAnimatedLine(obj,plotIndex)
2020
[xsource, ysource] = findSourceAxis(obj,axIndex);
2121

2222
%-AXIS DATA-%
23-
eval(['xaxis = obj.layout.xaxis' num2str(xsource) ';']);
24-
eval(['yaxis = obj.layout.yaxis' num2str(ysource) ';']);
23+
xaxis = obj.layout.("xaxis" + xsource);
24+
yaxis = obj.layout.("yaxis" + ysource);
2525

2626
%-------------------------------------------------------------------------%
2727

plotly/plotlyfig_aux/handlegraphics/updateBar3.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
axis_data = ancestor(bar_data.Parent,'axes');
1515

1616
%-GET SCENE-%
17-
eval(['scene = obj.layout.scene' num2str(xsource) ';']);
17+
scene = obj.layout.("scene" + xsource);
1818

1919
%-------------------------------------------------------------------------%
2020

plotly/plotlyfig_aux/handlegraphics/updateBar3h.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
axis_data = ancestor(bar_data.Parent,'axes');
1515

1616
%-GET SCENE-%
17-
eval(['scene = obj.layout.scene' num2str(xsource) ';']);
17+
scene = obj.layout.("scene" + xsource);
1818

1919
%-------------------------------------------------------------------------%
2020

plotly/plotlyfig_aux/handlegraphics/updateBarseries.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@
6868
[xsource, ysource] = findSourceAxis(obj,axIndex);
6969

7070
%-AXIS DATA-%
71-
eval(['xaxis = obj.layout.xaxis' num2str(xsource) ';']);
72-
eval(['yaxis = obj.layout.yaxis' num2str(ysource) ';']);
71+
xaxis = obj.layout.("xaxis" + xsource);
72+
yaxis = obj.layout.("yaxis" + ysource);
7373

7474
%-------------------------------------------------------------------------%
7575

plotly/plotlyfig_aux/handlegraphics/updateBoxplot.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@
9595
[xsource, ysource] = findSourceAxis(obj,axIndex);
9696

9797
%-AXIS DATA-%
98-
eval(['xaxis = obj.layout.xaxis' num2str(xsource) ';']);
99-
eval(['yaxis = obj.layout.yaxis' num2str(ysource) ';']);
98+
xaxis = obj.layout.("xaxis" + xsource);
99+
yaxis = obj.layout.("yaxis" + ysource);
100100

101101
%---------------------------------------------------------------------%
102102

plotly/plotlyfig_aux/handlegraphics/updateCategoricalHistogram.m

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
[xsource, ysource] = findSourceAxis(obj,axIndex);
5959

6060
%-AXIS DATA-%
61-
eval(['xaxis = obj.layout.xaxis' num2str(xsource) ';']);
62-
eval(['yaxis = obj.layout.yaxis' num2str(ysource) ';']);
61+
xaxis = obj.layout.("xaxis" + xsource);
62+
yaxis = obj.layout.("yaxis" + ysource);
6363

6464
%-------------------------------------------------------------------------%
6565

@@ -90,9 +90,9 @@
9090
xmax = (hist_data.NumDisplayBins - 1) + gap;
9191

9292
t = 'category';
93-
eval(['obj.layout.xaxis' num2str(xsource) '.type = t;']);
94-
eval(['obj.layout.xaxis' num2str(xsource) '.autotick = false;']);
95-
eval(['obj.layout.xaxis' num2str(xsource) '.range = {xmin, xmax};']);
93+
obj.layout.("xaxis" + xsource).type = t;
94+
obj.layout.("xaxis" + xsource).autotick = false;
95+
obj.layout.("xaxis" + xsource).range = {xmin, xmax};
9696

9797
%-------------------------------------------------------------------------%
9898

plotly/plotlyfig_aux/handlegraphics/updateComet.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ function updateComet(obj,plotIndex)
7575
[xsource, ysource] = findSourceAxis(obj,axIndex);
7676

7777
%-AXIS DATA-%
78-
eval(['xaxis = obj.layout.xaxis' num2str(xsource) ';']);
79-
eval(['yaxis = obj.layout.yaxis' num2str(ysource) ';']);
78+
xaxis = obj.layout.("xaxis" + xsource);
79+
yaxis = obj.layout.("yaxis" + ysource);
8080

8181
%-------------------------------------------------------------------------%
8282

plotly/plotlyfig_aux/handlegraphics/updateConeplot.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[xsource, ysource] = findSourceAxis(obj,axIndex);
1111

1212
%-SCENE DATA-%
13-
eval(['scene = obj.layout.scene' num2str(xsource) ';']);
13+
scene = obj.layout.("scene" + xsource);
1414

1515
%-------------------------------------------------------------------------%
1616

0 commit comments

Comments
 (0)