Merge branch 'master' into plotly-offline

Author: gilbertogalvis

plotly/plotlyfig.m

@@ -57,6 +57,8 @@
             obj.PlotOptions.AspectRatio = [];
             obj.PlotOptions.CameraEye = [];
             obj.PlotOptions.is_headmap_axis = false;
+            obj.PlotOptions.Quality = -1;
+            obj.PlotOptions.Zmin = [];
 
             % offline options
             obj.PlotOptions.Offline = true;
@@ -224,6 +226,12 @@
                         if(strcmpi(varargin{a},'CameraEye'))
                             obj.PlotOptions.CameraEye = varargin{a+1};
                         end
+                        if(strcmpi(varargin{a},'Quality'))
+                            obj.PlotOptions.Quality = varargin{a+1};
+                        end
+                        if(strcmpi(varargin{a},'Zmin'))
+                            obj.PlotOptions.Zmin = varargin{a+1};
+                        end
                     end
             end
 

plotly/plotlyfig_aux/core/updateData.m

@@ -19,6 +19,10 @@
             updateLineseries(obj, dataIndex);
         elseif strcmpi(obj.PlotOptions.TreatAs, 'ezpolar')
             updateLineseries(obj, dataIndex);
+        elseif strcmpi(obj.PlotOptions.TreatAs, 'polarhistogram')
+            updateHistogramPolar(obj, dataIndex); 
+
+        % this one will be revomed
         elseif strcmpi(obj.PlotOptions.TreatAs, 'streamtube')
             updateStreamtube(obj, dataIndex);
         end
@@ -43,11 +47,7 @@
             case 'categoricalhistogram'
                 updateCategoricalHistogram(obj, dataIndex); 
             case 'histogram'
-                if strcmpi(obj.State.Axis(dataIndex).Handle.Type, 'polaraxes')
-                    updateHistogramPolar(obj, dataIndex); 
-                else
-                    updateHistogram(obj, dataIndex);
-                end
+                updateHistogram(obj, dataIndex);
             case 'histogram2'
                 updateHistogram2(obj, dataIndex);
             case 'patch'

plotly/plotlyfig_aux/handlegraphics/updateCategoricalHistogram.m

@@ -80,19 +80,19 @@
 
 %-hist data-%
 obj.data{histIndex}.width = hist_data.BarWidth;
-obj.data{histIndex}.y = hist_data.BinCounts;
+obj.data{histIndex}.y = hist_data.Values;
 
 %-------------------------------------------------------------------------%
 
 %-hist categorical layout on x-axis-%
-obj.layout.xaxis1.type = 'category';
-obj.layout.xaxis1.autotick = false;
-
 gap = 1 - hist_data.BarWidth;
-xmin = -0.5 * gap;
-xmax = (hist_data.NumDisplayBins - 1) + 0.5 * gap;
+xmin = -gap;
+xmax = (hist_data.NumDisplayBins - 1) + gap;
 
-obj.layout.xaxis1.range = {xmin, xmax};
+t = 'category';
+eval(['obj.layout.xaxis' num2str(xsource) '.type = t;']);
+eval(['obj.layout.xaxis' num2str(xsource) '.autotick = false;']);
+eval(['obj.layout.xaxis' num2str(xsource) '.range = {xmin, xmax};']);
 
 %-------------------------------------------------------------------------%
 
@@ -113,7 +113,7 @@
 
 %-hist opacity-%
 if ~ischar(hist_data.FaceAlpha)
-    obj.data{histIndex}.opacity = hist_data.FaceAlpha;
+    obj.data{histIndex}.opacity = 1.25*hist_data.FaceAlpha;
 end
 
 %-------------------------------------------------------------------------%

plotly/plotlyfig_aux/handlegraphics/updateHistogram.m

@@ -94,7 +94,7 @@
 
         obj.data{histIndex}.x = hist_data.BinEdges(1:end-1) + 0.5*diff(hist_data.BinEdges);
         obj.data{histIndex}.width = diff(hist_data.BinEdges);%[hist_data.BinEdges(2:end), hist_data.Data(end)];
-        obj.data{histIndex}.y = double(hist_data.BinCounts);
+        obj.data{histIndex}.y = double(hist_data.Values);
 
         %-------------------------------------------------------------------------%
 
@@ -186,7 +186,7 @@
 
 %-hist opacity-%
 if ~ischar(hist_data.FaceAlpha)
-    obj.data{histIndex}.opacity = hist_data.FaceAlpha;
+    obj.data{histIndex}.opacity = hist_data.FaceAlpha * 1.25;
 end
 
 %-------------------------------------------------------------------------%

plotly/plotlyfig_aux/handlegraphics/updateStreamtube.m

@@ -1,7 +1,7 @@
 function obj = updateStreamtube(obj, surfaceIndex)
