Merge commit 'origin/5.1'
Pierre LANDO [Tue, 6 Oct 2009 11:51:23 +0000 (13:51 +0200)]
Conflicts:
scilab/modules/graphics/macros/contourf.sci

1  2 
scilab/modules/graphics/macros/contour.sci
scilab/modules/graphics/macros/contour2d.sci
scilab/modules/graphics/macros/contourf.sci

@@@ -88,27 -88,28 +88,29 @@@ plot2d([mini(xx);maxi(xx)],[mini(yy);ma
  
  draw_min=1;
  H=[];
- [FA,IA]=gsort(abs(Area));
+ [FA,IA]=sort(abs(Area));
+   drawlater(); // postpon the drawing here
+   a=gca();
+   old_foreground = a.foreground;
+   pat=xget('pattern');
+   for jj=IA',
+     nl=CS(2,I(jj));
+     lev1=CS(1,I(jj));
+     if (lev1 ~= minz | draw_min),
+       xp=CS(1,I(jj)+(1:nl));  
+       yp=CS(2,I(jj)+(1:nl)); 
+       pat=size(find( nv <= lev1),'*');
+       xset("pattern",pat);
+       xfpoly(xp,yp)
+     end;
+   end
+   
+   if style(1)<>-1 then 
+     contour2d(xx,yy,zz,nv,style,"000",leg,rect,nax);
+   end
+   a.foreground = old_foreground;
+   drawnow(); // draw all now!
  
- drawlater(); // postpon the drawing here
- a=gca();
- old_foreground = a.foreground;
- pat=xget('pattern');
- for jj=IA',
-   nl=CS(2,I(jj));
-   lev1=CS(1,I(jj));
-   if (lev1 ~= minz | draw_min),
-     xp=CS(1,I(jj)+(1:nl));  
-     yp=CS(2,I(jj)+(1:nl)); 
-     pat=size(find( nv <= lev1),'*');
-     xset("pattern",pat);
-     xfpoly(xp,yp)
-   end;
- end
-  
- if style(1)<>-1 then 
-   contour2d(xx,yy,zz,nv,style,"000",leg,rect,nax);
- end
- a.foreground = old_foreground;
- drawnow(); // draw all now!
  endfunction
++