Two more cleansed of erasemode.

Author: tobydriscoll

crrplot.m

@@ -24,7 +24,6 @@
 %   $Id: crrplot.m 226 2003-01-08 16:59:17Z driscoll $
 
 % Parse input and initialize
-n = length(w);
 w = w(:);
 beta = beta(:);
 wr = wr(:);
@@ -50,7 +49,7 @@
 end
 
 % Integer arguments must be converted to specific values
-if (length(re)==1) & (re == round(re))
+if (length(re)==1) && (re == round(re))
   if re < 1
     re = [];
   else
@@ -59,7 +58,7 @@
     re([1,m+2]) = [];
   end
 end
-if (length(im)==1) & (im == round(im))
+if (length(im)==1) && (im == round(im))
   if im < 1
     im = [];
   else
@@ -77,10 +76,10 @@
 ax = [findobj(fig,'tag','PhysicalAxes');...
       findobj(fig,'tag','CanonicalAxes')];
 if length(ax)==2
-  draw2 = logical(1);
+  draw2 = true;
   vis = get(ax,'vis');
 else
-  draw2 = logical(0);
+  draw2 = false;
   ax = gca;
   vis = {'on'};
 end
@@ -113,7 +112,6 @@
 if ~draw2
   linh = linh(:,1);
 end
-set(linh,'erasemode','normal')
 
 % Force redraw to get clipping enforced
 refresh
@@ -168,11 +166,11 @@
 
   % Test points at ends and mindpoints of intervals
   if strcmp(direcn(1:3),'ver')
-    testint = val(j) + i*mean(interval);
-    testedge = val(j) + i*srtcross;
+    testint = val(j) + 1i*mean(interval);
+    testedge = val(j) + 1i*srtcross;
   else
-    testint = i*val(j) + mean(interval);
-    testedge = i*val(j) + srtcross;
+    testint = 1i*val(j) + mean(interval);
+    testedge = 1i*val(j) + srtcross;
   end
 
   % Use test points to determine number of curves
@@ -193,30 +191,30 @@
   %zp(find(~diff(zp))) = [];
 
   if strcmp(direcn(1:3),'ver')
-    zp = val(j) + i*zp;
+    zp = val(j) + 1i*zp;
   else
-    zp = i*val(j) + zp;
+    zp = 1i*val(j) + zp;
   end
 
   % Prepare for iterative mapping
   lenzp = length(zp);
-  new = logical(ones(lenzp,1));
+  new = true(lenzp,1);
   wp = NaN*ones(lenzp,numcurves);
   qn = NaN*ones(lenzp,numcurves);
   iter = 0;
 
   color = 'k';
 
   % The individual points will be shown as they are found
-  linh(j,1) = line(NaN,NaN,'parent',ax(1),'color',color,'vis',vis{1},...
-      'linestyle','none','marker','.','markersize',7,'erasemode','none');
+   linh(j,1) = animatedline('parent',ax(1),'color',color,'vis',vis{1},...
+      'linestyle','none','marker','.','markersize',7);
   if draw2
-    linh(j,2) = line(NaN,NaN,'parent',ax(2),'color',color,'vis',vis{2},...
-	'linestyle','none','marker','.','markersize',7,'erasemode','none');
+    linh(j,2) = animatedline('parent',ax(2),'color',color,'vis',vis{2},...
+	'linestyle','none','marker','.','markersize',7);
   end
 
-  % Do the mapping & plotting
-  while any(new) & (iter < maxrefn)
+  % Do the mapping && plotting
+  while any(new) && (iter < maxrefn)
     drawnow
 
     % Map new points 
@@ -242,10 +240,11 @@
     [wp,qn] = crrsort(wp,qn,Q);
 
     % Update the points to show progress
-    set(linh(j,1),'xdata',real(wp(:)),'ydata',imag(wp(:)))
+    addpoints(linh(j,1),real(wp(new)),imag(wp(new)))
     if draw2
-      set(linh(j,2),'xdata',real(zp),'ydata',imag(zp))
+        addpoints(linh(j,1),real(zp(new)),imag(zp(new)))
     end
+    drawnow update
 
     iter = iter + 1;
 
@@ -261,14 +260,14 @@
   wp(size(wp,1)+1,:) = NaN*wp(1,:);
 
   % Set the lines to be solid
