Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 6baa30e

Browse files
robertoffmourarobertoffmoura
committed
Refactor updatePolarplot
1 parent 7a58fd8 commit 6baa30e

File tree

2 files changed

+23
-26
lines changed

2 files changed

+23
-26
lines changed

‎plotly/plotlyfig_aux/core/updateData.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
if obj.PlotlyDefaults.isGeoaxis
5757
updateGeoPlot(obj, dataIndex);
5858
elseif obj.State.Plot(dataIndex).AssociatedAxis.Type == "polaraxes"
59-
updatePolarplot(obj, dataIndex);
59+
obj.data{dataIndex} = updatePolarplot(obj, dataIndex);
6060
elseif ismember("ternplot", lower(obj.PlotOptions.TreatAs))
6161
updateTernaryPlot(obj, dataIndex);
6262
else

‎plotly/plotlyfig_aux/handlegraphics/updatePolarplot.m

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
function updatePolarplot(obj, plotIndex)
1+
function data = updatePolarplot(obj, plotIndex)
22

33
%-AXIS INDEX-%
44
axIndex = obj.getAxisIndex(obj.State.Plot(plotIndex).AssociatedAxis);
@@ -10,7 +10,7 @@ function updatePolarplot(obj, plotIndex)
1010
xsource = findSourceAxis(obj, axIndex);
1111

1212
%-ASSOCIATE POLAR-AXES LAYOUT-%
13-
obj.data{plotIndex}.subplot = sprintf('polar%d', xsource+1);
13+
data.subplot = sprintf('polar%d', xsource+1);
1414

1515
%-parse plot data-%
1616
rData = plotData.RData;
@@ -20,39 +20,39 @@ function updatePolarplot(obj, plotIndex)
2020
rData = abs(rData);
2121

2222
%-scatterpolar trace setting-%
23-
obj.data{plotIndex}.type = 'scatterpolar';
24-
obj.data{plotIndex}.visible = strcmp(plotData.Visible,'on');
25-
obj.data{plotIndex}.name = plotData.DisplayName;
23+
data.type = 'scatterpolar';
24+
data.visible = strcmp(plotData.Visible,'on');
25+
data.name = plotData.DisplayName;
2626

2727
%-set scatterpolar data-%
28-
obj.data{plotIndex}.r = rData;
29-
obj.data{plotIndex}.theta = thetaData;
28+
data.r = rData;
29+
data.theta = thetaData;
3030

3131
%-trace settings-%
3232
if ~strcmpi('none', plotData.Marker) ...
3333
&& ~strcmpi('none', plotData.LineStyle)
34-
obj.data{plotIndex}.mode = 'lines+markers';
34+
data.mode = 'lines+markers';
3535
elseif ~strcmpi('none', plotData.Marker)
36-
obj.data{plotIndex}.mode = 'markers';
36+
data.mode = 'markers';
3737
elseif ~strcmpi('none', plotData.LineStyle)
38-
obj.data{plotIndex}.mode = 'lines';
38+
data.mode = 'lines';
3939
else
40-
obj.data{plotIndex}.mode = 'none';
40+
data.mode = 'none';
4141
end
4242

43-
obj.data{plotIndex}.marker = extractLineMarker(plotData);
44-
obj.data{plotIndex}.line = extractLineLine(plotData);
45-
obj.data{plotIndex}.line.width = 2 * obj.data{plotIndex}.line.width;
43+
data.marker = extractLineMarker(plotData);
44+
data.line = extractLineLine(plotData);
45+
data.line.width = 2 * data.line.width;
4646

4747
%-legend setting-%
4848
leg = plotData.Annotation;
4949
legInfo = leg.LegendInformation;
5050

5151
switch legInfo.IconDisplayStyle
5252
case 'on'
53-
obj.data{plotIndex}.showlegend = true;
53+
data.showlegend = true;
5454
case 'off'
55-
obj.data{plotIndex}.showlegend = false;
55+
data.showlegend = false;
5656
end
5757

