Skip to content

Commit d3a5175

Browse files
gilbertogalvisgilbertogalvis
authored
Merge pull request #354 from plotly/fix_heatmap_issues_used_in_ssim_baselines_matlab_code-examples_data-distribution-plots_heatmap
Fix heatmap issues used in ssim baselines matlab code examples data distribution plots heatmap
2 parents 00077ff + 03332fc commit d3a5175

File tree

6 files changed

+305
-32
lines changed

6 files changed

+305
-32
lines changed

‎plotly/plotlyfig.m

+3-7
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
obj.PlotOptions.AxisEqual = false;
6767
obj.PlotOptions.AspectRatio = [];
6868
obj.PlotOptions.CameraEye = [];
69+
obj.PlotOptions.is_headmap_axis = false;
6970

7071
% offline options
7172
obj.PlotOptions.Offline = true;
@@ -683,16 +684,11 @@ function validate(obj)
683684

684685
% update annotations
685686
for n = 1:obj.State.Figure.NumTexts
686-
try
687-
plotclass = obj.State.Plot(n).Class;
688-
catch
689-
plotclass = ' ';
690-
end
691-
692687
try
693-
if ~strcmpi(plotclass, 'heatmap')
688+
if ~obj.PlotOptions.is_headmap_axis
694689
updateAnnotation(obj,n);
695690
else
691+
updateHeatmapAnnotation(obj,n);
696692
obj.PlotOptions.CleanFeedTitle = false;
697693
end
698694
catch

‎plotly/plotlyfig_aux/core/updateAxis.m

+38-12
Original file line numberDiff line numberDiff line change
@@ -43,41 +43,64 @@
4343

4444
%-STANDARDIZE UNITS-%
4545
axisunits = get(obj.State.Axis(axIndex).Handle,'Units');
46-
fontunits = get(obj.State.Axis(axIndex).Handle,'FontUnits');
47-
set(obj.State.Axis(axIndex).Handle,'Units','normalized');
48-
set(obj.State.Axis(axIndex).Handle,'FontUnits','points');
46+
set(obj.State.Axis(axIndex).Handle,'Units','normalized')
47+
48+
try
49+
fontunits = get(obj.State.Axis(axIndex).Handle,'FontUnits');
50+
set(obj.State.Axis(axIndex).Handle,'FontUnits','points')
51+
catch
52+
% TODO
53+
end
4954

5055
%-AXIS DATA STRUCTURE-%
5156
axis_data = get(obj.State.Axis(axIndex).Handle);
5257

5358
%-------------------------------------------------------------------------%
5459

60+
%-check if headmap axis-%
61+
is_headmap_axis = isfield(axis_data, 'XDisplayData');
62+
obj.PlotOptions.is_headmap_axis = is_headmap_axis;
63+
5564
%-xaxis-%
56-
xaxis = extractAxisData(obj,axis_data,'X');
65+
if ~is_headmap_axis
66+
xaxis = extractAxisData(obj,axis_data,'X');
67+
else
68+
xaxis = extractHeatmapAxisData(obj,axis_data,'X');
69+
end
5770

5871
%-------------------------------------------------------------------------%
5972

6073
%-yaxis-%
61-
yaxis = extractAxisData(obj,axis_data,'Y');
74+
if ~is_headmap_axis
75+
yaxis = extractAxisData(obj,axis_data,'Y');
76+
else
77+
yaxis = extractHeatmapAxisData(obj,axis_data,'Y');
78+
end
6279

6380
%-------------------------------------------------------------------------%
6481

82+
%-getting and setting postion data-%
83+
84+
xo = axis_data.Position(1);
85+
yo = axis_data.Position(2);
86+
w = axis_data.Position(3);
87+
h = axis_data.Position(4);
88+
6589
if obj.PlotOptions.AxisEqual
6690
wh = min(axis_data.Position(3:4));
6791
w = wh;
68-
h = wh;
69-
else
70-
w = axis_data.Position(3);
71-
h = axis_data.Position(4);
92+
h = wh;
7293
end
7394