-  set(linh(j,1),'erasemode','back')
-  set(linh(j,1),'marker','none','linestyle','-')
-  set(linh(j,1),'xdata',real(wp(:)),'ydata',imag(wp(:)),'user',zp)
+  clearpoints(linh(j,1))
+  addpoints(linh(j,1),real(wp),imag(wp));    
+  set(linh(j,1),'marker','none','linestyle','-','user',zp)
   if draw2
     % Replace the points with the endpoints
-    set(linh(j,2),'erasemode','back')
-    set(linh(j,2),'marker','none','linestyle','-',...
-	'xdata',real(zp([1 end])),'ydata',imag(zp([1 end])))
+    clearpoints(linh(j,2))
+    addpoints(linh(j,2),real(zp([1 end])),imag(zp([1 end])))
+    set(linh(j,2),'marker','none','linestyle','-')
   end
   drawnow
 

deplot.m

@@ -24,7 +24,6 @@
 %   Copyright 1998 by Toby Driscoll.
 %   $Id: deplot.m 226 2003-01-08 16:59:17Z driscoll $
 
-n = length(w);
 beta = beta(:);
 z = z(:);
 
@@ -46,18 +45,18 @@
 end
 
 % Integer arguments must be converted to specific values
-if (length(R)==1) & (R == round(R))
+if (length(R)==1) && (R == round(R))
   m = R+2;
   R = fliplr(linspace(.25,1,m));
   R([1,m]) = [];
 end
-if (length(theta)==1) & (theta == round(theta))
+if (length(theta)==1) && (theta == round(theta))
   m = theta+1;
   theta = linspace(0,2*pi,m);
   theta(m) = [];
 end
 
-autoscale = strcmp(get(gca,'xlimmode'),'auto') & ...
+autoscale = strcmp(get(gca,'xlimmode'),'auto') && ...
     strcmp(get(gca,'ylimmode'),'auto');
 autoscale = autoscale | ~ishold;
 
@@ -69,10 +68,10 @@
 ax = [findobj(fig,'tag','PhysicalAxes');...
       findobj(fig,'tag','CanonicalAxes')];
 if length(ax)==2
-  draw2 = logical(1);
+  draw2 = true;
   vis = get(ax,'vis');
 else
-  draw2 = logical(0);
+  draw2 = false;
   ax = gca;
   vis = {'on'};
 end
@@ -112,45 +111,47 @@
 for j = 1:length(R)
   % Start with evenly spaced theta
   tp = linspace(0,2*pi,20)';
-  new = logical(ones(length(tp),1));
-  wp = repmat(NaN,size(new));
+  new = true(length(tp),1);
+  wp = NaN(size(new));
 
   % The individual points will be shown as they are found
-  linh(j,1) = line(NaN,NaN,'parent',ax(1),'color',color,'vis',vis{1},...
-      'linestyle','none','marker','.','markersize',7,'erasemode','none');
+  linh(j,1) = animatedline('parent',ax(1),'color',color,'vis',vis{1},...
+      'linestyle','none','marker','.','markersize',7);
   if draw2
-    linh(j,2) = line(NaN,NaN,'parent',ax(2),'color',color,'vis',vis{2},...
-	'linestyle','none','marker','.','markersize',7,'erasemode','none');
+    linh(j,2) = animatedline('parent',ax(2),'color',color,'vis',vis{2},...
+	'linestyle','none','marker','.','markersize',7);
   end
- 
+
   % Adaptively refine theta to make smooth curve
   iter = 0;
-  while (any(new)) & (iter < maxrefn)
+  while (any(new)) && (iter < maxrefn)
     drawnow
-    zp = R(j)*exp(i*tp(new));
+    zp = R(j)*exp(1i*tp(new));
     neww = demap(zp,w,beta,z,c,qdat);
     wp(new) = neww;
     iter = iter + 1;
 
     % Update the points to show progress
-    set(linh(j,1),'xdata',real(wp),'ydata',imag(wp))
+    addpoints(linh(j,1),real(wp(new)),imag(wp(new)))
     if draw2
-      set(linh(j,2),'xdata',R(j)*cos(tp),'ydata',R(j)*sin(tp))
+        addpoints(linh(j,1),R(j)*cos(tp(new)),R(j)*sin(tp(new)))
     end
