Skip to content

Fix color issues related to scatter functionality #412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 15, 2021
Merged

Fix color issues related to scatter functionality #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcce0f0
fix color issues related to scatter functionality
galvisgilberto Oct 15, 2021
e599c05
fix color issues related to scatter functionality
galvisgilberto Oct 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
282 changes: 64 additions & 218 deletions plotly/plotlyfig_aux/handlegraphics/updateScatter.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,235 +1,81 @@
function updateScatter(obj,scatterIndex)

%check: http://undocumentedmatlab.com/blog/undocumented-scatter-plot-behavior

%----SCATTER FIELDS----%

% x - [DONE]
% y - [DONE]
% r - [HANDLED BY SCATTER]
% t - [HANDLED BY SCATTER]
% mode - [DONE]
% name - [DONE]
% text - [NOT SUPPORTED IN MATLAB]
% error_y - [HANDLED BY ERRORBAR]
% error_x - [NOT SUPPORTED IN MATLAB]
% textfont - [NOT SUPPORTED IN MATLAB]
% textposition - [NOT SUPPORTED IN MATLAB]
% xaxis [DONE]
% yaxis [DONE]
% showlegend [DONE]
% stream - [HANDLED BY PLOTLYSTREAM]
% visible [DONE]
% type [DONE]
% opacity ---[TODO]

% MARKER
% marler.color - [DONE]
% marker.size - [DONE]
% marker.opacity - [NOT SUPPORTED IN MATLAB]
% marker.colorscale - [NOT SUPPORTED IN MATLAB]
% marker.sizemode - [DONE]
% marker.sizeref - [DONE]
% marker.maxdisplayed - [NOT SUPPORTED IN MATLAB]

% MARKER LINE
% marker.line.color - [DONE]
% marker.line.width - [DONE]
% marker.line.dash - [NOT SUPPORTED IN MATLAB]
% marker.line.opacity - [DONE]
% marker.line.smoothing - [NOT SUPPORTED IN MATLAB]
% marker.line.shape - [NOT SUPPORTED IN MATLAB]

% LINE
% line.color - [NA]
% line.width - [NA]
% line.dash - [NA]
% line.opacity [NA]
% line.smoothing - [NOT SUPPORTED IN MATLAB]
% line.shape - [NOT SUPPORTED IN MATLAB]
% connectgaps - [NOT SUPPORTED IN MATLAB]
% fill - [HANDLED BY AREA]
% fillcolor - [HANDLED BY AREA]

%-AXIS INDEX-%
axIndex = obj.getAxisIndex(obj.State.Plot(scatterIndex).AssociatedAxis);

%-SCATTER DATA STRUCTURE- %
scatter_data = get(obj.State.Plot(scatterIndex).Handle);

%-CHECK FOR MULTIPLE AXES-%
[xsource, ysource] = findSourceAxis(obj,axIndex);

if isfield(scatter_data,'ZData')
if isempty(scatter_data.ZData)

%-AXIS DATA-%
eval(['xaxis = obj.layout.xaxis' num2str(xsource) ';']);
eval(['yaxis = obj.layout.yaxis' num2str(ysource) ';']);

%-------------------------------------------------------------------------%

%-scatter xaxis-%
obj.data{scatterIndex}.xaxis = ['x' num2str(xsource)];

%-------------------------------------------------------------------------%

%-scatter yaxis-%
obj.data{scatterIndex}.yaxis = ['y' num2str(ysource)];
%-------------------------------------------------------------------------%

%-INITIALIZATIONS-%
axIndex = obj.getAxisIndex(obj.State.Plot(scatterIndex).AssociatedAxis);
[xSource, ySource] = findSourceAxis(obj,axIndex);
scatterData = get(obj.State.Plot(scatterIndex).Handle);

try
isScatter3D = isfield(scatterData,'ZData');
isScatter3D = isScatter3D & ~isempty(scatterData.ZData);
catch
isScatter3D = false;
end
%-------------------------------------------------------------------------%

end

%-------------------------------------------------------------------------%

%-scatter type-%
obj.data{scatterIndex}.type = 'scatter';

%-------------------------------------------------------------------------%

%-scatter mode-%
obj.data{scatterIndex}.mode = 'markers';

%-------------------------------------------------------------------------%

%-scatter visible-%
obj.data{scatterIndex}.visible = strcmp(scatter_data.Visible,'on');

%-------------------------------------------------------------------------%

%-scatter name-%
obj.data{scatterIndex}.name = scatter_data.DisplayName;
%-set trace-%
if ~isScatter3D
obj.data{scatterIndex}.type = 'scatter';
obj.data{scatterIndex}.xaxis = sprintf('x%d', xSource);
obj.data{scatterIndex}.yaxis = sprintf('y%d', ySource);
else
obj.data{scatterIndex}.type = 'scatter3d';
obj.data{scatterIndex}.scene = sprintf('scene%d', xSource);
end

