Use getLineDash everywhere

robertoffmoura · robertoffmoura · commit 78a836ef4537 · 2025-05-29T14:02:14.000+01:00
diff --git a/plotly/plotlyfig_aux/handlegraphics/updateBoxplot.m b/plotly/plotlyfig_aux/handlegraphics/updateBoxplot.m
@@ -182,8 +182,6 @@
         ydata = obj.data{boxIndex}.y;
     end
 
-    %----------------------------!AXIS UPDATE!----------------------------%
-
     % take first text object as prototype for axis tick style/layout
     text_child = findobj(obj.State.Plot(boxIndex).Handle, 'Type', 'text');
 
diff --git a/plotly/plotlyfig_aux/handlegraphics/updateComet.m b/plotly/plotlyfig_aux/handlegraphics/updateComet.m
@@ -145,8 +145,6 @@ function updateComet(obj,plotIndex)
         scene.aspectratio.y = 1.0*xyar;
         scene.aspectratio.z = zar;
 
-        %-----------------------------------------------------------------%
-
         %-camera eye-%
         ey = obj.PlotOptions.CameraEye;
 
@@ -181,8 +179,6 @@ function updateComet(obj,plotIndex)
             scene.camera.eye.z = zar + zfac*zar;
         end
 
-        %-----------------------------------------------------------------%
-
         %-scene axis configuration-%
 
         scene.xaxis.range = axisData.XLim;
@@ -230,8 +226,6 @@ function updateComet(obj,plotIndex)
         scene.yaxis.tickfont.family = matlab2plotlyfont(axisData.FontName);
         scene.zaxis.tickfont.family = matlab2plotlyfont(axisData.FontName);
 
-        %-----------------------------------------------------------------%
-
         %-SET SCENE TO LAYOUT-%
         obj.layout.("scene" + xsource) = scene;
     end
diff --git a/plotly/plotlyfig_aux/handlegraphics/updateContourgroup.m b/plotly/plotlyfig_aux/handlegraphics/updateContourgroup.m
@@ -82,20 +82,9 @@
         lineColor = "rgba(0,0,0,0)";
     end
 
-    switch plotData.LineStyle
-        case "-"
-            lineStyle = "solid";
-        case "--"
-            lineStyle = "dash";
-        case ":"
-            lineStyle = "dot";
-        case "-."
-            lineStyle = "dashdot";
-    end
-
     contourLine = struct( ...
         "width", 1.5*plotData.LineWidth, ...
-        "dash", lineStyle, ...
+        "dash", getLineDash(plotData.LineStyle), ...
         "color", lineColor, ...
         "smoothing", 0 ...
     );
diff --git a/plotly/plotlyfig_aux/handlegraphics/updateFmesh.m b/plotly/plotlyfig_aux/handlegraphics/updateFmesh.m
@@ -70,7 +70,7 @@
     fac = 1/(length(cMap)-1);
     colorScale = {};
 
-    for c = 1: length(cMap)
+    for c = 1:length(cMap)
         colorScale{c} = {(c-1)*fac, getStringColor(round(255*cMap(c, :)))};
     end
     %-get edge color-%
@@ -96,8 +96,8 @@
 
         [cDataSurface, cMapSurface] = rgb2ind(cDataSurface, 256);
 
-        for c = 1: size(cMapSurface, 1)
-            colorScale{c} = { (c-1)*fac , getStringColor(round(255*cMapSurface(c, :)), 1)};
+        for c = 1:size(cMapSurface, 1)
+            colorScale{c} = {(c-1)*fac, getStringColor(round(255*cMapSurface(c, :)), 1)};
         end
 
         obj.data{surfaceIndex}.cmin = 0;
@@ -121,18 +121,12 @@
         end
     end
 
-    %-set face color-%
     obj.data{surfaceIndex}.colorscale = colorScale;
     obj.data{surfaceIndex}.surfacecolor = cDataSurface;
 
-    %-lighting settings-%
-
     if isnumeric(meshData.FaceColor) && all(meshData.FaceColor == [1, 1, 1])
         obj.data{surfaceIndex}.lighting.diffuse = 0.5;
         obj.data{surfaceIndex}.lighting.ambient = 0.725;
