The R Project SVN R

Rev

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

Rev 33419 Rev 33509
Line 660... Line 660...
660
	    yscale = pin2 / ydelta;
660
	    yscale = pin2 / ydelta;
661
	    scale = (xscale < yscale) ? xscale : yscale;
661
	    scale = (xscale < yscale) ? xscale : yscale;
662
	    xadd = .5 * (pin1 / scale - xdelta) * asp;
662
	    xadd = .5 * (pin1 / scale - xdelta) * asp;
663
	    yadd = .5 * (pin2 / scale - ydelta);
663
	    yadd = .5 * (pin2 / scale - ydelta);
664
	}
664
	}
-
 
665
	if(xmax < xmin) xadd *= -1;
-
 
666
	if(ymax < ymin) yadd *= -1;
665
	GScale(xmin - xadd, xmax + xadd, 1, dd);
667
	GScale(xmin - xadd, xmax + xadd, 1, dd);
666
	GScale(ymin - yadd, ymax + yadd, 2, dd);
668
	GScale(ymin - yadd, ymax + yadd, 2, dd);
667
    }
669
    }
668
    else { /* asp <= 0 or not finite -- includes logscale ! */
670
    else { /* asp <= 0 or not finite -- includes logscale ! */
669
	GScale(xmin, xmax, 1, dd);
671
	GScale(xmin, xmax, 1, dd);