The R Project SVN – R – Diff – /branches/R-exp-API/src/main/plot.c

 	for (i = 0; i < n; i++)
 	    INTEGER(ans)[i] = CHAR(STRING(pch)[i])[0];
+    }
     else error("invalid plotting symbol");
     for (i = 0; i < n; i++) {
-	if (INTEGER(ans)[i] < 0)
+	if (INTEGER(ans)[i] < 0 && INTEGER(ans)[i] != NA_INTEGER)
 	    INTEGER(ans)[i] = dflt;
+    }
     return ans;
+}
 /*	plot.xy(xy, type, pch, lty, col, cex, ...)
  *	plot points or lines of various types
  */
     SEXP sxy, sx, sy, pch, cex, col, bg, lty;
-    double *x, *y, xold, yold, xx, yy;
+    double *x, *y, xold, yold, xx, yy, thiscex;
-    int i, n, npch, ncex, ncol, nbg, nlty, type=0, start=0;
+    int i, n, npch, ncex, ncol, nbg, nlty, type=0, start=0, thispch, thiscol;
     SEXP originalArgs = args;
     DevDesc *dd = CurrentDevice();
     /* Basic Checks */
     GCheckState(dd);
     npch = length(pch);
     PROTECT(lty = FixupLty(CAR(args), dd->gp.lty));	args = CDR(args);
     nlty = length(lty);
+    /* Default col was NA_INTEGER (0x80000000) which was interpreted
+       as zero (black) or "don't draw" depending on line/rect/circle
+       situation. Now we set the default to zero and don't plot at all
+       if col==NA.
+       FIXME: bg needs similar change, but that requires changes to
+       the specific drivers. */
-    PROTECT(col = FixupCol(CAR(args), NA_INTEGER));	args = CDR(args);
+    PROTECT(col = FixupCol(CAR(args), 0)); args = CDR(args);
     ncol = LENGTH(col);
     PROTECT(bg = FixupCol(CAR(args), NA_INTEGER));	args = CDR(args);
     nbg = LENGTH(bg);
     y = REAL(sy);
     if (nlty && INTEGER(lty)[0] != NA_INTEGER)
 	dd->gp.lty = INTEGER(lty)[0];
-    if (ncex && R_FINITE(REAL(cex)[0]))
-	dd->gp.cex = dd->gp.cexbase * REAL(cex)[0];
-    else
-	dd->gp.cex = dd->gp.cexbase;
     GMode(1, dd);
     /* removed by paul 26/5/99 because all clipping now happens in graphics.c
      * GClip(dd);
      */
 	for (i = 0; i < n; i++) {
 	    xx = x[i];
 	    yy = y[i];
 	    GConvert(&xx, &yy, USER, DEVICE, dd);
 	    if (R_FINITE(xx) && R_FINITE(yy)) {
-		if (ncex > 1)
+		if (R_FINITE(thiscex = REAL(cex)[i % ncex])
+		    && (thispch = INTEGER(pch)[i % npch]) != NA_INTEGER
+		    && (thiscol = INTEGER(col)[i % ncol]) != NA_INTEGER)
+		{
-		    dd->gp.cex = dd->gp.cexbase * REAL(cex)[i % ncex];
+		    dd->gp.cex = thiscex * dd->gp.cexbase;
-		dd->gp.col = INTEGER(col)[i % ncol];
+		    dd->gp.col = thiscol;
-		dd->gp.bg = INTEGER(bg)[i % nbg];
+		    dd->gp.bg = INTEGER(bg)[i % nbg];
-		GSymbol(xx, yy, DEVICE,
+		    GSymbol(xx, yy, DEVICE, thispch, dd);
-			INTEGER(pch)[i % npch], dd);
+		}
+	    }
+	}
+    }
     GMode(0, dd);
     GRestorePars(dd);

The R Project SVN R

(root)/branches/R-exp-API/src/main/plot.c @ 77458 – Rev 6265 → 6994