-    else
-        % obj.data{surfaceIndex}.lighting.diffuse = 1.0;
-        % obj.data{surfaceIndex}.lighting.ambient = 0.9;
     end
 
     if meshData.FaceAlpha ~= 1
@@ -145,25 +139,11 @@
         obj.data{surfaceIndex}.lighting.ambient = 0.3;
     end
 
-    %-opacity-%
     obj.data{surfaceIndex}.opacity = meshData.FaceAlpha;
 
-    %-line style-%
-
     obj.data{contourIndex}.line.width = 3*meshData.LineWidth;
+    obj.data{contourIndex}.line.dash = getLineDash(meshData.LineStyle);
 
-    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';
-    end
-
-    %-show contours-%
 
     if strcmpi(meshData.ShowContours, 'on')
         obj.PlotOptions.nPlots = obj.PlotOptions.nPlots + 1;
@@ -188,8 +168,6 @@
     end
 
     %-SCENE CONFIGURATION-%
-
-    %-aspect ratio-%
     asr = obj.PlotOptions.AspectRatio;
 
     if ~isempty(asr)
diff --git a/plotly/plotlyfig_aux/handlegraphics/updateFunctionContour.m b/plotly/plotlyfig_aux/handlegraphics/updateFunctionContour.m
@@ -79,18 +79,7 @@
         end
 
         data.line.width = contour_data.LineWidth;
-
-        switch contour_data.LineStyle
-            case "-"
-                LineStyle = "solid";
-            case "--"
-                LineStyle = "dash";
-            case ":"
-                LineStyle = "dot";
-            case "-."
-                LineStyle = "dashdot";
-        end
-        data.line.dash = LineStyle;
+        data.line.dash = getLineDash(contour_data.LineStyle);
         data.line.smoothing = 0;
     else
         data.contours.showlines = false;
diff --git a/plotly/plotlyfig_aux/handlegraphics/updateFunctionSurface.m b/plotly/plotlyfig_aux/handlegraphics/updateFunctionSurface.m
@@ -109,17 +109,7 @@
 
     surfaceData.opacity = meshData.FaceAlpha;
     contourData.line.width = 3*meshData.LineWidth;
-
-    switch meshData.LineStyle
-        case "-"
-            contourData.line.dash = "solid";
-        case "--"
-            contourData.line.dash = "dash";
-        case "-."
-            contourData.line.dash = "dashdot";
-        case ":"
-            contourData.line.dash = "dot";
-    end
+    contourData.line.dash = getLineDash(meshData.LineStyle);
 
     switch meshData.Annotation.LegendInformation.IconDisplayStyle
         case "on"
diff --git a/plotly/plotlyfig_aux/handlegraphics/updateGeobubble.m b/plotly/plotlyfig_aux/handlegraphics/updateGeobubble.m
@@ -57,8 +57,6 @@ function updateGeobubble(obj,geoIndex)
             p = obj.PlotOptions.nPlots;
         end
 
-        %-----------------------------------------------------------------%
-
         %-set current trace-%
         if strcmpi(obj.PlotOptions.geoRenderType, 'geo')
             obj.data{p}.type = 'scattergeo';
@@ -71,14 +69,10 @@ function updateGeobubble(obj,geoIndex)
 
         obj.data{p}.mode = 'markers';
 
-        %-----------------------------------------------------------------%
-
         %-set current trace data-%
         obj.data{p}.lat = lat{g};
         obj.data{p}.lon = lon{g};
 
-        %-----------------------------------------------------------------%
-
         %-set trace marker-%
         marker = struct();
         marker.size = sData{g}*1.25;
@@ -87,8 +81,6 @@ function updateGeobubble(obj,geoIndex)
 
         obj.data{p}.marker = marker;
 
-        %-----------------------------------------------------------------%
-
         %-legend-%
         if byGroups
             obj.data{p}.name = group{g};
@@ -204,8 +196,6 @@ function updateGeobubble(obj,geoIndex)
       obj.layout.annotations{1}.font.size = 1.5*geoData.FontSize;
     end
 
