Fix scatterhist() plots

Author: robertoffmoura

plotly/Test_plotlyfig.m

@@ -1685,6 +1685,77 @@ function testIsosurfacePlotData(tc)
             ));
         end
 
+        function testScatterHistPlotData(tc)
+            fig = figure("Visible","off");
+            x = [0.15 0.19 0.04 0.64 0.28 0.54 0.70 0.50 0.54 0.45];
+            y = [0.12 0.49 0.85 0.87 0.27 0.21 0.56 0.64 0.42 0.21];
+            scatterhist(x,y);
+
+            p = plotlyfig(fig,"visible","off");
+
+            tc.verifyNumElements(p.data, 3);
+            tc.verifyEqual(p.data{1}, struct( ...
+                "type", "scatter", ...
+                "xaxis", "x1", ...
+                "yaxis", "y1", ...
+                "visible", true, ...
+                "name", '', ...
+                "mode", 'markers', ...
+                "x", x, ...
+                "y", y, ...
+                "line", struct(), ...
+                "marker", struct( ...
+                    "size", 3.6, ...
+                    "symbol", "circle", ...
+                    "line", struct( ...
+                        "width", 0.5, ...
+                        "color", "rgb(0,114,189)" ...
+                    ), ...
+                    "color", "rgba(0,0,0,0)" ...
+                ), ...
+                "showlegend", false ...
+            ), AbsTol=1e-15);
+            tc.verifyEqual(p.data{2}, struct( ...
+                "xaxis", "x2", ...
+                "yaxis", "y2", ...
+                "type", "bar", ...
+                "name", '', ...
+                "x", [0.8 1.2], ...
+                "width", [0.5 0.5], ...
+                "y", [0.25 0.75], ...
+                "orientation", "h", ...
+                "marker", struct( ...
+                    "line", struct( ...
+                        "width", 0.5, ...
+                        "color", "rgba(0,0,0,1.000000)" ...
+                    ), ...
+                    "color", "rgba(0,114,189,0.600000)" ...
+                ), ...
+                "opacity", 0.75, ...
+                "visible", true, ...
+                "showlegend", true ...
+            ), AbsTol=1e-15);
+            tc.verifyEqual(p.data{3}, struct( ...
+                "xaxis", "x3", ...
+                "yaxis", "y3", ...
+                "type", "bar", ...
+                "name", '', ...
+                "x", [0.15 0.45 0.75], ...
+                "width", [0.3 0.3 0.3], ...
+                "y", [4/3 4/3 2/3], ...
+                "marker", struct( ...
+                    "line", struct( ...
+                        "width", 0.5, ...
+                        "color", "rgba(0,0,0,1.000000)" ...
+                    ), ...
+                    "color", "rgba(0,114,189,0.600000)" ...
+                ), ...
+                "opacity", 0.75, ...
+                "visible", true, ...
+                "showlegend", true ...
+            ), AbsTol=1e-15);
+        end
+
         function testTitleFont(tc)
             fig = figure("Visible","off");
             x = 1:10;

plotly/plotlyfig.m

@@ -607,7 +607,8 @@ function validate(obj)
 
             % update axes
             for n = 1:obj.State.Figure.NumAxes
-                if ismember(ax(n).Type,specialAxisPlots())
+                nrev = length(ax) - n + 1;
+                if ismember(ax(nrev).Type,specialAxisPlots())
                     continue
                 end
                 if ~obj.PlotlyDefaults.isMultipleYAxes(n)

plotly/plotlyfig_aux/core/updateData.m

@@ -164,6 +164,9 @@
                 if isBoxplot(obj, dataIndex)
                     updateBoxplot(obj, dataIndex);
                 end
+            case {"uimenu","uicontextmenu"}
+                % Do nothing
+                return
             otherwise
                 error("Non-supported plot: %s", ...
                         lower(obj.State.Plot(dataIndex).Class));

plotly/plotlyfig_aux/handlegraphics/updateHistogram.m

@@ -45,13 +45,9 @@
     % outliercolor: ...[NA]
     % outlierwidth: ...[NA]
 
-    %-AXIS INDEX-%
-    axIndex = obj.getAxisIndex(obj.State.Plot(histIndex).AssociatedAxis);
-
-    %-HIST DATA STRUCTURE- %
+    axisData = obj.State.Plot(histIndex).AssociatedAxis;
+    axIndex = obj.getAxisIndex(axisData);
     hist_data = obj.State.Plot(histIndex).Handle;
-
-    %-CHECK FOR MULTIPLE AXES-%
     [xsource, ysource] = findSourceAxis(obj,axIndex);
 
     data.xaxis = "x" + xsource;
@@ -124,6 +120,14 @@
                     / (hist_data.XData(3,1) - hist_data.XData(2,1));
     end
 
+    if axisData.Tag == "yhist"
+        % scatterhist() function
+        data.orientation = "h";
+        temp = data.x;
+        data.x = flip(data.y);
+        data.y = temp;
+    end
+
     data.name = hist_data.DisplayName;
     obj.layout.barmode = "overlay";
     data.marker.line.width = hist_data.LineWidth;

plotly/plotlyfig_aux/helpers/specialAxisPlots.m

@@ -1,3 +1,3 @@
 function out = specialAxisPlots()
-    out = ["polaraxes" "stackedplot"];
+    out = ["polaraxes" "stackedplot" "uicontextmenu"];
 end