95+
%-------------------------------------------------------------------------%
96+
7497
%-xaxis domain-%
75-
xaxis.domain = min([axis_data.Position(1) axis_data.Position(1) + w],1);
98+
xaxis.domain = min([xo xo + w],1);
7699

77100
%-------------------------------------------------------------------------%
78101

79102
%-yaxis domain-%
80-
yaxis.domain = min([axis_data.Position(2) axis_data.Position(2) + h],1);
103+
yaxis.domain = min([yo yo + h],1);
81104

82105
%-------------------------------------------------------------------------%
83106

@@ -129,6 +152,9 @@
129152

130153
%-REVERT UNITS-%
131154
set(obj.State.Axis(axIndex).Handle,'Units',axisunits);
132-
set(obj.State.Axis(axIndex).Handle,'FontUnits',fontunits);
133155

156+
try
157+
set(obj.State.Axis(axIndex).Handle,'FontUnits',fontunits);
158+
catch
159+
% TODO
134160
end

‎plotly/plotlyfig_aux/core/updateHeatmapAnnotation.m

+101
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
function obj = updateHeatmapAnnotation(obj,anIndex)
2+
3+
%-------X/YLABEL FIELDS--------%
4+
% title...[DONE]
5+
% titlefont.size...[DONE]
6+
% titlefont.family...[DONE]
7+
% titlefont.color...[DONE]
8+
9+
%------ANNOTATION FIELDS-------%
10+
11+
% x: ...[DONE]
12+
% y: ...[DONE]
13+
% xref: ...[DONE]
14+
% yref: ...[DONE]
15+
% text: ...[DONE]
16+
% showarrow: ...[HANDLED BY CALL TO ANNOTATION];
17+
% font: ...[DONE]
18+
% xanchor: ...[DONE]
19+
% yanchor: ...[DONE]
20+
% align: ...[DONE]
21+
% arrowhead: ...[HANDLED BY CALL FROM ANNOTATION];
22+
% arrowsize: ...[HANDLED BY CALL FROM ANNOTATION];
23+
% arrowwidth: ...[HANDLED BY CALL FROM ANNOTATION];
24+
% arrowcolor: ...[HANDLED BY CALL FROM ANNOTATION];
25+
% ax: ...[HANDLED BY CALL FROM ANNOTATION];
26+
% ay: ...[HANDLED BY CALL FROM ANNOTATION];
27+
% textangle: ...[DONE]
28+
% bordercolor: ...[DONE]
29+
% borderwidth: ...[DONE]
30+
% borderpad: ...[DONE]
31+
% bgcolor: ...[DONE]
32+
% opacity: ...[NOT SUPPORTED IN MATLAB]
33+
34+
35+
%-AXIS INDEX-%
36+
axIndex = obj.getAxisIndex(obj.State.Text(anIndex).AssociatedAxis);
37+
38+
%-CHECK FOR MULTIPLE AXES-%
39+
[xsource, ysource] = findSourceAxis(obj,axIndex);
40+
eval(['xaxis = obj.layout.xaxis' num2str(xsource) ';']);
41+
eval(['yaxis = obj.layout.yaxis' num2str(ysource) ';']);
42+
43+
%-get heatmap title name-%
44+
title_name = obj.State.Text(anIndex).Handle;
45+
46+
%-show arrow-%
47+
obj.layout.annotations{anIndex}.showarrow = false;
48+
49+
%-------------------------------------------------------------------------%
50+
51+
%-anchor title to paper-%
52+
if obj.State.Text(anIndex).Title
53+
%-xref-%
54+
obj.layout.annotations{anIndex}.xref = 'paper';
55+
%-yref-%
56+
obj.layout.annotations{anIndex}.yref = 'paper';
57+
else
58+
%-xref-%
59+
obj.layout.annotations{anIndex}.xref = ['x' num2str(xsource)];
60+
%-yref-%
61+
obj.layout.annotations{anIndex}.yref = ['y' num2str(ysource)];
62+
end
63+
64+
%-------------------------------------------------------------------------%
65+
66+
%-xanchor-%
67+
obj.layout.annotations{anIndex}.xanchor = 'middle';
68+
69+
%-align-%
70+
obj.layout.annotations{anIndex}.align = 'middle';
71+
72+
%-xanchor-%
73+
obj.layout.annotations{anIndex}.yanchor = 'top';
74+
75+
76+
%-------------------------------------------------------------------------%
77+
78+
%-text-%
79+
obj.layout.annotations{anIndex}.text = title_name;
80+
81+
%-------------------------------------------------------------------------%
82+
83+
if obj.State.Text(anIndex).Title
84+
85+
%-AXIS DATA-%
86+
eval(['xaxis = obj.layout.xaxis' num2str(xsource) ';']);
87+
eval(['yaxis = obj.layout.yaxis' num2str(ysource) ';']);
88+
89+
%-x position-%
90+
obj.layout.annotations{anIndex}.x = mean(xaxis.domain);
91+
%-y position-%
92+
% obj.layout.annotations{anIndex}.y = (yaxis.domain(2) + obj.PlotlyDefaults.TitleHeight);
93+
obj.layout.annotations{anIndex}.y = (yaxis.domain(2) + 0.04);
94+
else
95+
%-x position-%
96+
obj.layout.annotations{anIndex}.x = text_data.Position(1);
97+
%-y position-%
98+
obj.layout.annotations{anIndex}.y = text_data.Position(2);
99+
end
100+
101+
end

