Skip to content

Commit cd7d7ee

Browse files
Merge pull request #466 from plotly/fix_issue_436
fix issue #436
2 parents ff64187 + d0489ae commit cd7d7ee

File tree

2 files changed

+510
-374
lines changed

2 files changed

+510
-374
lines changed

plotly/plotlyfig_aux/handlegraphics/updateHistogram2.m

+19-8
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
barGap = 0.05;
1414

1515
%-get trace data-%
16+
1617
values = plotData.Values;
18+
if strcmp(plotData.ShowEmptyBins, 'on'), values = values+1; end
1719
xEdges = plotData.XBinEdges;
1820
yEdges = plotData.YBinEdges;
1921

@@ -29,6 +31,8 @@
2931
[xData, yData, zData, iData, jData, kData] = ...
3032
getPlotlyMesh3d( xEdges, yEdges, values, barGap );
3133

34+
if strcmp(plotData.ShowEmptyBins, 'on'), zData = zData-1; end
35+
3236
cData = zeros(size(zData));
3337
for n = 1:2:length(zData), cData(n:n+1) = max(zData(n:n+1)); end
3438

@@ -65,17 +69,24 @@
6569
elseif strcmp(faceColor, 'flat')
6670
obj.data{dataIndex}.intensity = cData;
6771
obj.data{dataIndex}.colorscale = getColorScale(colorMap);
72+
obj.data{dataIndex}.cmin = axisData.CLim(1);
73+
obj.data{dataIndex}.cmax = axisData.CLim(2);
6874
obj.data{dataIndex}.showscale = false;
6975
end
7076

71-
obj.data{dataIndex}.flatshading = true;
72-
obj.data{dataIndex}.lighting.diffuse = 0.92;
73-
obj.data{dataIndex}.lighting.ambient = 0.54;
74-
obj.data{dataIndex}.lighting.specular = 1.42;
75-
obj.data{dataIndex}.lighting.roughness = 0.52;
76-
obj.data{dataIndex}.lighting.fresnel = 0.2;
77-
obj.data{dataIndex}.lighting.vertexnormalsepsilon = 1e-12;
78-
obj.data{dataIndex}.lighting.facenormalsepsilon = 1e-6;
77+
if ~strcmp(plotData.DisplayStyle, 'tile')
78+
obj.data{dataIndex}.flatshading = true;
79+
obj.data{dataIndex}.lighting.diffuse = 0.92;
80+
obj.data{dataIndex}.lighting.ambient = 0.54;
81+
obj.data{dataIndex}.lighting.specular = 1.42;
82+
obj.data{dataIndex}.lighting.roughness = 0.52;
83+
obj.data{dataIndex}.lighting.fresnel = 0.2;
84+
obj.data{dataIndex}.lighting.vertexnormalsepsilon = 1e-12;
85+
obj.data{dataIndex}.lighting.facenormalsepsilon = 1e-6;
86+
else
87+
obj.data{dataIndex}.lighting.diffuse = 0.92;
88+
obj.data{dataIndex}.lighting.ambient = 0.92;
89+
end
7990

8091
%--------------------------------------------------------------------------%
8192
end

0 commit comments

Comments
 (0)