new patch, surface, and scatter 3D support

Author: bronsolo

plotly/plotlyfig_aux/handlegraphics/updatePatch.m

@@ -69,7 +69,11 @@
 %-------------------------------------------------------------------------%
 
 %-patch type-%
-obj.data{patchIndex}.type = 'scatter';
+if any(nonzeros(patch_data.ZData))
+    obj.data{patchIndex}.type = 'scatter3d';
+else
+    obj.data{patchIndex}.type = 'scatter'; 
+end
 
 %-------------------------------------------------------------------------%
 
@@ -103,6 +107,24 @@
 
 %-------------------------------------------------------------------------%
 
+%-patch z-%
+if any(nonzeros(patch_data.ZData))
+    zdata = patch_data.ZData;
+    
+    if isvector(ydata)
+        obj.data{patchIndex}.z = [zdata' zdata(1)];
+    else
+        ztemp = reshape(zdata,[],1);
+        znew = [];
+        for n = 1:size(zdata,2)
+            znew = [znew ; zdata(:,n) ; zdata(1,n); NaN];
+        end
+        obj.data{patchIndex}.z = znew;
+    end
+end
+
+%-------------------------------------------------------------------------%
+
 %-patch name-%
 if ~isempty(patch_data.DisplayName);
     obj.data{patchIndex}.name = patch_data.DisplayName;

plotly/plotlyfig_aux/handlegraphics/updateScattergroup.m

@@ -83,7 +83,11 @@ function updateScattergroup(obj,scatterIndex)
 %-------------------------------------------------------------------------%
 
 %-scatter type-%
-obj.data{scatterIndex}.type = 'scatter';
+if any(nonzeros(scatter_data.ZData))
+    obj.data{scatterIndex}.type = 'scatter3d';
+else
+    obj.data{scatterIndex}.type = 'scatter';
+end
 
 %-------------------------------------------------------------------------%
 
@@ -128,6 +132,17 @@ function updateScattergroup(obj,scatterIndex)
 
     %---------------------------------------------------------------------%
 
+    %-scatter z-%
+    if any(nonzeros(scatter_data.ZData))
+        if length(scatter_child_data) > 1
+            obj.data{scatterIndex}.z(m) = scatter_child_data(n).ZData;
+        else
+            obj.data{scatterIndex}.z = scatter_child_data.ZData;
+        end
+    end
+    
+    %---------------------------------------------------------------------%
+    
     %-scatter showlegend-%
     leg = get(scatter_data.Annotation);
     legInfo = get(leg.LegendInformation);

plotly/plotlyfig_aux/handlegraphics/updateSurfaceplot.m

@@ -27,42 +27,29 @@
 
 % check for 3D
 if any(nonzeros(image_data.ZData))
-
-%-surface type-%
-if ~isvector(image_data.XData) || ~isvector(image_data.YData)
-    obj.data{surfaceIndex}.type = 'scatter3d';
-else
+    
+    %-surface type-%
     obj.data{surfaceIndex}.type = 'surface';
-end
-
-%-------------------------------------------------------------------------%
-
-%-surface x-%
-obj.data{surfaceIndex}.x = image_data.XData;
-
-if strcmp(obj.data{surfaceIndex}.type,'scatter3d')
-    obj.data{surfaceIndex}.x = reshape(obj.data{surfaceIndex}.x,1,size(obj.data{surfaceIndex}.x,1)*size(obj.data{surfaceIndex}.x,2));
-end
-%-------------------------------------------------------------------------%
-
-%-surface y-%
-obj.data{surfaceIndex}.y = image_data.YData;
-
-if strcmp(obj.data{surfaceIndex}.type,'scatter3d')
-obj.data{surfaceIndex}.y = reshape(obj.data{surfaceIndex}.y,1,size(obj.data{surfaceIndex}.y,1)*size(obj.data{surfaceIndex}.y,2));
-end
-%-------------------------------------------------------------------------%
-
-%-surface z-%
-obj.data{surfaceIndex}.z = image_data.ZData;  
-
-if strcmp(obj.data{surfaceIndex}.type,'scatter3d')
-    obj.data{surfaceIndex}.z = reshape(image_data.ZData,1,size(image_data.ZData,1)*size(image_data.ZData,2));    
-end
-
+    
+    %---------------------------------------------------------------------%
+    
+    %-surface x-%
+    obj.data{surfaceIndex}.x = image_data.XData;
+    
+    %---------------------------------------------------------------------%
+    
+    %-surface y-%
+    obj.data{surfaceIndex}.y = image_data.YData;
+    
+    %---------------------------------------------------------------------%
+    
+    %-surface z-%
+    obj.data{surfaceIndex}.z = image_data.ZData;
+    
 else
+    
     %-surface type-%
-    obj = updateImage(obj, surfaceIndex); 
+    obj = updateImage(obj, surfaceIndex);
 
     %-surface x-%
     obj.data{surfaceIndex}.x = image_data.XData(1,:);