-if strcmpi(obj.State.Plot(surfaceIndex).Class, 'surface')
+  if strcmpi(obj.State.Plot(surfaceIndex).Class, 'surface')
     updateSurfaceStreamtube(obj, surfaceIndex)
-end
+  end
 end
 
 function updateSurfaceStreamtube(obj, surfaceIndex)
@@ -38,28 +38,45 @@ function updateSurfaceStreamtube(obj, surfaceIndex)
 
 %---------------------------------------------------------------------%
 
-%-format x an y data-%
-ymax = 100;
+%-getting plot data-%
 x = image_data.XData;
 y = image_data.YData;
 z = image_data.ZData;
 cdata = image_data.CData;
 
-ysize = size(x,1);
-xsize = size(x,2);
+%-playing with level quality-%
+quality = obj.PlotOptions.Quality/100;
+apply_quality = quality > 0;
 
-if ysize > ymax
-    ystep = round(ysize/ymax);
-    x = x(1:ystep:end, :);
-    y = y(1:ystep:end, :);
-    z = z(1:ystep:end, :);
-    cdata = cdata(1:ystep:end, :);
-end 
+if apply_quality
+    x = imresize(x, quality);
+    y = imresize(y, quality);
+    z = imresize(z, quality);
+    cdata = imresize(cdata, quality);
+end
 
-if isvector(x)
-    [x, y] = meshgrid(x,y);
+if ~isempty(obj.PlotOptions.Zmin)
+    if any(z < obj.PlotOptions.Zmin)
+        return;
+    end
 end
 
+xymax = 100;
+xsize = size(x,2);
+ysize = size(x,1);
+
+xsize = min([xsize, xymax]);
+ysize = min([ysize, xymax]);
+x = imresize(x, [ysize, xsize]);
+y = imresize(y, [ysize, xsize]);
+z = imresize(z, [ysize, xsize]);
+cdata = imresize(cdata, [ysize, xsize]);
+
+%-optional-%
+% if isvector(x)
+%     [x, y] = meshgrid(x,y);
+% end
+
 %---------------------------------------------------------------------%
 
 %-surface x-%
@@ -105,6 +122,59 @@ function updateSurfaceStreamtube(obj, surfaceIndex)
 obj.data{surfaceIndex}.contours.y.show = true;
 obj.data{surfaceIndex}.contours.y.color = 'black';
 
+%------------------------------------------------------------------------%
+
+%-get data-%
+
+%-aspect ratio-%
+ar = obj.PlotOptions.AspectRatio;
+
+if ~isempty(ar)
+  if ischar(ar)
+    scene.aspectmode = ar;
+  elseif isvector(ar) && length(ar) == 3
+    xar = ar(1);
+    yar = ar(2);
+    zar = ar(3);
+  end
+  else
+
+  %-define as default-%
+  xar = 0.5*max(x(:));
+  yar = 0.5*max(y(:));
+  zar = 0.4*max([xar, yar]);
+end
+
+scene.aspectratio.x = xar; 
+scene.aspectratio.y = yar; 
+scene.aspectratio.z = zar; 
+
+%---------------------------------------------------------------------%
+
+%-camera eye-%
+ey = obj.PlotOptions.CameraEye;
+
+if ~isempty(ey)
+if isvector(ey) && length(ey) == 3
+  scene.camera.eye.x = ey(1);
+  scene.camera.eye.y = ey(2);
+  scene.camera.eye.z = ey(3);
+end
+else
+
+%-define as default-%
+fac = 0.35;
+xey = - xar; if xey>0 xfac = -fac; else xfac = fac; end
+yey = - yar; if yey>0 yfac = -fac; else yfac = fac; end
+if zar>0 zfac = fac; else zfac = -fac; end
+
+scene.camera.eye.x = xey + xfac*xey; 
+scene.camera.eye.y = yey + yfac*yey;
+scene.camera.eye.z = zar + zfac*zar;
+end
+
+obj.layout = setfield(obj.layout,['scene'], scene);
+
 %-------------------------------------------------------------------------%
 
 %-image colorscale-%

plotly/plotlyfig_aux/helpers/extractPatchFace.m

@@ -44,16 +44,12 @@
                     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);
                     col =  255*(colormap(1+ floor(scalefactor*(length(colormap)-1)),:));
-                case 'direct'
+                case {'direct', 'auto'}
                     col =  255*(colormap(patch_data.FaceVertexCData(1,1),:));
 
             end
 
             marker.color = ['rgb(' num2str(col(1)) ',' num2str(col(2)) ',' num2str(col(3)) ')'];
-
-        case 'auto'
-            marker.color = 'rgb(0,113.985,188.955)';
-            
     end
 end
 
@@ -64,7 +60,6 @@
 
     col = 255*patch_data.EdgeColor;
     marker.line.color = ['rgb(' num2str(col(1)) ',' num2str(col(2)) ',' num2str(col(3)) ')'];
-    
 else
     switch patch_data.EdgeColor