The R Project SVN R

Rev

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

Rev 59173 Rev 59174
Line 688... Line 688...
688 
	}
 688 
	}
689 
    }
 689 
    }
690 
    else { /* ------ log axis ----- */
 690 
    else { /* ------ log axis ----- */
691 
	Rboolean reversed = FALSE;
 691 
	Rboolean reversed = FALSE;
692 
 
 692 
 
693 
	n = (axp[2] + 0.5);
 693 
	n = (int)(axp[2] + 0.5);
694 
	/* {xy}axp[2] for 'log': GLpretty() [./graphics.c] sets
 694 
	/* {xy}axp[2] for 'log': GLpretty() [./graphics.c] sets
695 
	   n < 0: very small scale ==> linear axis, above, or
 695 
	   n < 0: very small scale ==> linear axis, above, or
696 
	   n = 1,2,3.  see switch() below */
 696 
	   n = 1,2,3.  see switch() below */
697 
	umin = usr[0];
 697 
	umin = usr[0];
698 
	umax = usr[1];
 698 
	umax = usr[1];
Line 1071... Line 1071...
1071 
    }
 1071 
    }
1072 
 
 1072 
 
1073 
    /* Deferred processing */
 1073 
    /* Deferred processing */
1074 
    if (!R_FINITE(line)) {
 1074 
    if (!R_FINITE(line)) {
1075 
	/* Except that here mgp values are not relative to themselves */
 1075 
	/* Except that here mgp values are not relative to themselves */
1076 
	line = (int) gpptr(dd)->mgp[2];
 1076 
	line = gpptr(dd)->mgp[2];
1077 
	lineoff = line;
 1077 
	lineoff = (int) line;
1078 
    }
 1078 
    }
1079 
    if (!R_FINITE(pos)) pos = NA_REAL; else lineoff = 0;
 1079 
    if (!R_FINITE(pos)) pos = NA_REAL; else lineoff = 0;
1080 
 
 1080 
 
1081 
    /* Determine the tickmark positions.  Note that these may fall */
 1081 
    /* Determine the tickmark positions.  Note that these may fall */
1082 
    /* outside the plot window. We will clip them in the code below. */
 1082 
    /* outside the plot window. We will clip them in the code below. */
Line 2698... Line 2698...
2698 
   title(main, sub, xlab, ylab,
 2698 
   title(main, sub, xlab, ylab,
2699 
	 line, outer,
 2699 
	 line, outer,
2700 
	 ...) */
 2700 
	 ...) */
2701 
 
 2701 
 
2702 
    SEXP Main, xlab, ylab, sub, string;
 2702 
    SEXP Main, xlab, ylab, sub, string;
2703 
    double adj, adjy, cex, offset, line, hpos, vpos, where;
 2703 
    double adj, adjy, cex, offset, line, hpos, vpos;
2704 
    int i, n, font, outer;
 2704 
    int i, n, font, outer, where;
2705 
    rcolor col;
 2705 
    rcolor col;
2706 
    SEXP originalArgs = args;
 2706 
    SEXP originalArgs = args;
2707 
    pGEDevDesc dd = GEcurrentDevice();
 2707 
    pGEDevDesc dd = GEcurrentDevice();
2708 
 
 2708 
 
2709 
    GCheckState(dd);
 2709 
    GCheckState(dd);
Line 3155... Line 3155...
3155 
}
 3155 
}
3156 
 
 3156 
 
3157 
SEXP attribute_hidden do_locator(SEXP call, SEXP op, SEXP args, SEXP env)
 3157 
SEXP attribute_hidden do_locator(SEXP call, SEXP op, SEXP args, SEXP env)
3158 
{
 3158 
{
3159 
    SEXP x, y, nobs, ans, saveans, stype = R_NilValue;
 3159 
    SEXP x, y, nobs, ans, saveans, stype = R_NilValue;
- 
 
 3160 
    int i, n;
3160 
    int i, n, type='p';
 3161 
    char type = 'p';
3161 
    double xp, yp, xold=0, yold=0;
 3162 
    double xp, yp, xold=0, yold=0;
3162 
    pGEDevDesc dd = GEcurrentDevice();
 3163 
    pGEDevDesc dd = GEcurrentDevice();
3163 
 
 3164 
 
3164 
    /* If replaying, just draw the points and lines that were recorded */
 3165 
    /* If replaying, just draw the points and lines that were recorded */
3165 
    if (call == R_NilValue) {
 3166 
    if (call == R_NilValue) {