‎plotly/plotlyfig_aux/handlegraphics/updateHeatmap.m

+11-3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
%-HEATMAP DATA STRUCTURE- %
66
heat_data = get(obj.State.Plot(heatIndex).Handle);
7+
78
%-------------------------------------------------------------------------%
89

910
%-heatmap type-%
@@ -12,9 +13,11 @@
1213
%-------------------------------------------------------------------------%
1314

1415
%-format data-%
15-
obj.data{heatIndex}.x = heat_data.XData;
16-
obj.data{heatIndex}.y = heat_data.YData;
17-
obj.data{heatIndex}.z = heat_data.ColorData(end:-1:1, :);
16+
obj.data{heatIndex}.x = heat_data.XDisplayData;
17+
obj.data{heatIndex}.y = heat_data.YDisplayData(end:-1:1, :);
18+
obj.data{heatIndex}.z = heat_data.ColorDisplayData(end:-1:1, :);
19+
obj.data{heatIndex}.connectgaps = false;
20+
obj.data{heatIndex}.hoverongaps = false;
1821

1922
%-------------------------------------------------------------------------%
2023

@@ -40,6 +43,11 @@
4043
obj.data{heatIndex}.showscale = false;
4144
if strcmpi(heat_data.ColorbarVisible, 'on')
4245
obj.data{heatIndex}.showscale = true;
46+
obj.data{heatIndex}.colorbar.x = 0.87;
47+
obj.data{heatIndex}.colorbar.y = 0.52;
48+
obj.data{heatIndex}.colorbar.ypad = 55;
49+
obj.data{heatIndex}.colorbar.xpad = obj.PlotlyDefaults.MarginPad;
50+
obj.data{heatIndex}.colorbar.outlinecolor = 'rgb(150,150,150)';
4351
end
4452

4553
%-------------------------------------------------------------------------%

‎plotly/plotlyfig_aux/helpers/extractHeatmapAxisData.m