-    %---------------------------------------------------------------------%
-
     %-setting legend-%
     if byGroups
         obj.layout.showlegend = true;
diff --git a/plotly/plotlyfig_aux/handlegraphics/updatePatch.m b/plotly/plotlyfig_aux/handlegraphics/updatePatch.m
@@ -82,8 +82,6 @@
             obj.data{patchIndex}.x = xnew;
         end
 
-        %-----------------------------------------------------------------%
-
         %-patch y-%
         ydata = patch_data.YData;
         if isvector(ydata)
@@ -96,8 +94,6 @@
             obj.data{patchIndex}.y = ynew;
         end
 
-        %-----------------------------------------------------------------%
-
         %-patch z-%
         if any(nonzeros(patch_data.ZData))
             zdata = patch_data.ZData;
@@ -112,13 +108,9 @@
             end
         end
 
-        %-----------------------------------------------------------------%
-
         obj.data{patchIndex}.name = patch_data.DisplayName;
         obj.data{patchIndex}.visible = strcmp(patch_data.Visible,'on');
 
-        %-----------------------------------------------------------------%
-
         %-patch fill-%
         obj.data{patchIndex}.fill = 'tozeroy';
 
@@ -138,8 +130,6 @@
         obj.data{patchIndex}.marker = extractPatchMarker(patch_data);
         obj.data{patchIndex}.line = extractPatchLine(patch_data);
 
-        %-----------------------------------------------------------------%
-
         %-patch fillcolor-%
         fill = extractPatchFace(patch_data);
 
@@ -149,8 +139,6 @@
             obj.data{patchIndex}.surfacecolor = fill.color;
         end
 
-        %-----------------------------------------------------------------%
-
         %-surfaceaxis-%
         if strcmp(obj.data{patchIndex}.type,'scatter3d')
             minstd = min([std(patch_data.XData) std(patch_data.YData) std(patch_data.ZData)]);
diff --git a/plotly/plotlyfig_aux/handlegraphics/updateScatterhistogram.m b/plotly/plotlyfig_aux/handlegraphics/updateScatterhistogram.m
@@ -367,19 +367,6 @@ function updateYMarginalAxis(obj, plotIndex)
     end
 end
 
-function lineDash = getLineDash(lineStyle)
-    switch lineStyle
-        case '-'
-            lineDash = 'solid';
-        case '--'
-            lineDash = 'dash';
-        case ':'
-            lineDash = 'dot';
-        case '-.'
-            lineDash = 'dashdot';
-    end
-end
-
 function axisLim = getAxisLim(plotData, axName)
     axisLim = plotData.(axName + "Limits");
     axisPlot = plotData.(axName + "Data");
diff --git a/plotly/plotlyfig_aux/handlegraphics/updateSpiderPlot.m b/plotly/plotlyfig_aux/handlegraphics/updateSpiderPlot.m
@@ -100,30 +100,14 @@
 end
 
 function lineStruct = getLine(plotData, traceIndex)
-    %-INITIALIZATIONS-%
-    lineStruct = struct();
-
-    %-line color-%
     [lineColor, ~] = getColor(plotData.Color, traceIndex, ...
         plotData.LineTransparency);
-    lineStruct.color = lineColor;
-
-    %-line width-%
-    lineStruct.width = plotData.LineWidth(traceIndex);
-
-    %-line style-%
-    switch plotData.LineStyle{traceIndex, 1}
-        case '-'
-            lineStyle = 'solid';
-        case '--'
-            lineStyle = 'dash';
-        case ':'
-            lineStyle = 'dot';
-        case '-.'
-            lineStyle = 'dashdot';
-    end
 
-    lineStruct.dash = lineStyle;
+    lineStruct = struct( ...
+        "color", lineColor, ...
+        "width", plotData.LineWidth(traceIndex), ...
+        "dash", getLineDash(plotData.LineStyle{traceIndex, 1}) ...
+    );
 end
 
 function markerStruct = getMarker(plotData, traceIndex)
