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

Skip to content

fix issue #437 #461

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
Oct 26, 2021
Merged

fix issue #437 #461

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
37 changes: 8 additions & 29 deletions plotly/plotlyfig_aux/handlegraphics/updateScatter.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ function updateScatter(obj,plotIndex)
[xSource, ySource] = findSourceAxis(obj,axIndex);
plotData = get(obj.State.Plot(plotIndex).Handle);

%-check is 3D scatter-%
try
isScatter3D = isfield(plotData,'ZData');
isScatter3D = isScatter3D & ~isempty(plotData.ZData);
Expand Down Expand Up @@ -34,7 +35,7 @@ function updateScatter(obj,plotIndex)

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

%-set plot data-%
%-set trace data-%
obj.data{plotIndex}.x = plotData.XData;
obj.data{plotIndex}.y = plotData.YData;

Expand All @@ -44,39 +45,17 @@ function updateScatter(obj,plotIndex)

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

%-set marker property-%
%-set trace marker-%
obj.data{plotIndex}.marker = extractScatterMarker(plotData);
markerSize = obj.data{plotIndex}.marker.size;
markerColor = obj.data{plotIndex}.marker.color;
markerLineColor = obj.data{plotIndex}.marker.line.color;

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

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

if length(markerLineColor) == 1
obj.data{plotIndex}.marker.line.color = markerLineColor{1};
if isScatter3D
markerSize = obj.data{plotIndex}.marker.size;
obj.data{plotIndex}.marker.size = 2*markerSize;
end

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

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

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

obj.data{plotIndex}.showlegend = showleg;
obj.data{plotIndex}.showlegend = getShowLegend(plotData);
end

%-------------------------------------------------------------------------%
Expand Down
146 changes: 93 additions & 53 deletions plotly/plotlyfig_aux/helpers/extractScatterMarker.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,16 @@
%-INITIALIZATIONS-%
axisData = get(ancestor(plotData.Parent,'axes'));
figureData = get(ancestor(plotData.Parent,'figure'));
marker = struct();

marker = struct();
marker.sizeref = 1;
marker.sizemode = 'area';
marker.size = plotData.SizeData;
marker.line.width = plotData.LineWidth;

markerFaceColor = plotData.MarkerFaceColor;
markerFaceAlpha = plotData.MarkerFaceAlpha;
markerEdgeColor = plotData.MarkerEdgeColor;
markerEdgeAlpha = plotData.MarkerEdgeAlpha;
cData = plotData.CData;

colorMap = axisData.Colormap;
cLim = axisData.CLim;
marker.size = getmarkerSize(plotData);
marker.line.width = 1.5*plotData.LineWidth;

filledMarkerSet = {'o', 'square', 's', 'diamond', 'd', 'v', '^', ...
'<', '>', 'hexagram', 'pentagram'};
filledMarker = ismember(plotData.Marker, filledMarkerSet);
nColors = size(colorMap, 1);

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

Expand Down Expand Up @@ -73,54 +63,65 @@

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

%-get marker fillColor-%
%-marker fill-%
markerFaceColor = plotData.MarkerFaceColor;
markerFaceAlpha = plotData.MarkerFaceAlpha;

if filledMarker

%-get face color-%
if isnumeric(markerFaceColor)
fillColor = sprintf('rgb(%f,%f,%f)', 255*markerFaceColor);
faceColor = sprintf('rgb(%f,%f,%f)', 255*markerFaceColor);

else
switch markerFaceColor

case 'none'
fillColor = 'rgba(0,0,0,0)';
faceColor = 'rgba(0,0,0,0)';

case 'auto'
if ~strcmp(axisData.Color,'none')
fillColor = 255*axisData.Color;
faceColor = 255*axisData.Color;
else
fillColor = 255*figureData.Color;
faceColor = 255*figureData.Color;
end

fillColor = sprintf('rgb(%f,%f,%f)', fillColor);
faceColor = getStringColor(faceColor);

case 'flat'
faceColor = getScatterFlatColor(plotData, axisData);

for n = 1:size(cData, 1)
if size(cData, 2) == 1
cIndex = max( min( cData(n), cLim(2) ), cLim(1) );
scaleColor = (cIndex - cLim(1)) / diff(cLim);
cIndex = 1 + floor(scaleColor*(nColors-1));
numColor = 255 * colorMap(cIndex, :);

