Skip to content

Improve colors for 'histogram' and change barmode to remove jitter in x-axis positions #497

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 1 commit into from
Aug 4, 2024
Merged

Improve colors for 'histogram' and change barmode to remove jitter in x-axis positions #497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
373 changes: 175 additions & 198 deletions plotly/plotlyfig_aux/handlegraphics/updateHistogram.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,222 +1,199 @@
function obj = updateHistogram(obj,histIndex)
% x:...[DONE]
% y:...[DONE]
% histnorm:...[DONE]
% name:...[DONE]
% autobinx:...[DONE]
% nbinsx:...[DONE]
% xbins:...[DONE]
% autobiny:...[DONE]
% nbinsy:...[DONE]
% ybins:...[DONE]
% text:...[NOT SUPPORTED IN MATLAB]
% error_y:...[HANDLED BY ERRORBARSERIES]
% error_x:...[HANDLED BY ERRORBARSERIES]
% opacity: --- [TODO]
% xaxis:...[DONE]
% yaxis:...[DONE]
% showlegend:...[DONE]
% stream:...[HANDLED BY PLOTLYSTREAM]
% visible:...[DONE]
% type:...[DONE]
% orientation:...[DONE]

% MARKER:
% color: ...[DONE]
% size: ...[NA]
% symbol: ...[NA]
% opacity: ...[TODO]
% sizeref: ...[NA]
% sizemode: ...[NA]
% colorscale: ...[NA]
% cauto: ...[NA]
% cmin: ...[NA]
% cmax: ...[NA]
% outliercolor: ...[NA]
% maxdisplayed: ...[NA]

% MARKER LINE:
% color: ...[DONE]
% width: ...[DONE]
% dash: ...[NA]
% opacity: ...[TODO]
% shape: ...[NA]
% smoothing: ...[NA]
% outliercolor: ...[NA]
% outlierwidth: ...[NA]

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

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

%-HIST DATA STRUCTURE- %
hist_data = obj.State.Plot(histIndex).Handle;

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

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

%-hist axis-%
obj.data{histIndex}.xaxis = "x" + xsource;
obj.data{histIndex}.yaxis = "y" + ysource;

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

%-bar type-%
obj.data{histIndex}.type = "bar";

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

if isprop(hist_data, "Orientation")
%-Matlab 2014+ histogram() function-%
orientation = hist_data.Orientation;
else
%-Matlab <2014 hist() function-%
orientation = histogramOrientation(hist_data);
end

switch orientation
case {"vertical", "horizontal"}
%-hist y data-%
obj.data{histIndex}.x = hist_data.BinEdges(1:end-1) ...
+ 0.5*diff(hist_data.BinEdges);
obj.data{histIndex}.width = diff(hist_data.BinEdges);
obj.data{histIndex}.y = double(hist_data.Values);
case "v"
%-hist x data-%
xdata = mean(hist_data.XData(2:3,:));

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

%-hist y data-%
xlength = 0;
for d = 1:length(xdata)
xnew = repmat(xdata(d),1,hist_data.YData(2,d));
obj.data{histIndex}.x(xlength+1:xlength+length(xnew)) = xnew;
xlength = length(obj.data{histIndex}.x);
end

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

%-hist autobinx-%
obj.data{histIndex}.autobinx = false;

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

%-hist xbins-%
xbins.start = hist_data.XData(2,1);
xbins.end = hist_data.XData(3,end);
xbins.size = diff(hist_data.XData(2:3,1));
obj.data{histIndex}.xbins = xbins;

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

%-layout bargap-%
obj.layout.bargap = ...
(hist_data.XData(3,1) - hist_data.XData(2,2)) ...
/ (hist_data.XData(3,1) - hist_data.XData(2,1));
case "h"
%-hist y data-%
ydata = mean(hist_data.YData(2:3,:));

% x:...[DONE]
% y:...[DONE]
% histnorm:...[DONE]
% name:...[DONE]
% autobinx:...[DONE]
% nbinsx:...[DONE]
% xbins:...[DONE]
% autobiny:...[DONE]
% nbinsy:...[DONE]
% ybins:...[DONE]
% text:...[NOT SUPPORTED IN MATLAB]
% error_y:...[HANDLED BY ERRORBARSERIES]
% error_x:...[HANDLED BY ERRORBARSERIES]
% opacity: --- [TODO]
% xaxis:...[DONE]
% yaxis:...[DONE]
% showlegend:...[DONE]
% stream:...[HANDLED BY PLOTLYSTREAM]
% visible:...[DONE]
% type:...[DONE]
% orientation:...[DONE]

% MARKER:
% color: ...[DONE]
% size: ...[NA]
% symbol: ...[NA]
% opacity: ...[TODO]
% sizeref: ...[NA]
% sizemode: ...[NA]
% colorscale: ...[NA]
% cauto: ...[NA]
% cmin: ...[NA]
% cmax: ...[NA]
% outliercolor: ...[NA]
% maxdisplayed: ...[NA]

% MARKER LINE:
% color: ...[DONE]
% width: ...[DONE]
% dash: ...[NA]
% opacity: ...[TODO]
% shape: ...[NA]
% smoothing: ...[NA]
% outliercolor: ...[NA]
% outlierwidth: ...[NA]

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

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

%-HIST DATA STRUCTURE- %
hist_data = obj.State.Plot(histIndex).Handle;

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

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

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

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

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

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

