The R Project SVN R

Rev

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

Rev 37129 Rev 37608
Line 3807... Line 3807...
3807 
	    errorcall(call, _("invalid symbol parameter"));
 3807 
	    errorcall(call, _("invalid symbol parameter"));
3808 
	for (i = 0; i < nr; i++) {
 3808 
	for (i = 0; i < nr; i++) {
3809 
	    if (R_FINITE(REAL(x)[i]) && R_FINITE(REAL(y)[i]) &&
 3809 
	    if (R_FINITE(REAL(x)[i]) && R_FINITE(REAL(y)[i]) &&
3810 
		R_FINITE(REAL(p)[i])) {
 3810 
		R_FINITE(REAL(p)[i])) {
3811 
		rx = REAL(p)[i];
 3811 
		rx = REAL(p)[i];
- 
 
 3812 
		/* For GCircle the radius is always in INCHES */
3812 
		if (inches > 0)
 3813 
		if (inches > 0)
3813 
		    rx *= inches / pmax;/* <-- no GConvert ?? */
 3814 
		    rx *= inches / pmax;
3814 
		else/* FIXME : INCHES in the following ??? */
 3815 
		else
3815 
		    rx = GConvertXUnits(rx, USER, INCHES, dd);
 3816 
		    rx = GConvertXUnits(rx, USER, INCHES, dd);
3816 
		GCircle(REAL(x)[i], REAL(y)[i],	USER, rx,
 3817 
		GCircle(REAL(x)[i], REAL(y)[i],	USER, rx,
3817 
			INTEGER(bg)[i%nbg], INTEGER(fg)[i%nfg],	dd);
 3818 
			INTEGER(bg)[i%nbg], INTEGER(fg)[i%nfg],	dd);
3818 
	    }
 3819 
	    }
3819 
	}
 3820 
	}
Line 3829... Line 3830...
3829 
		p0 = REAL(p)[i];
 3830 
		p0 = REAL(p)[i];
3830 
		xx = REAL(x)[i];
 3831 
		xx = REAL(x)[i];
3831 
		yy = REAL(y)[i];
 3832 
		yy = REAL(y)[i];
3832 
		GConvert(&xx, &yy, USER, DEVICE, dd);
 3833 
		GConvert(&xx, &yy, USER, DEVICE, dd);
3833 
		if (inches > 0) {
 3834 
		if (inches > 0) {
3834 
		    p0 = p0 / pmax * inches;
 3835 
		    p0 *= inches / pmax;
3835 
		    rx = GConvertXUnits(0.5 * p0, INCHES, DEVICE, dd);
 3836 
		    rx = GConvertXUnits(0.5 * p0, INCHES, DEVICE, dd);
3836 
		    ry = GConvertYUnits(0.5 * p0, INCHES, DEVICE, dd);
 - 
 
3837 
		}
 3837 
		}
3838 
		else {
 3838 
		else {
3839 
		    rx = GConvertXUnits(0.5 * p0, USER, DEVICE, dd);
 3839 
		    rx = GConvertXUnits(0.5 * p0, USER, DEVICE, dd);
3840 
		    ry = GConvertYUnits(0.5 * p0, USER, DEVICE, dd);
 - 
 
3841 
		}
 3840 
		}
3842 
		GRect(xx - rx, yy - rx, xx + rx, yy + rx, DEVICE,
 3841 
		GRect(xx - rx, yy - rx, xx + rx, yy + rx, DEVICE,
3843 
		      INTEGER(bg)[i%nbg], INTEGER(fg)[i%nfg], dd);
 3842 
		      INTEGER(bg)[i%nbg], INTEGER(fg)[i%nfg], dd);
3844 
	    }
 3843 
	    }
3845 
	}
 3844 
	}