%-------------------------------------------------------------------------%
obj.data{scatterIndex}.mode = 'markers';
obj.data{scatterIndex}.visible = strcmp(scatterData.Visible,'on');
obj.data{scatterIndex}.name = scatterData.DisplayName;

%-scatter patch data-%
for m = 1:length(scatter_data)
%-------------------------------------------------------------------------%

%-set plot data-%
obj.data{scatterIndex}.x = scatterData.XData;
obj.data{scatterIndex}.y = scatterData.YData;

%reverse counter
n = length(scatter_data) - m + 1;

%---------------------------------------------------------------------%

%-scatter x-%
if length(scatter_data) > 1
obj.data{scatterIndex}.x(m) = scatter_data(n).XData;
else
obj.data{scatterIndex}.x = scatter_data.XData;
end

%---------------------------------------------------------------------%

%-scatter y-%
if length(scatter_data) > 1
obj.data{scatterIndex}.y(m) = scatter_data(n).YData;
else
obj.data{scatterIndex}.y = scatter_data.YData;
if isScatter3D
obj.data{scatterIndex}.z = scatterData.ZData;
end

%-------------------------------------------------------------------------%

%---------------------------------------------------------------------%

%-scatter z-%
if isHG2()
if isfield(scatter_data,'ZData')
if any(scatter_data.ZData)
if length(scatter_data) > 1
obj.data{scatterIndex}.z(m) = scatter_data(n).ZData;
else
obj.data{scatterIndex}.z = scatter_data.ZData;
end
% overwrite type
obj.data{scatterIndex}.type = 'scatter3d';
end
end
%-set marker property-%
obj.data{scatterIndex}.marker = extractScatterMarker(scatterData);
markerSize = obj.data{scatterIndex}.marker.size;
markerColor = obj.data{scatterIndex}.marker.color;
markerLineColor = obj.data{scatterIndex}.marker.line.color;

if length(markerSize) == 1
obj.data{scatterIndex}.marker.size = markerSize * 0.15;
end

%---------------------------------------------------------------------%

%-scatter showlegend-%
leg = get(scatter_data.Annotation);
legInfo = get(leg.LegendInformation);

switch legInfo.IconDisplayStyle
case 'on'
showleg = true;
case 'off'
showleg = false;

if length(markerColor) == 1
obj.data{scatterIndex}.marker.color = markerColor{1};
end

if isfield(scatter_data,'ZData')
if isempty(scatter_data.ZData)
obj.data{scatterIndex}.showlegend = showleg;
end

if length(markerLineColor) == 1
obj.data{scatterIndex}.marker.line.color = markerLineColor{1};
end

%---------------------------------------------------------------------%

%-scatter marker-%
childmarker = extractScatterMarker(scatter_data(n));

%---------------------------------------------------------------------%

%-line color-%
if length(scatter_data) > 1
obj.data{scatterIndex}.marker.line.color{m} = childmarker.line.color{1};
else
if length(childmarker.line.color) > 3
obj.data{scatterIndex}.marker.line.color = childmarker.line.color;
else
obj.data{scatterIndex}.marker.line.color = childmarker.line.color{1};
%-------------------------------------------------------------------------%

%-set showlegend property-%
if isScatter3D
leg = get(scatterData.Annotation);
legInfo = get(leg.LegendInformation);

switch legInfo.IconDisplayStyle
case 'on'
showleg = true;
case 'off'
showleg = false;
end

obj.data{scatterIndex}.showlegend = showleg;
end

%---------------------------------------------------------------------%

%-marker color-%
if length(scatter_data) > 1
obj.data{scatterIndex}.marker.color{m} = childmarker.color{1};
else
obj.data{scatterIndex}.marker.color = childmarker.color;
end

%---------------------------------------------------------------------%

%-sizeref-%
obj.data{scatterIndex}.marker.sizeref = childmarker.sizeref;

%---------------------------------------------------------------------%

%-sizemode-%
obj.data{scatterIndex}.marker.sizemode = childmarker.sizemode;

%---------------------------------------------------------------------%

%-symbol-%
if length(scatter_data) > 1
obj.data{scatterIndex}.marker.symbol{m} = childmarker.symbol;
else
obj.data{scatterIndex}.marker.symbol = childmarker.symbol;
end

%---------------------------------------------------------------------%

%-size-%
if length(scatter_data) > 1
obj.data{scatterIndex}.marker.size = childmarker.size;
else
obj.data{scatterIndex}.marker.size = childmarker.size * 0.15;
end

%---------------------------------------------------------------------%

%-line width-%

if length(scatter_data) > 1 || ischar(childmarker.line.color)
obj.data{scatterIndex}.marker.line.width(m) = childmarker.line.width;
else
obj.data{scatterIndex}.marker.line.width = childmarker.line.width;
% obj.data{scatterIndex}.marker.line.width(1:length(childmarker.line.color)) = childmarker.line.width;
end

%---------------------------------------------------------------------%

end

%-------------------------------------------------------------------------%
end

Loading