Refactor extractBarMarker.m

Author: robertoffmoura

plotly/plotlyfig_aux/helpers/extractBarMarker.m

@@ -2,70 +2,38 @@
     % EXTRACTS THE FACE STYLE USED FOR MATLAB OBJECTS
     % OF TYPE "bar". THESE OBJECTS ARE USED BARGRAPHS.
 
-    %-AXIS STRUCTURE-%
-    axis_data = ancestor(bar_data.Parent,'axes');
-
-    %-FIGURE STRUCTURE-%
-    figure_data = ancestor(bar_data.Parent,'figure');
-
-    %-INITIALIZE OUTPUT-%
-    marker = struct();
-
-    %-bar EDGE WIDTH-%
-    marker.line.width = bar_data.LineWidth;
-
-    %-bar FACE COLOR-%
-
-    colormap = figure_data.Colormap;
-
-    if isnumeric(bar_data.FaceColor)
-        %-paper_bgcolor-%
-        col = round(255*bar_data.FaceColor);
-        marker.color = getStringColor(col);
-    else
-        switch bar_data.FaceColor
-            case 'none'
-                marker.color = 'rgba(0,0,0,0)';
-            case 'flat'
-                switch bar_data.CDataMapping
-                    case 'scaled'
-                        capCD = max(min(bar_data.FaceVertexCData(1,1), ...
-                                axis_data.CLim(2)), axis_data.CLim(1));
-                        scalefactor = (capCD - axis_data.CLim(1)) ...
-                                / diff(axis_data.CLim);
-                        col = round(255*(colormap(1+ floor(scalefactor ...
-                                * (length(colormap)-1)),:)));
-                    case 'direct'
-                        col = round(255*(colormap( ...
-                                bar_data.FaceVertexCData(1,1),:)));
-                end
-                marker.color = getStringColor(col);
-        end
-    end
-
-    %-bar EDGE COLOR-%
+    cLim = ancestor(bar_data.Parent, "axes").CLim;
+    colormap = ancestor(bar_data.Parent, "figure").Colormap;
+    cDataMapping = bar_data.CDataMapping;
+    faceVertexCData = bar_data.FaceVertexCData(1,1);
+
+    marker = struct( ...
+        "line", struct( ...
+            "width", bar_data.LineWidth, ...
+            "color", extractColor(bar_data.EdgeColor, cDataMapping, colormap, cLim, faceVertexCData) ...
+        ), ...
+        "color", extractColor(bar_data.FaceColor, cDataMapping, colormap, cLim, faceVertexCData) ...
+    );
+end
 
-    if isnumeric(bar_data.EdgeColor)
-        col = round(255*bar_data.EdgeColor);
-        marker.line.color = getStringColor(col);
+function out = extractColor(color, cDataMapping, colormap, cLim, faceVertexCData)
+    if isnumeric(color)
+        out = getStringColor(round(255*color));
     else
-        switch bar_data.EdgeColor
-            case 'none'
-                marker.line.color = 'rgba(0,0,0,0)';
-            case 'flat'
-                switch bar_data.CDataMapping
-                    case 'scaled'
-                        capCD = max(min(bar_data.FaceVertexCData(1,1), ...
-                                axis_data.CLim(2)), axis_data.CLim(1));
-                        scalefactor = (capCD - axis_data.CLim(1)) ...
-                                / diff(axis_data.CLim);
-                        col = round(255*(colormap(1+floor(scalefactor ...
-                                * (length(colormap)-1)),:)));
-                    case 'direct'
-                        col = round(255*(colormap( ...
-                                bar_data.FaceVertexCData(1,1),:)));
+        switch color
+            case "none"
+                out = "rgba(0,0,0,0)";
+            case "flat"
+                switch cDataMapping
+                    case "scaled"
+                        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(faceVertexCData,:);
                 end
-                marker.line.color = getStringColor(col);
+                out = getStringColor(round(255*col));
         end
     end
 end