Skip to content

fix issues and awesome improvements in surfl functionality #395

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
Sep 21, 2021
Merged

fix issues and awesome improvements in surfl functionality #395

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
2 changes: 2 additions & 0 deletions plotly/plotlyfig_aux/core/updateData.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
updateSurfc(obj, dataIndex);
elseif strcmpi(obj.PlotOptions.TreatAs, 'meshc')
updateSurfc(obj, dataIndex);
elseif strcmpi(obj.PlotOptions.TreatAs, 'surfl')
updateSurfl(obj, dataIndex);

% this one will be revomed
elseif strcmpi(obj.PlotOptions.TreatAs, 'streamtube')
Expand Down
42 changes: 33 additions & 9 deletions plotly/plotlyfig_aux/handlegraphics/updateMesh.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,21 @@
obj.data{surfaceIndex}.y = yDataSurface;
obj.data{surfaceIndex}.z = zDataSurface;

%- setting grid mesh by default -%
% x-direction
xData = xData(1, :);
obj.data{surfaceIndex}.contours.x.start = xData(1);
obj.data{surfaceIndex}.contours.x.end = xData(end);
obj.data{surfaceIndex}.contours.x.size = mean(diff(xData));
obj.data{surfaceIndex}.contours.x.show = true;

% y-direction
yData = yData(:, 1);
obj.data{surfaceIndex}.contours.y.start = yData(1);
obj.data{surfaceIndex}.contours.y.end = yData(end);
obj.data{surfaceIndex}.contours.y.size = mean(diff(yData));;
obj.data{surfaceIndex}.contours.y.show = true;

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

%-set data on scatter3d-%
Expand Down Expand Up @@ -103,6 +118,9 @@
cDataContour = zDataContour(:);
obj.data{contourIndex}.line.colorscale = colorScale;

obj.data{surfaceIndex}.contours.x.show = false;
obj.data{surfaceIndex}.contours.y.show = false;

elseif strcmpi(meshData.EdgeColor, 'flat')
cData = meshData.CData;

Expand Down Expand Up @@ -132,13 +150,20 @@
cDataContourDir2 = [cDataContourDir2; NaN(1, size(cDataContourDir2, 2))];
cDataContour = [cDataContourDir1(:); cDataContourDir2(:)];

obj.data{surfaceIndex}.contours.x.show = false;
obj.data{surfaceIndex}.contours.y.show = false;

elseif strcmpi(meshData.EdgeColor, 'none')
cDataContour = 'rgba(0,0,0,0)';
obj.data{surfaceIndex}.contours.x.show = false;
obj.data{surfaceIndex}.contours.y.show = false;

end

%-set edge color-%
obj.data{contourIndex}.line.color = cDataContour;
obj.data{surfaceIndex}.contours.x.color = cDataContour;
obj.data{surfaceIndex}.contours.y.color = cDataContour;

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

Expand Down Expand Up @@ -202,6 +227,8 @@
end
else
cDataSurface = cData;
obj.data{surfaceIndex}.cmin = axisData.CLim(1);
obj.data{surfaceIndex}.cmax = axisData.CLim(2);
end

end
Expand Down Expand Up @@ -239,15 +266,12 @@

obj.data{contourIndex}.line.width = 3*meshData.LineWidth;

switch meshData.LineStyle
case '-'
obj.data{contourIndex}.line.dash = 'solid';
case '--'
obj.data{contourIndex}.line.dash = 'dash';
case '-.'
obj.data{contourIndex}.line.dash = 'dashdot';
case ':'
obj.data{contourIndex}.line.dash = 'dot';
if strcmpi(meshData.LineStyle, '-')
obj.data{contourIndex}.line.dash = 'solid';
else
obj.data{contourIndex}.line.dash = 'dot';
obj.data{surfaceIndex}.contours.x.show = false;
obj.data{surfaceIndex}.contours.y.show = false;
end

%-------------------------------------------------------------------------%
Expand Down
42 changes: 33 additions & 9 deletions plotly/plotlyfig_aux/handlegraphics/updateSurf.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,21 @@
obj.data{surfaceIndex}.y = yDataSurface;
obj.data{surfaceIndex}.z = zDataSurface;

%- setting grid mesh by default -%
% x-direction
xData = xData(1, :);
obj.data{surfaceIndex}.contours.x.start = xData(1);
obj.data{surfaceIndex}.contours.x.end = xData(end);
obj.data{surfaceIndex}.contours.x.size = mean(diff(xData));
obj.data{surfaceIndex}.contours.x.show = true;

% y-direction
yData = yData(:, 1);
obj.data{surfaceIndex}.contours.y.start = yData(1);
obj.data{surfaceIndex}.contours.y.end = yData(end);
obj.data{surfaceIndex}.contours.y.size = mean(diff(yData));;
obj.data{surfaceIndex}.contours.y.show = true;

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

%-set data on scatter3d-%
Expand Down Expand Up @@ -103,6 +118,9 @@
cDataContour = zDataContour(:);
obj.data{contourIndex}.line.colorscale = colorScale;

obj.data{surfaceIndex}.contours.x.show = false;
obj.data{surfaceIndex}.contours.y.show = false;

elseif strcmpi(meshData.EdgeColor, 'flat')
cData = meshData.CData;

Expand Down Expand Up @@ -132,13 +150,20 @@
cDataContourDir2 = [cDataContourDir2; NaN(1, size(cDataContourDir2, 2))];
cDataContour = [cDataContourDir1(:); cDataContourDir2(:)];

obj.data{surfaceIndex}.contours.x.show = false;
obj.data{surfaceIndex}.contours.y.show = false;

elseif strcmpi(meshData.EdgeColor, 'none')
cDataContour = 'rgba(0,0,0,0)';
obj.data{surfaceIndex}.contours.x.show = false;
obj.data{surfaceIndex}.contours.y.show = false;

end

%-set edge color-%
obj.data{contourIndex}.line.color = cDataContour;
obj.data{surfaceIndex}.contours.x.color = cDataContour;
obj.data{surfaceIndex}.contours.y.color = cDataContour;

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

Expand Down Expand Up @@ -202,6 +227,8 @@
end
else
cDataSurface = cData;
obj.data{surfaceIndex}.cmin = axisData.CLim(1);
obj.data{surfaceIndex}.cmax = axisData.CLim(2);
end

end
Expand Down Expand Up @@ -239,15 +266,12 @@

obj.data{contourIndex}.line.width = 3*meshData.LineWidth;

switch meshData.LineStyle
case '-'
obj.data{contourIndex}.line.dash = 'solid';
case '--'
obj.data{contourIndex}.line.dash = 'dash';
case '-.'
obj.data{contourIndex}.line.dash = 'dashdot';
case ':'
obj.data{contourIndex}.line.dash = 'dot';
if strcmpi(meshData.LineStyle, '-')
obj.data{contourIndex}.line.dash = 'solid';
else
obj.data{contourIndex}.line.dash = 'dot';
obj.data{surfaceIndex}.contours.x.show = false;
obj.data{surfaceIndex}.contours.y.show = false;
end

%-------------------------------------------------------------------------%
Expand Down
Loading