Skip to content

Commit c5839bd

Browse files
robertoffmourarobertoffmoura
committed
Simplify legend display logic and use double quotes
1 parent ce1bbbd commit c5839bd

25 files changed

+128
-238
lines changed

‎plotly/plotlyfig_aux/handlegraphics/updateAnimatedLine.m‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -94,18 +94,13 @@ function updateAnimatedLine(obj,plotIndex)
9494
obj.data{plotIndex}.marker = extractLineMarker(plotData);
9595

9696
%-scatter showlegend-%
97-
leg = plotData.Annotation;
98-
legInfo = leg.LegendInformation;
99-
100-
switch legInfo.IconDisplayStyle
101-
case 'on'
102-
showleg = true;
103-
case 'off'
104-
showleg = false;
97+
switch plotData.Annotation.LegendInformation.IconDisplayStyle
98+
case "on"
99+
obj.data{plotIndex}.showlegend = true;
100+
case "off"
101+
obj.data{plotIndex}.showlegend = false;
105102
end
106103

107-
obj.data{plotIndex}.showlegend = showleg;
108-
109104
%-SCENE CONFIGURATION-% for 3D animations, like comet3
110105
if obj.PlotOptions.is3d
111106
%-aspect ratio-%

‎plotly/plotlyfig_aux/handlegraphics/updateBar3.m‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,15 +118,12 @@
118118
obj.data{surfaceIndex}.name = bar_data.DisplayName;
119119
obj.data{surfaceIndex}.visible = strcmp(bar_data.Visible, 'on');
120120

121-
leg = bar_data.Annotation;
122-
legInfo = leg.LegendInformation;
123-
switch legInfo.IconDisplayStyle
124-
case 'on'
125-
showleg = true;
126-
case 'off'
127-
showleg = false;
121+
switch bar_data.Annotation.LegendInformation.IconDisplayStyle
122+
case "on"
123+
obj.data{surfaceIndex}.showlegend = true;
124+
case "off"
125+
obj.data{surfaceIndex}.showlegend = false;
128126
end
129-
obj.data{surfaceIndex}.showlegend = showleg;
130127

131128
%-SETTING SCENE-%
132129

‎plotly/plotlyfig_aux/handlegraphics/updateBar3h.m‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -121,18 +121,13 @@
121121
%-surface visible-%
122122
obj.data{surfaceIndex}.visible = strcmp(bar_data.Visible,'on');
123123

124-
leg = bar_data.Annotation;
125-
legInfo = leg.LegendInformation;
126-
127-
switch legInfo.IconDisplayStyle
128-
case 'on'
129-
showleg = true;
130-
case 'off'
131-
showleg = false;
124+
switch bar_data.Annotation.LegendInformation.IconDisplayStyle
125+
case "on"
126+
obj.data{surfaceIndex}.showlegend = true;
127+
case "off"
128+
obj.data{surfaceIndex}.showlegend = false;
132129
end
133130

134-
obj.data{surfaceIndex}.showlegend = showleg;
135-
136131
%-SETTING SCENE-%
137132

138133
%-aspect ratio-%

‎plotly/plotlyfig_aux/handlegraphics/updateBarseries.m‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -90,19 +90,13 @@
9090
obj.data{barIndex}.y = bar_data.XData;
9191
end
9292

93-
%-bar showlegend-%
94-
leg = bar_data.Annotation;
95-
legInfo = leg.LegendInformation;
96-
97-
switch legInfo.IconDisplayStyle
98-
case 'on'
99-
showleg = true;
100-
case 'off'
101-
showleg = false;
93+
switch bar_data.Annotation.LegendInformation.IconDisplayStyle
94+
case "on"
95+
obj.data{barIndex}.showlegend = true;
96+
case "off"
97+
obj.data{barIndex}.showlegend = false;
10298
end
10399

104-
obj.data{barIndex}.showlegend = showleg;
105-
106100
%-bar opacity-%
107101
if ~ischar(bar_child_data.FaceAlpha)
108102
obj.data{barIndex}.opacity = bar_child_data.FaceAlpha;

‎plotly/plotlyfig_aux/handlegraphics/updateBoxplot.m‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -85,18 +85,13 @@
8585
obj.data{boxIndex}.type = 'box';
8686
obj.data{boxIndex}.visible = strcmp(box_data.Visible,'on');
8787
obj.data{boxIndex}.fillcolor = 'rgba(0, 0, 0, 0)';
88-
%-box showlegend-%
89-
leg = box_data.Annotation;
90-
legInfo = leg.LegendInformation;
91-
92-
switch legInfo.IconDisplayStyle
93-
case 'on'
94-
showleg = true;
95-
case 'off'
96-
showleg = false;
97-
end
9888