+138
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,138 @@
1+
function [axis] = extractHeatmapAxisData(obj,axis_data,axisName)
2+
%extract information related to each axis
3+
% axis_data is the data extrated from the figure, axisName take the
4+
% values 'x' 'y' or 'z'
5+
6+
7+
%-------------------------------------------------------------------------%
8+
9+
%-axis-side-%
10+
% axis.side = eval(['axis_data.' axisName 'AxisLocation;']);
11+
12+
%-------------------------------------------------------------------------%
13+
14+
%-axis zeroline-%
15+
axis.zeroline = false;
16+
17+
%-------------------------------------------------------------------------%
18+
19+
%-axis autorange-%
20+
axis.autorange = false;
21+
22+
%-------------------------------------------------------------------------%
23+
24+
%-axis exponent format-%
25+
axis.exponentformat = obj.PlotlyDefaults.ExponentFormat;
26+
27+
%-------------------------------------------------------------------------%
28+
29+
%-axis tick font size-%
30+
axis.tickfont.size = axis_data.FontSize;
31+
32+
%-------------------------------------------------------------------------%
33+
34+
%-axis tick font family-%
35+
axis.tickfont.family = matlab2plotlyfont(axis_data.FontName);
36+
37+
%-------------------------------------------------------------------------%
38+
39+
tl = eval(['axis_data.' axisName 'Data;']);
40+
tl = length(tl);
41+
42+
w = axis_data.Position(4);
43+
h = axis_data.Position(3);
44+
45+
ticklength = min(obj.PlotlyDefaults.MaxTickLength,...
46+
max(tl*w*obj.layout.width,tl*h*obj.layout.height));
47+
48+
%-axis ticklen-%
49+
axis.ticklen = 0.1; %ticklength;
50+
51+
%-------------------------------------------------------------------------%
52+
53+
% col = eval(['255*axis_data.' axisName 'Color;']);
54+
axiscol = 'rgb(150, 150, 150)';
55+
% axiscol = 'black';
56+
57+
%-axis linecolor-%
58+
axis.linecolor = axiscol;
59+
%-axis tickcolor-%
60+
axis.tickcolor = axiscol;
61+
%-axis tickfont-%
62+
axis.tickfont.color = 'black';
63+
%-axis grid color-%
64+
axis.gridcolor = axiscol;
65+
66+
%-------------------------------------------------------------------------%
67+
68+
axis.showgrid = false;
69+
70+
%-------------------------------------------------------------------------%
71+
72+
lw = 0.5;
73+
linewidth = max(1,lw*obj.PlotlyDefaults.AxisLineIncreaseFactor);
74+
75+
%-axis line width-%
76+
axis.linewidth = linewidth;
77+
%-axis tick width-%
78+
axis.tickwidth = linewidth;
79+
%-axis grid width-%
80+
axis.gridwidth = linewidth;
81+
82+
%-------------------------------------------------------------------------%
83+
84+
axis.ticks = 'inside';
85+
axis.mirror = true;
86+
87+
labels = eval(['axis_data.' axisName 'DisplayLabels;']);
88+
vals = eval(['axis_data.' axisName 'DisplayData;']);
89+
90+
axis.showticklabels = true;
91+
axis.type = 'category';
92+
axis.autorange = true;
93+
axis.ticktext = labels;
94+
axis.tickvals = vals;
95+
axis.showtickprefix = 'none';
96+
97+
%-------------------------------LABELS------------------------------------%
98+
99+
label = eval(['axis_data.' axisName 'Label;']);
100+
101+
%-------------------------------------------------------------------------%
102+
103+
%-title-%
104+
axis.title = label;
105+
106+
%-------------------------------------------------------------------------%
107+
108+
%-axis title font color-%
109+
axis.titlefont.color = 'black';
110+
111+
%-------------------------------------------------------------------------%
112+
113+
%-axis title font size-%
114+
axis.titlefont.size = axis_data.FontSize*1.2;
115+
116+
%-------------------------------------------------------------------------%
117+
118+
%-axis title font family-%
119+
axis.titlefont.family = matlab2plotlyfont(axis_data.FontName);
120+
121+
%-------------------------------------------------------------------------%
122+
123+
if strcmp(axis_data.Visible,'on')
124+
%-axis showline-%
125+
axis.showline = true;
126+
else
127+
%-axis showline-%
128+
axis.showline = false;
129+
%-axis showticklabels-%
130+
axis.showticklabels = false;
131+
%-axis ticks-%
132+
axis.ticks = '';
133+
end
134+
135+
%-------------------------------------------------------------------------%
136+
end
137+
138+

0 commit comments

Comments
 (0)