%-bar type-%
obj.data{histIndex}.type = 'bar';

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

if isprop(hist_data, 'Orientation')
%-Matlab 2014+ histogram() function-%
orientation = hist_data.Orientation;
else
%-Matlab <2014 hist() function-%
orientation = histogramOrientation(hist_data);
end
%-------------------------------------------------------------%

switch orientation
case {'vertical', 'horizontal'}

%-------------------------------------------------------------------------%
%-hist y data-%

obj.data{histIndex}.x = hist_data.BinEdges(1:end-1) + 0.5*diff(hist_data.BinEdges);
obj.data{histIndex}.width = diff(hist_data.BinEdges);%[hist_data.BinEdges(2:end), hist_data.Data(end)];
obj.data{histIndex}.y = double(hist_data.Values);

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

case 'v'
%-hist x data-%
xdata = mean(hist_data.XData(2:3,:));

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

%-hist y data-%
xlength = 0;
for d = 1:length(xdata)
obj.data{histIndex}.x(xlength + 1: xlength + hist_data.YData(2,d)) = repmat(xdata(d),1,hist_data.YData(2,d));
xlength = length(obj.data{histIndex}.x);
end

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

%-hist autobinx-%
obj.data{histIndex}.autobinx = false;

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

%-hist xbins-%
xbins.start = hist_data.XData(2,1);
xbins.end = hist_data.XData(3,end);
xbins.size = diff(hist_data.XData(2:3,1));
obj.data{histIndex}.xbins = xbins;

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

%-layout bargap-%
obj.layout.bargap = (hist_data.XData(3,1)-hist_data.XData(2,2))/(hist_data.XData(3,1)-hist_data.XData(2,1));

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


case 'h'

%-hist y data-%
ydata = mean(hist_data.YData(2:3,:));

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

ylength = 0;
for d = 1:length(ydata)
obj.data{histIndex}.y(ylength + 1: ylength + hist_data.XData(2,d)) = repmat(ydata(d),1,hist_data.XData(2,d));
ylength = length(obj.data{histIndex}.y);
end

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

%-hist autobiny-%
obj.data{histIndex}.autobiny = false;

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

%-hist ybins-%
ybins.start = hist_data.YData(2,1);
ybins.end = hist_data.YData(3,end);
ybins.size = diff(hist_data.YData(2:3,1));
obj.data{histIndex}.ybins = ybins;

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

%-layout bargap-%
obj.layout.bargap = (hist_data.XData(3,1)-hist_data.XData(2,2))/(hist_data.XData(3,1)-hist_data.XData(2,1));

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

end
ylength = 0;
for d = 1:length(ydata)
ynew = repmat(ydata(d),1,hist_data.XData(2,d));
obj.data{histIndex}.y(ylength+1:ylength+length(ynew)) = ynew;
ylength = length(obj.data{histIndex}.y);
end

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

%-hist name-%
obj.data{histIndex}.name = hist_data.DisplayName;
%-hist autobiny-%
obj.data{histIndex}.autobiny = false;

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

%-layout barmode-%
obj.layout.barmode = 'group';
%-hist ybins-%
ybins.start = hist_data.YData(2,1);
ybins.end = hist_data.YData(3,end);
ybins.size = diff(hist_data.YData(2:3,1));
obj.data{histIndex}.ybins = ybins;

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

%-hist line width-%
obj.data{histIndex}.marker.line.width = hist_data.LineWidth;
%-layout bargap-%
obj.layout.bargap = ...
(hist_data.XData(3,1) - hist_data.XData(2,2)) ...
/ (hist_data.XData(3,1) - hist_data.XData(2,1));
end

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

%-hist opacity-%
if ~ischar(hist_data.FaceAlpha)
obj.data{histIndex}.opacity = hist_data.FaceAlpha * 1.25;
end
%-hist name-%
obj.data{histIndex}.name = hist_data.DisplayName;

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

%-marker data-%
obj.data{histIndex}.marker = extractPatchFace(hist_data);
%-layout barmode-%
obj.layout.barmode = "overlay";

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

%-change color when multiple histograms same axes-%
if min([xsource, ysource]) == 1
obj.data{histIndex}.marker = rmfield(obj.data{histIndex}.marker, 'color');
end
%-hist line width-%
obj.data{histIndex}.marker.line.width = hist_data.LineWidth;

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

%-hist visible-%
obj.data{histIndex}.visible = strcmp(hist_data.Visible,'on');
%-hist opacity-%
if ~ischar(hist_data.FaceAlpha)
obj.data{histIndex}.opacity = hist_data.FaceAlpha * 1.25;
end

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

%-hist showlegend-%
leg = hist_data.Annotation;
legInfo = leg.LegendInformation;
%-marker data-%
obj.data{histIndex}.marker = extractPatchFace(hist_data);

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

%-hist visible-%
obj.data{histIndex}.visible = strcmp(hist_data.Visible,"on");

obj.data{histIndex}.showlegend = showleg;
%---------------------------------------------------------------------%

%-------------------------------------------------------------------------%
%-hist showlegend-%
leg = hist_data.Annotation;
legInfo = leg.LegendInformation;

switch legInfo.IconDisplayStyle
case "on"
showleg = true;
case "off"
showleg = false;
end
obj.data{histIndex}.showlegend = showleg;
end
Loading