The R Project SVN R

Rev

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

Rev 11112 Rev 11295
Line 515... Line 515...
515 
	}
 515 
	}
516 
	p++;
 516 
	p++;
517 
    }
 517 
    }
518 
    args = CDR(args);
 518 
    args = CDR(args);
519 
 
 519 
 
520 
    asp = asReal(CAR(args));
 520 
    asp = (logscale) ? NA_REAL : asReal(CAR(args));;
521 
    if (logscale) asp = NA_REAL;
 - 
 
522 
    args = CDR(args);
 521 
    args = CDR(args);
523 
 
 522 
 
524 
    GSavePars(dd);
 523 
    GSavePars(dd);
525 
    RecordGraphicsCall(call);
 524 
    RecordGraphicsCall(call);
526 
    ProcessInlinePars(args, dd);
 525 
    ProcessInlinePars(args, dd);
Line 2527... Line 2526...
2527 
	x[0] = dd->gp.usr[0];
 2526 
	x[0] = dd->gp.usr[0];
2528 
	x[1] = dd->gp.usr[1];
 2527 
	x[1] = dd->gp.usr[1];
2529 
	if (R_FINITE(dd->gp.lwd)) {
 2528 
	if (R_FINITE(dd->gp.lwd)) {
2530 
	    if (LOGICAL(untf)[0] == 1 && (dd->gp.xlog || dd->gp.ylog)) {
 2529 
	    if (LOGICAL(untf)[0] == 1 && (dd->gp.xlog || dd->gp.ylog)) {
2531 
		double xx[101], yy[101];
 2530 
		double xx[101], yy[101];
2532 
		int i;
 - 
 
2533 
		double xstep = (x[1] - x[0])/100;
 2531 
		double xstep = (x[1] - x[0])/100;
2534 
		for (i = 0; i < 100; i++) {
 2532 
		for (i = 0; i < 100; i++) {
2535 
		    xx[i] = x[0] + i*xstep;
 2533 
		    xx[i] = x[0] + i*xstep;
2536 
		    yy[i] = aa + xx[i] * bb;
 2534 
		    yy[i] = aa + xx[i] * bb;
2537 
		}
 2535 
		}
Line 2543... Line 2541...
2543 
		double x0, x1;
 2541 
		double x0, x1;
2544 
 
 2542 
 
2545 
		x0 = ( dd->gp.xlog ) ?  log10(x[0]) : x[0];
 2543 
		x0 = ( dd->gp.xlog ) ?  log10(x[0]) : x[0];
2546 
		x1 = ( dd->gp.xlog ) ?  log10(x[1]) : x[1];
 2544 
		x1 = ( dd->gp.xlog ) ?  log10(x[1]) : x[1];
2547 
 
 2545 
 
2548 
 
 - 
 
2549 
		y[0] = aa + x0 * bb;
 2546 
		y[0] = aa + x0 * bb;
2550 
		y[1] = aa + x1 * bb;
 2547 
		y[1] = aa + x1 * bb;
2551 
 
 2548 
 
2552 
		if ( dd->gp.ylog ){
 2549 
		if ( dd->gp.ylog ){
2553 
		    y[0] = pow(10.,y[0]);
 2550 
		    y[0] = pow(10.,y[0]);