diff --git a/plotly/plotlyfig_aux/handlegraphics/updateSurfc.m b/plotly/plotlyfig_aux/handlegraphics/updateSurfc.m
@@ -61,9 +61,6 @@ function updateContourOnly(obj, contourIndex)
         yData = [yData, contourMatrix(2, n+1:n+m), NaN];
         zData = [zData, zmin * ones(1, m), NaN];
 
-        %-----------------------------------------------------------------%
-
-        %-get edge color-%
         if isnumeric(contourData.LineColor)
             cData = getStringColor(round(255*contourData.LineColor));
         elseif strcmpi(contourData.LineColor, 'interp')
@@ -82,24 +79,13 @@ function updateContourOnly(obj, contourIndex)
         n = n + m + 1;
     end
 
-    %-set data on scatter3d-%
     obj.data{contourIndex}.x = xData;
     obj.data{contourIndex}.y = yData;
     obj.data{contourIndex}.z = zData;
 
     obj.data{contourIndex}.line.color = cData;
     obj.data{contourIndex}.line.width = 2*contourData.LineWidth;
-
-    switch contourData.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';
-    end
+    obj.data{contourIndex}.line.dash = getLineDash(contourData.LineStyle);
 
     obj.data{contourIndex}.name = contourData.DisplayName;
     obj.data{contourIndex}.showscale = false;
diff --git a/plotly/plotlyfig_aux/handlegraphics/updateTernaryContour.m b/plotly/plotlyfig_aux/handlegraphics/updateTernaryContour.m
@@ -88,17 +88,7 @@
         %-line settings-%
         obj.data{traceIndex}.line.width = 1.0*ternaryData.LineWidth;
         obj.data{traceIndex}.line.color = lineColor{c};
-
-        switch ternaryData.LineStyle
-            case '-'
-                obj.data{traceIndex}.line.dash = 'solid';
-            case '--'
-                obj.data{traceIndex}.line.dash = 'dash';
-            case '-.'
-                obj.data{traceIndex}.line.dash = 'dashdot';
-            case ':'
-                obj.data{traceIndex}.line.dash = 'dot';
-        end
+        obj.data{traceIndex}.line.dash = getLineDash(ternaryData.LineStyle);
 
         %-some trace settings-%
         obj.data{traceIndex}.name = ternaryData.DisplayName;
@@ -239,17 +229,7 @@ function fillContours(obj, ternaryIndex)
         obj.data{traceIndex}.line.shape = 'spline';
         obj.data{traceIndex}.line.smoothing = 1.3;
         obj.data{traceIndex}.line.width = 1.0*ternaryData.LineWidth;
-
-        switch ternaryData.LineStyle
-            case '-'
-                obj.data{traceIndex}.line.dash = 'solid';
-            case '--'
-                obj.data{traceIndex}.line.dash = 'dash';
-            case '-.'
-                obj.data{traceIndex}.line.dash = 'dashdot';
-            case ':'
-                obj.data{traceIndex}.line.dash = 'dot';
-        end
+        obj.data{traceIndex}.line.dash = getLineDash(ternaryData.LineStyle);
 
         %-fill settings-%
         obj.data{traceIndex}.fill = 'toself';
diff --git a/plotly/plotlyfig_aux/helpers/extractAreaLine.m b/plotly/plotlyfig_aux/helpers/extractAreaLine.m
diff --git a/plotly/plotlyfig_aux/helpers/extractGeoLinePlusMarker.m b/plotly/plotlyfig_aux/helpers/extractGeoLinePlusMarker.m
diff --git a/plotly/plotlyfig_aux/helpers/extractHeatmapAxisData.m b/plotly/plotlyfig_aux/helpers/extractHeatmapAxisData.m
diff --git a/plotly/plotlyfig_aux/helpers/extractLineLine.m b/plotly/plotlyfig_aux/helpers/extractLineLine.m
diff --git a/plotly/plotlyfig_aux/helpers/extractPatchLine.m b/plotly/plotlyfig_aux/helpers/extractPatchLine.m
diff --git a/plotly/plotlyfig_aux/helpers/getLineDash.m b/plotly/plotlyfig_aux/helpers/getLineDash.m
