Merge branch 'h2ofan-master'

Author: galvisgilberto

plotly/plotlyfig_aux/core/updateData.m

@@ -11,6 +11,8 @@
             updateImage(obj, dataIndex);
         case 'line'
             updateLineseries(obj, dataIndex);
+        case 'histogram'
+            updateHistogram(obj,dataIndex);
         case 'patch'
             % check for histogram
             if isHistogram(obj,dataIndex)
@@ -114,4 +116,4 @@
 
 %-------------------------------------------------------------------------%
 
-end
+end

plotly/plotlyfig_aux/handlegraphics/updateHistogram.m

@@ -83,11 +83,33 @@
 
 %-------------------------------------------------------------------------%
 
-orientation = histogramOrientation(hist_data);
+if isfield(hist_data, 'Orientation')
+  %-Matlab 2014+ histogram() function-%
+  orientation = hist_data.Orientation;
+else
+  %-Matlab <2014 hist() function-%
+  orientation = histogramOrientation(hist_data);
+end
 
 switch orientation
-    case 'v'
+    case {'vertical', 'horizontal'}
+        % histogram()
+
+        obj.data{histIndex}.x = sort(hist_data.Data.');
+        obj.data{histIndex}.autobinx = false;
+        
+        obj.data{histIndex}.xbins.start = hist_data.BinEdges(1);
+        obj.data{histIndex}.xbins.end   = hist_data.BinEdges(end);
+        obj.data{histIndex}.xbins.size  = mean(hist_data.BinEdges(2:end)-hist_data.BinEdges(1:end-1));
+
+        %-------------------------------------------------------------------------%
+        
+        %-layout bargap-%
+        obj.layout.bargap = 0;
 
+        %-------------------------------------------------------------------------%
+
+    case 'v'
         %-hist x data-%
         xdata = mean(hist_data.XData(2:3,:));
 
@@ -115,15 +137,19 @@
 
         %-------------------------------------------------------------------------%
 
+        %-layout bargap-%
+        obj.layout.bargap = (hist_data.XData(3,1)-hist_data.XData(2,2))/(hist_data.XData(3,1)-hist_data.XData(2,1));
+        
+        %-------------------------------------------------------------------------%
+        
 
     case 'h'
 
         %-hist y data-%
         ydata = mean(hist_data.YData(2:3,:));
 
         %-------------------------------------------------------------------------%
-        
-        %-hist y data-%
+
         ylength = 0;
         for d = 1:length(ydata)
             obj.data{histIndex}.y(ylength + 1: ylength + hist_data.XData(2,d)) = repmat(ydata(d),1,hist_data.XData(2,d));
@@ -144,6 +170,11 @@
         obj.data{histIndex}.ybins = ybins; 
 
         %-------------------------------------------------------------------------%
+        
+        %-layout bargap-%
+        obj.layout.bargap = (hist_data.XData(3,1)-hist_data.XData(2,2))/(hist_data.XData(3,1)-hist_data.XData(2,1));
+        
+        %-------------------------------------------------------------------------%
 
 end
 
@@ -159,11 +190,6 @@
 
 %-------------------------------------------------------------------------%
 
-%-layout bargap-%
-obj.layout.bargap = (hist_data.XData(3,1)-hist_data.XData(2,2))/(hist_data.XData(3,1)-hist_data.XData(2,1));
-
-%-------------------------------------------------------------------------%
-
 %-hist line width-%
 obj.data{histIndex}.marker.line.width = hist_data.LineWidth;
 
@@ -176,7 +202,6 @@
 
 %-------------------------------------------------------------------------%
 
-%-hist marker-%
 obj.data{histIndex}.marker = extractPatchFace(hist_data);
 
 %-------------------------------------------------------------------------%