Merge pull request #222 from plotly/fixing_issue_191

fix issue #191

Author: gilbertogalvis

plotly/plotlyfig_aux/handlegraphics/updateScatter.m

@@ -96,117 +96,83 @@ function updateScatter(obj,scatterIndex)
 
 %-------------------------------------------------------------------------%
 
-%-scatter patch data-%
-for m = 1:length(scatter_data)
-    
-    %reverse counter
-    n = length(scatter_data) - m + 1;
-    
-    %---------------------------------------------------------------------%
-    
-    %-scatter x-%
-    if length(scatter_data) > 1
-        obj.data{scatterIndex}.x(m) = scatter_data(n).XData;
-    else
-        obj.data{scatterIndex}.x = scatter_data.XData;
-    end
-    
-    %---------------------------------------------------------------------%
-    
-    %-scatter y-%
-    if length(scatter_data) > 1
-        obj.data{scatterIndex}.y(m) = scatter_data(n).YData;
-    else
-        obj.data{scatterIndex}.y = scatter_data.YData;
-    end
-    
-    %---------------------------------------------------------------------%
-    
-    %-scatter z-%
-    if isHG2()
-        if isfield(scatter_data,'ZData')
-            if any(scatter_data.ZData)
-                if length(scatter_data) > 1
-                    obj.data{scatterIndex}.z(m) = scatter_data(n).ZData;
-                else
-                    obj.data{scatterIndex}.z = scatter_data.ZData;
-                end
-                % overwrite type
-                obj.data{scatterIndex}.type = 'scatter3d';
-            end
-        end
-    end
-    
-    %---------------------------------------------------------------------%
-    
-    %-scatter showlegend-%
-    leg = get(scatter_data.Annotation);
-    legInfo = get(leg.LegendInformation);
-    
-    switch legInfo.IconDisplayStyle
-        case 'on'
-            showleg = true;
-        case 'off'
-            showleg = false;
-    end
-    
-    obj.data{scatterIndex}.showlegend = showleg;
-    
-    %---------------------------------------------------------------------%
-    
-    %-scatter marker-%
-    childmarker = extractScatterMarker(scatter_data(n));
-    
-    %---------------------------------------------------------------------%
-    
-    %-line color-%
-    if length(scatter_data) > 1
-        obj.data{scatterIndex}.marker.line.color{m} = childmarker.line.color{1};
-    else
-        obj.data{scatterIndex}.marker.line.color = childmarker.line.color;
-    end
-    
-    %---------------------------------------------------------------------%
-    
-    %-marker color-%
-    if length(scatter_data) > 1
-        obj.data{scatterIndex}.marker.color{m} = childmarker.color{1};
-    else
-        obj.data{scatterIndex}.marker.color = childmarker.color;
-    end
-    
-    %---------------------------------------------------------------------%
-    
-    %-sizeref-%
-    obj.data{scatterIndex}.marker.sizeref = childmarker.sizeref;
-    
-    %---------------------------------------------------------------------%
-    
-    %-sizemode-%
-    obj.data{scatterIndex}.marker.sizemode = childmarker.sizemode;
-    
-    %---------------------------------------------------------------------%
-    
-    %-symbol-%
-    obj.data{scatterIndex}.marker.symbol{m} = childmarker.symbol;
-    
-    %---------------------------------------------------------------------%
-    
-    %-size-%
-    obj.data{scatterIndex}.marker.size = childmarker.size;
-  
-    %---------------------------------------------------------------------%
-    
-    %-line width-%
-    
-    if length(scatter_data) > 1 || ischar(childmarker.line.color)
-        obj.data{scatterIndex}.marker.line.width(m) = childmarker.line.width;
-    else
-        obj.data{scatterIndex}.marker.line.width(1:length(childmarker.line.color)) = childmarker.line.width;
+
+%---------------------------------------------------------------------%
+
+%-scatter x-%
+obj.data{scatterIndex}.x = scatter_data.XData;
+
+%---------------------------------------------------------------------%
+
+%-scatter y-%
+obj.data{scatterIndex}.y = scatter_data.YData;
+
+%---------------------------------------------------------------------%
+
+%-scatter z-%
+if isHG2()
+    if isfield(scatter_data,'ZData')
+        obj.data{scatterIndex}.type = 'scatter3d';
+        obj.data{scatterIndex}.z = scatter_data.ZData;
     end
-    
-    %---------------------------------------------------------------------%
-    
 end
+
+%---------------------------------------------------------------------%
+
+%-scatter showlegend-%
+leg = get(scatter_data.Annotation);
+legInfo = get(leg.LegendInformation);
+
+switch legInfo.IconDisplayStyle
+    case 'on'
+        showleg = true;
+    case 'off'
+        showleg = false;
+end
+
+obj.data{scatterIndex}.showlegend = showleg;
+
+%---------------------------------------------------------------------%
+
+%-scatter marker-%
+childmarker = extractScatterMarker(scatter_data);
+
+%---------------------------------------------------------------------%
+
+%-line color-%
+obj.data{scatterIndex}.marker.line.color = childmarker.line.color;
+
+%---------------------------------------------------------------------%
+
+%-marker color-%
+obj.data{scatterIndex}.marker.color = childmarker.color;
+
+%---------------------------------------------------------------------%
+
+%-sizeref-%
+obj.data{scatterIndex}.marker.sizeref = childmarker.sizeref;
+
+%---------------------------------------------------------------------%
+
+%-sizemode-%
+obj.data{scatterIndex}.marker.sizemode = childmarker.sizemode;
+
+%---------------------------------------------------------------------%
+
+%-symbol-%
+obj.data{scatterIndex}.marker.symbol = childmarker.symbol;
+
+%---------------------------------------------------------------------%
+
+%-size-%
+obj.data{scatterIndex}.marker.size = childmarker.size*0.1;
+
+%---------------------------------------------------------------------%
+
+%-line width-%
+obj.data{scatterIndex}.marker.line.width = childmarker.line.width;
+
+%---------------------------------------------------------------------%
+    
 end
 

plotly/plotlyfig_aux/helpers/extractScatterMarker.m

@@ -121,6 +121,7 @@
                     markercolor{n} = ['rgb(' num2str(col(1)) ',' num2str(col(2)) ',' num2str(col(3)) ')'];
 
                 end
+                markercolor = markercolor{1}
         end
     end
 
@@ -175,6 +176,8 @@
                             markerlinecolor{n} = ['rgb(' num2str(col(1)) ',' num2str(col(2)) ',' num2str(col(3)) ')'];
 
                         end
+
+                        markerlinecolor = markerlinecolor{1}
 
                 end
             end
@@ -190,6 +193,8 @@
                 markerlinecolor{n} = ['rgb(' num2str(col(1)) ',' num2str(col(2)) ',' num2str(col(3)) ')'];
 
             end
+
+            markerlinecolor = markerlinecolor{1};
     end
 end