99-
obj.data{boxIndex}.showlegend = showleg;
89+
switch box_data.Annotation.LegendInformation.IconDisplayStyle
90+
case "on"
91+
obj.data{boxIndex}.showlegend = true;
92+
case "off"
93+
obj.data{boxIndex}.showlegend = false;
94+
end
10095

10196
%-boxplot components-%
10297
Q1 = [];

‎plotly/plotlyfig_aux/handlegraphics/updateCategoricalHistogram.m‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,10 @@
8080
obj.data{histIndex}.marker = extractPatchFace(hist_data);
8181
obj.data{histIndex}.visible = strcmp(hist_data.Visible,'on');
8282

83-
leg = hist_data.Annotation;
84-
legInfo = leg.LegendInformation;
85-
switch legInfo.IconDisplayStyle
86-
case 'on'
87-
showleg = true;
88-
case 'off'
89-
showleg = false;
83+
switch hist_data.Annotation.LegendInformation.IconDisplayStyle
84+
case "on"
85+
obj.data{histIndex}.showlegend = true;
86+
case "off"
87+
obj.data{histIndex}.showlegend = false;
9088
end
91-
obj.data{histIndex}.showlegend = showleg;
9289
end

‎plotly/plotlyfig_aux/handlegraphics/updateComet.m‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,12 @@ function updateComet(obj,plotIndex)
115115
obj.data{plotIndex}.line = extractLineLine(plotData);
116116
obj.data{plotIndex}.marker = extractLineMarker(plotData);
117117

118-
leg = plotData.Annotation;
119-
legInfo = leg.LegendInformation;
120-
switch legInfo.IconDisplayStyle
121-
case 'on'
122-
showleg = true;
123-
case 'off'
124-
showleg = false;
118+
switch plotData.Annotation.LegendInformation.IconDisplayStyle
119+
case "on"
120+
obj.data{plotIndex}.showlegend = true;
121+
case "off"
122+
obj.data{plotIndex}.showlegend = false;
125123
end
126-
obj.data{plotIndex}.showlegend = showleg;
127124

128125
%-SCENE CONFIGURATION-% for 3D animations, like comet3
129126
if obj.PlotOptions.is3d

‎plotly/plotlyfig_aux/handlegraphics/updateContourProjection.m‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -113,16 +113,10 @@
113113
obj.layout.scene.camera.eye.z = zar + zfac*zar;
114114
end
115115

116-
%-contour showlegend-%
117-
leg = contour_data.Annotation;
118-
legInfo = leg.LegendInformation;
119-
120-
switch legInfo.IconDisplayStyle
121-
case 'on'
122-
showleg = true;
123-
case 'off'
124-
showleg = false;
116+
switch contour_data.Annotation.LegendInformation.IconDisplayStyle
117+
case "on"
118+
obj.data{contourIndex}.showlegend = true;
119+
case "off"
120+
obj.data{contourIndex}.showlegend = false;
125121
end
126-
127-
obj.data{contourIndex}.showlegend = showleg;
128122
end

‎plotly/plotlyfig_aux/handlegraphics/updateFmesh.m‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -297,13 +297,10 @@
297297
obj.data{surfaceIndex}.visible = strcmp(meshData.Visible,'on');
298298
obj.data{contourIndex}.visible = strcmp(meshData.Visible,'on');
299299

300-
leg = meshData.Annotation;
301-
legInfo = leg.LegendInformation;
302-
switch legInfo.IconDisplayStyle
303-
case 'on'
304-
showleg = true;
305-
case 'off'
306-
showleg = false;
300+
switch meshData.Annotation.LegendInformation.IconDisplayStyle
301+
case "on"
302+
obj.data{surfaceIndex}.showlegend = true;
303+
case "off"
304+
obj.data{surfaceIndex}.showlegend = false;
307305
end
308-
obj.data{surfaceIndex}.showlegend = showleg;
309306
end

‎plotly/plotlyfig_aux/handlegraphics/updateImage3D.m‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -118,17 +118,13 @@
118118
{(c-1)/len, getStringColor(col)};
119119
end
120120

121-
%-image showlegend-%
122121
try
123-
leg = image_data.Annotation;
124-
legInfo = leg.LegendInformation;
125-
switch legInfo.IconDisplayStyle
126-
case 'on'
127-
showleg = true;
128-
case 'off'
129-
showleg = false;
122+
switch image_data.Annotation.LegendInformation.IconDisplayStyle
123+
case "on"
124+
obj.data{imageIndex}.showlegend = true;
125+
case "off"
126+
obj.data{imageIndex}.showlegend = false;
130127
end
131-
obj.data{imageIndex}.showlegend = showleg;
132128
catch
133129
%TODO to future
134130
end

0 commit comments

Comments
 (0)