elseif size(cData, 2) == 3
numColor = 255*cData(n, :);
end

fillColor{n} = sprintf('rgb(%f,%f,%f)', numColor);
end
end
end

%-get face alpha-%
if isnumeric(markerFaceAlpha)
faceAlpha = markerFaceAlpha;
else
switch markerFaceColor

case 'none'
faceAlpha = 1;

case 'flat'
aLim = axisData.ALim;
faceAlpha = plotData.AlphaData;
faceAlpha = rescaleData(faceAlpha, aLim);
end
end

marker.color = fillColor;
marker.opacity = markerFaceAlpha;
%-set marker fill-%
marker.color = faceColor;
marker.opacity = faceAlpha;

end

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

%-get marker lineColor-%
%-marker line-%
markerEdgeColor = plotData.MarkerEdgeColor;
markerEdgeAlpha = plotData.MarkerEdgeAlpha;

if isnumeric(markerEdgeColor)
lineColor = sprintf('rgb(%f,%f,%f)', 255*markerEdgeColor);

Expand All @@ -131,34 +132,18 @@
lineColor = 'rgba(0,0,0,0)';

case 'auto'

EdgeColor = plotData.EdgeColor;

if ~strcmp(axisData.Color,'none')
lineColor = 255*axisData.Color;
else
lineColor = 255*figureData.Color;
end

lineColor = sprintf('rgba(%f,%f,%f,%f)', lineColor, ...
markerEdgeAlpha);
lineColor = getStringColor(lineColor, markerEdgeAlpha);

case 'flat'

for n = 1:size(cData, 1)
if size(cData, 2) == 1
cIndex = max( min( cData(n), cLim(2) ), cLim(1) );
scaleColor = (cIndex - cLim(1)) / diff(cLim);
cIndex = 1 + floor(scaleColor*(nColors-1));
numColor = 255 * colorMap(cIndex, :);

elseif size(cData, 2) == 3
numColor = 255*cData(n, :);
end

lineColor{n} = sprintf('rgba(%f,%f,%f,%f)', numColor, ...
markerEdgeAlpha);
end
lineColor = getScatterFlatColor(plotData, axisData);

end
end
Expand All @@ -171,3 +156,58 @@

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

function flatColor = getScatterFlatColor(plotData, axisData, opacity)

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

cData = plotData.CData;
colorMap = axisData.Colormap;
cLim = axisData.CLim;
nColors = size(colorMap, 1);
cDataByIndex = false;

if isvector(cData)
lenCData = length(cData);
nMarkers = length(plotData.XData);
cDataByIndex = lenCData == nMarkers || lenCData == 1;
end

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

if cDataByIndex
cMapInd = getcMapInd(cData, cLim, nColors);
numColor = 255 * colorMap(cMapInd, :);
else
numColor = 255*cData;
end

if size(numColor, 1) == 1
flatColor = getStringColor(numColor);

else
for n = 1:size(numColor, 1)
flatColor{n} = getStringColor(numColor(n, :));
end
end

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

function cMapInd = getcMapInd(cData, cLim, nColors)
scaledCData = rescaleData(cData, cLim);
cMapInd = 1 + floor(scaledCData*(nColors-1));
end

function outData = rescaleData(inData, dataLim)
outData = max( min( inData, dataLim(2) ), dataLim(1) );
outData = (outData - dataLim(1)) / diff(dataLim);
end

function markerSize = getmarkerSize(plotData)
markerSize = plotData.SizeData;

if length(markerSize) == 1
markerSize = markerSize * ones(size(plotData.XData));
end
end
12 changes: 10 additions & 2 deletions plotly/plotlyfig_aux/helpers/getStringColor.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
function stringColor = getStringColor(numColor)
function stringColor = getStringColor(numColor, opacity)

stringColor = sprintf('rgb(%f,%f,%f)', numColor);
if nargin == 1
stringColor = sprintf('rgb(%f,%f,%f)', numColor);

elseif nargin == 2
stringColor = sprintf('rgba(%f,%f,%f,%f)', numColor, opacity);

else
disp('Too many input arguments for getStringColor function.')
end
end