Refactor extractAreaFace and extractPatchFace

Author: robertoffmoura

plotly/plotlyfig_aux/helpers/extractAreaFace.m

@@ -4,20 +4,9 @@
     % BARSERIES, CONTOURGROUP, SCATTERGROUP.
 
     %-AXIS STRUCTURE-%
-    axis_data = ancestor(area_data,"axes");
+    cLim = ancestor(area_data,"axes").CLim;
+    colormap = ancestor(area_data, "figure").Colormap;
 
-    %-FIGURE STRUCTURE-%
-    figure_data = ancestor(area_data,"figure");
-
-    %-INITIALIZE OUTPUT-%
-    face = struct();
-
-    %--FACE FILL COLOR--%
-
-    %-figure colormap-%
-    colormap = figure_data.Colormap;
-
-    % face face color
     MarkerColor = area_data.FaceColor;
     if isnumeric(MarkerColor)
         col = MarkerColor;
@@ -29,14 +18,14 @@
                 alpha = 0;
             case "flat"
                 areaACData = area_data.getColorAlphaDataExtents;
-                capCD = max(min(areaACData(1,1),axis_data.CLim(2)), ...
-                        axis_data.CLim(1));
-                scalefactor = (capCD - axis_data.CLim(1)) ...
-                        / diff(axis_data.CLim);
-                col = (colormap(1 + floor(scalefactor ...
-                        * (length(colormap)-1)),:));
+                capCD = max(min(areaACData(1,1),cLim(2)), cLim(1));
+                scalefactor = (capCD - cLim(1)) / diff(cLim);
+                col = colormap(1 + floor(scalefactor ...
+                        * (length(colormap)-1)),:);
                 alpha = area_data.FaceAlpha;
         end
     end
-    face.color = getStringColor(round(255*col), alpha);
+    face = struct(...
+        "color", getStringColor(round(255*col), alpha) ...
+    );
 end

plotly/plotlyfig_aux/helpers/extractPatchFace.m

@@ -2,23 +2,13 @@
     % EXTRACTS THE FACE STYLE USED FOR MATLAB OBJECTS
     % OF TYPE "PATCH". THESE OBJECTS ARE USED BOXPLOTS.
 
-    %-AXIS STRUCTURE-%
-    axis_data = ancestor(patch_data.Parent,"axes");
+    cLim = ancestor(patch_data.Parent, ["axes" "polaraxes"]).CLim;
+    colormap = ancestor(patch_data.Parent, "figure").Colormap;
 
-    %-FIGURE STRUCTURE-%
-    figure_data = ancestor(patch_data.Parent,"figure");
-
-    %-INITIALIZE OUTPUT-%
     marker = struct();
-
-    %-PATCH EDGE WIDTH-%
     marker.line.width = patch_data.LineWidth;
 
-    %-PATCH FACE COLOR-%
-    colormap = figure_data.Colormap;
-
     if isnumeric(patch_data.FaceColor)
-        %-paper_bgcolor-%
         col = patch_data.FaceColor;
         alpha = patch_data.FaceAlpha;
     else
@@ -27,19 +17,18 @@
                 col = [0 0 0];
                 alpha = 0;
             case {"flat","interp"}
+                faceVertexCData = patch_data.FaceVertexCData(1,1);
                 switch patch_data.CDataMapping
                     case "scaled"
-                        capCD = max(min(patch_data.FaceVertexCData(1,1), ...
-                                axis_data.CLim(2)), axis_data.CLim(1));
-                        scalefactor = (capCD - axis_data.CLim(1)) ...
-                                / diff(axis_data.CLim);
+                        capCD = max(min(faceVertexCData, cLim(2)), cLim(1));
+                        scalefactor = (capCD - cLim(1)) / diff(cLim);
                         col = colormap(1 + floor(scalefactor ...
                                 * (length(colormap)-1)),:);
                     case "direct"
-                        col = colormap(patch_data.FaceVertexCData(1,1),:);
+                        col = colormap(faceVertexCData,:);
                 end
                 alpha = patch_data.FaceAlpha;
-            case 'auto'
+            case "auto"
                 cIndex = find(flipud(arrayfun(@(x) isequaln(x,patch_data), ...
                         patch_data.Parent.Children))); % far from pretty
                 col = patch_data.Parent.ColorOrder(cIndex,:);
@@ -48,7 +37,6 @@
     end
     marker.color = getStringColor(round(255*col), alpha);
 
-    %-PATCH EDGE COLOR-%
     if isnumeric(patch_data.EdgeColor)
         col = patch_data.EdgeColor;
         alpha = patch_data.EdgeAlpha;
@@ -58,16 +46,15 @@
                 col = [0 0 0];
                 alpha = 0;
             case "flat"
+                faceVertexCData = patch_data.FaceVertexCData(1,1);
                 switch patch_data.CDataMapping
                     case "scaled"
-                        capCD = max(min(patch_data.FaceVertexCData(1,1), ...
-                                axis_data.CLim(2)), axis_data.CLim(1));
-                        scalefactor = (capCD - axis_data.CLim(1)) ...
-                                / diff(axis_data.CLim);
+                        capCD = max(min(faceVertexCData, cLim(2)), cLim(1));
+                        scalefactor = (capCD - cLim(1)) / diff(cLim);
                         col = colormap(1 + floor(scalefactor ...
                                 * (length(colormap)-1)),:);
                     case "direct"
-                        col = colormap(patch_data.FaceVertexCData(1,1),:);
+                        col = colormap(faceVertexCData,:);
                 end
                 alpha = patch_data.EdgeAlpha;
         end