5858
%-set polar axes-%
@@ -88,8 +88,8 @@ function updatePolaraxes(obj, plotIndex)
8888
polarAxis.domain.y = min([yo yo + h], 1);
8989

9090
%-setting angular axis-%
91-
gridColor = sprintf("rgba(%d,%d,%d,%f)", ...
92-
[round(255*axisData.GridColor) axisData.GridAlpha]);
91+
gridColor = getStringColor( ...
92+
round(255*axisData.GridColor), axisData.GridAlpha);
9393
gridWidth = axisData.LineWidth;
9494
thetaLim = thetaAxis.Limits;
9595

@@ -114,7 +114,7 @@ function updatePolaraxes(obj, plotIndex)
114114
polarAxis.radialaxis.title.font.family = matlab2plotlyfont(...
115115
thetaLabel.FontName);
116116
polarAxis.radialaxis.title.font.size = thetaLabel.FontSize;
117-
polarAxis.radialaxis.title.font.color = sprintf("rgb(%d,%d,%d)", ...
117+
polarAxis.radialaxis.title.font.color = getStringColor( ...
118118
round(255*thetaLabel.Color));
119119

120120
%-setting radial axis-%
@@ -143,7 +143,7 @@ function updatePolaraxes(obj, plotIndex)
143143
polarAxis.angularaxis.title.font.family = matlab2plotlyfont(...
144144
rLabel.FontName);
145145
polarAxis.angularaxis.title.font.size = rLabel.FontSize;
146-
polarAxis.angularaxis.title.font.color = sprintf("rgb(%d,%d,%d)", ...
146+
polarAxis.angularaxis.title.font.color = getStringColor( ...
147147
round(255*rLabel.Color));
148148

149149
%-angular tick labels settings-%
@@ -162,7 +162,6 @@ function updatePolaraxes(obj, plotIndex)
162162

163163
elseif isempty(tickLabels)
164164
polarAxis.angularaxis.tickvals = tickValues;
165-
166165
else
167166
polarAxis.angularaxis.tickvals = tickValues;
168167
polarAxis.angularaxis.ticktext = tickLabels;
@@ -180,7 +179,7 @@ function updatePolaraxes(obj, plotIndex)
180179
polarAxis.angularaxis.tickfont.family = matlab2plotlyfont(...
181180
thetaAxis.FontName);
182181
polarAxis.angularaxis.tickfont.size = thetaAxis.FontSize;
183-
polarAxis.angularaxis.tickfont.color = sprintf("rgb(%d,%d,%d)", ...
182+
polarAxis.angularaxis.tickfont.color = getStringColor( ...
184183
round(255*thetaAxis.Color));
185184
end
186185

@@ -193,10 +192,8 @@ function updatePolaraxes(obj, plotIndex)
193192
showTickLabels = false;
194193
polarAxis.radialaxis.showticklabels = showTickLabels;
195194
polarAxis.radialaxis.ticks = '';
196-
197195
elseif isempty(tickLabels)
198196
polarAxis.radialaxis.tickvals = tickValues;
199-
200197
else
201198
polarAxis.radialaxis.tickvals = tickValues;
202199
polarAxis.radialaxis.ticktext = tickLabels;
@@ -214,7 +211,7 @@ function updatePolaraxes(obj, plotIndex)
214211
polarAxis.radialaxis.tickfont.family = matlab2plotlyfont(...
215212
rAxis.FontName);
216213
polarAxis.radialaxis.tickfont.size = rAxis.FontSize;
217-
polarAxis.radialaxis.tickfont.color = sprintf("rgb(%d,%d,%d)", ...
214+
polarAxis.radialaxis.tickfont.color = getStringColor( ...
218215
round(255*rAxis.Color));
219216
end
220217

0 commit comments

Comments
 (0)