The R Project SVN R

Rev

Rev 31216 | Rev 32380 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 31216 Rev 31938
Line 1535... Line 1535...
1535 
    Rf_gpptr(dd)->lwd = lwdsave;
 1535 
    Rf_gpptr(dd)->lwd = lwdsave;
1536 
    Rf_gpptr(dd)->cex = cexsave;
 1536 
    Rf_gpptr(dd)->cex = cexsave;
1537 
    UNPROTECT(5);
 1537 
    UNPROTECT(5);
1538 
    /* NOTE: only record operation if no "error"  */
 1538 
    /* NOTE: only record operation if no "error"  */
1539 
    /* NOTE: on replay, call == R_NilValue */
 1539 
    /* NOTE: on replay, call == R_NilValue */
1540 
    if (GRecording(call))
 1540 
    if (GRecording(call, dd))
1541 
	recordGraphicOperation(op, oargs, dd);
 1541 
	recordGraphicOperation(op, oargs, dd);
1542 
    return result;
 1542 
    return result;
1543 
}
 1543 
}
1544 
 
 1544 
 
1545 
 
 1545 
 
Line 1754... Line 1754...
1754 
    GMode(0, dd);
 1754 
    GMode(0, dd);
1755 
    Rf_gpptr(dd)->col = colsave;
 1755 
    Rf_gpptr(dd)->col = colsave;
1756 
    Rf_gpptr(dd)->xpd = xpdsave;
 1756 
    Rf_gpptr(dd)->xpd = xpdsave;
1757 
    R_Visible = 0;
 1757 
    R_Visible = 0;
1758 
    UNPROTECT(1);
 1758 
    UNPROTECT(1);
1759 
    if (GRecording(call))
 1759 
    if (GRecording(call, dd))
1760 
	recordGraphicOperation(op, oargs, dd);
 1760 
	recordGraphicOperation(op, oargs, dd);
1761 
    return R_NilValue;
 1761 
    return R_NilValue;
1762 
 
 1762 
 
1763 
 badxy:
 1763 
 badxy:
1764 
    errorcall(call, "invalid x / y values or limits");
 1764 
    errorcall(call, "invalid x / y values or limits");
Line 1839... Line 1839...
1839 
    GMode(0, dd);
 1839 
    GMode(0, dd);
1840 
    Rf_gpptr(dd)->col = colsave;
 1840 
    Rf_gpptr(dd)->col = colsave;
1841 
    Rf_gpptr(dd)->xpd = xpdsave;
 1841 
    Rf_gpptr(dd)->xpd = xpdsave;
1842 
    R_Visible = 0;
 1842 
    R_Visible = 0;
1843 
    UNPROTECT(1);
 1843 
    UNPROTECT(1);
1844 
    if (GRecording(call))
 1844 
    if (GRecording(call, dd))
1845 
	recordGraphicOperation(op, oargs, dd);
 1845 
	recordGraphicOperation(op, oargs, dd);
1846 
    return R_NilValue;
 1846 
    return R_NilValue;
1847 
 
 1847 
 
1848 
  badxy:
 1848 
  badxy:
1849 
    errorcall(call, "invalid x / y values or limits");
 1849 
    errorcall(call, "invalid x / y values or limits");
Line 2555... Line 2555...
2555 
    if ((nTicks == NA_INTEGER) || (nTicks < 0))
 2555 
    if ((nTicks == NA_INTEGER) || (nTicks < 0))
2556 
	errorcall(call, "invalid nticks value");
 2556 
	errorcall(call, "invalid nticks value");
2557 
    if ((tickType == NA_INTEGER) || (tickType < 1) || (tickType > 2))
 2557 
    if ((tickType == NA_INTEGER) || (tickType < 1) || (tickType > 2))
2558 
	errorcall(call, "invalid ticktype value");
 2558 
	errorcall(call, "invalid ticktype value");
2559 
 
 2559 
 
- 
 
 2560 
    dd = CurrentDevice();
- 
 
 2561 
 
2560 
    dd = GNewPlot(GRecording(call));
 2562 
    GNewPlot(GRecording(call, dd));
2561 
 
 2563 
 
2562 
    PROTECT(col = FixupCol(col, Rf_gpptr(dd)->bg));
 2564 
    PROTECT(col = FixupCol(col, Rf_gpptr(dd)->bg));
2563 
    ncol = LENGTH(col);
 2565 
    ncol = LENGTH(col);
2564 
    if (ncol < 1) errorcall(call, "invalid col specification");
 2566 
    if (ncol < 1) errorcall(call, "invalid col specification");
2565 
    if(!R_OPAQUE(INTEGER(col)[0])) DoLighting = FALSE;
 2567 
    if(!R_OPAQUE(INTEGER(col)[0])) DoLighting = FALSE;
Line 2633... Line 2635...
2633 
        PerspBox(1, REAL(xlim), REAL(ylim), REAL(zlim), dd);
 2635 
        PerspBox(1, REAL(xlim), REAL(ylim), REAL(zlim), dd);
2634 
    GMode(0, dd);
 2636 
    GMode(0, dd);
2635 
 
 2637 
 
2636 
    GRestorePars(dd);
 2638 
    GRestorePars(dd);
2637 
    UNPROTECT(10);
 2639 
    UNPROTECT(10);
2638 
    if (GRecording(call))
 2640 
    if (GRecording(call, dd))
2639 
        recordGraphicOperation(op, originalArgs, dd);
 2641 
        recordGraphicOperation(op, originalArgs, dd);
2640 
 
 2642 
 
2641 
    PROTECT(x = allocVector(REALSXP, 16));
 2643 
    PROTECT(x = allocVector(REALSXP, 16));
2642 
    PROTECT(y = allocVector(INTSXP, 2));
 2644 
    PROTECT(y = allocVector(INTSXP, 2));
2643 
    for (i = 0; i < 4; i++)
 2645 
    for (i = 0; i < 4; i++)