+    drawnow update
 
     % Add points to zp where necessary
     [tp,wp,new] = scpadapt(tp,wp,minlen,maxlen,axis);
 
   end
   % Set the lines to be solid
-  set(linh(j,1),'erasemode','back')
-  set(linh(j,1),'marker','none','linestyle','-','user',R(j)*exp(i*tp))
+  clearpoints(linh(j,1))
+  addpoints(linh(j,1),real(wp),imag(wp));    
+  set(linh(j,1),'marker','none','linestyle','-','user',R(j)*exp(1i*tp))
   if draw2
     % Replace the points with (hopefully) a smooth circle
-    tp = linspace(0,2*pi,101);
-    set(linh(j,2),'erasemode','back')
-    set(linh(j,2),'marker','none','linestyle','-',...
-	'xdata',R(j)*cos(tp),'ydata',R(j)*sin(tp))
+    tp = linspace(0,2*pi,361);
+    clearpoints(linh(j,2))
+    addpoints(linh(j,2),R(j)*cos(tp),R(j)*sin(tp))
+    set(linh(j,2),'marker','none','linestyle','-')
   end
   drawnow
 end
@@ -161,46 +162,48 @@
 linh = gobjects(length(theta),2);
 for j = 1:length(theta)
   Rp = [0 linspace(.2,1,14)]';
-  zp = Rp*exp(i*theta(j));
-  new = logical(ones(length(zp),1));
-  wp = repmat(NaN,size(new));
+  zp = Rp*exp(1i*theta(j));
+  new = true(length(zp),1);
+  wp = NaN(size(new));
   new(1) = 0;
   wp(1) = Inf;
 
   % The individual points will be shown as they are found
-  linh(j,1) = line(NaN,NaN,'parent',ax(1),'color',color,'vis',vis{1},...
-      'linestyle','none','marker','.','markersize',7,'erasemode','none');
+  linh(j,1) = animatedline('parent',ax(1),'color',color,'vis',vis{1},...
+      'linestyle','none','marker','.','markersize',7);
   if draw2
-    linh(j,2) = line(NaN,NaN,'parent',ax(2),'color',color,'vis',vis{2},...
-	'linestyle','none','marker','.','markersize',7,'erasemode','none');
+    linh(j,2) = animatedline('parent',ax(2),'color',color,'vis',vis{2},...
+	'linestyle','none','marker','.','markersize',7);
   end
 
   % Adaptively refine to make smooth curve
   iter = 0;
-  while (any(new)) & (iter < maxrefn)
+  while (any(new)) && (iter < maxrefn)
     drawnow
     neww = demap(zp(new),w,beta,z,c,qdat);
     wp(new) = neww;
     iter = iter + 1;
 
     % Update the points to show progress
-    set(linh(j,1),'xdata',real(wp),'ydata',imag(wp))
+    addpoints(linh(j,1),real(wp(new)),imag(wp(new)))
     if draw2
-      set(linh(j,2),'xdata',real(zp),'ydata',imag(zp))
+        addpoints(linh(j,1),real(zp(new)),imag(zp(new)))
     end
+    drawnow update
 
     % Add points to zp where necessary
     [zp,wp,new] = scpadapt(zp,wp,minlen,maxlen,axis);
   end
 
   % Set the lines to be solid
-  set(linh(j,1),'erasemode','back')
+  clearpoints(linh(j,1))
+  addpoints(linh(j,1),real(wp),imag(wp));    
   set(linh(j,1),'marker','none','linestyle','-','user',zp)
   if draw2
     % Replace the points with just the ends
-    set(linh(j,2),'erasemode','back')
-    set(linh(j,2),'marker','none','linestyle','-',...
-	'xdata',[0 1]*cos(theta(j)),'ydata',[0 1]*sin(theta(j)))
+    clearpoints(linh(j,2))
+    addpoints(linh(j,2),[0 1]*cos(theta(j)),[0 1]*sin(theta(j)))
+    set(linh(j,2),'marker','none','linestyle','-')
   end
   drawnow
 end
@@ -209,7 +212,6 @@
 if ~draw2
   linh = linh(:,1);
 end
-set(linh,'erasemode','normal')
 
 refresh