The R Project SVN R

Rev

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

Rev 36820 Rev 37301
Line 589... Line 589...
589 
    PMoveAcross(-bboxWidth(bbox), mc);
 589 
    PMoveAcross(-bboxWidth(bbox), mc);
590 
    x[3] = ConvertedX(mc, dd);
 590 
    x[3] = ConvertedX(mc, dd);
591 
    y[3] = ConvertedY(mc, dd);
 591 
    y[3] = ConvertedY(mc, dd);
592 
    gc->col = mc->BoxColor;
 592 
    gc->col = mc->BoxColor;
593 
    gc->lty = LTY_SOLID;
 593 
    gc->lty = LTY_SOLID;
- 
 
 594 
    /*
- 
 
 595 
     * We used to just force lwd = 1, which is a reasonable sanity check
- 
 
 596 
     * because if the user had set lwd = 10 for something, your
- 
 
 597 
     * mathematical annotation would look REALLY bad.
- 
 
 598 
     * Unfortunately, this meant that the user could not set a nice
- 
 
 599 
     * small lwd to get a finer line;  we always bumped it back up to 1.
- 
 
 600 
     * NOW we just reduce lwd to 1 (as a sanity check) ONLY if
- 
 
 601 
     * lwd is greater than 1.
- 
 
 602 
     */
- 
 
 603 
    if (gc->lwd > 1)
594 
    gc->lwd = 1;
 604 
	gc->lwd = 1;
595 
    GEPolyline(5, x, y, gc, dd);
 605 
    GEPolyline(5, x, y, gc, dd);
596 
    PMoveTo(xsaved, ysaved, mc);
 606 
    PMoveTo(xsaved, ysaved, mc);
597 
    gc->col = savedcol;
 607 
    gc->col = savedcol;
598 
    gc->lty = savedlty;
 608 
    gc->lty = savedlty;
599 
    gc->lwd = savedlwd;
 609 
    gc->lwd = savedlwd;
Line 1381... Line 1391...
1381 
	PMoveUp(depth + height, mc);
 1391 
	PMoveUp(depth + height, mc);
1382 
	x[1] = ConvertedX(mc, dd);
 1392 
	x[1] = ConvertedX(mc, dd);
1383 
	y[1] = ConvertedY(mc, dd);
 1393 
	y[1] = ConvertedY(mc, dd);
1384 
	PMoveUp(-height, mc);
 1394 
	PMoveUp(-height, mc);
1385 
	gc->lty = LTY_SOLID;
 1395 
	gc->lty = LTY_SOLID;
- 
 
 1396 
	if (gc->lwd > 1)
1386 
	gc->lwd = 1;
 1397 
	    gc->lwd = 1;
1387 
	GEPolyline(2, x, y, gc, dd);
 1398 
	GEPolyline(2, x, y, gc, dd);
1388 
	PMoveAcross(0.5 * width, mc);
 1399 
	PMoveAcross(0.5 * width, mc);
1389 
	gc->lty = savedlty;
 1400 
	gc->lty = savedlty;
1390 
	gc->lwd = savedlwd;
 1401 
	gc->lwd = savedlwd;
1391 
    }
 1402 
    }
Line 1640... Line 1651...
1640 
	}
 1651 
	}
1641 
	PMoveTo(baseX + totalwidth, baseY + hatHeight, mc);
 1652 
	PMoveTo(baseX + totalwidth, baseY + hatHeight, mc);
1642 
	x[NTILDE + 2] = ConvertedX(mc, dd);
 1653 
	x[NTILDE + 2] = ConvertedX(mc, dd);
1643 
	y[NTILDE + 2] = ConvertedY(mc, dd);
 1654 
	y[NTILDE + 2] = ConvertedY(mc, dd);
1644 
	gc->lty = LTY_SOLID;
 1655 
	gc->lty = LTY_SOLID;
- 
 
 1656 
	if (gc->lwd > 1)
1645 
	gc->lwd = 1;
 1657 
	    gc->lwd = 1;
1646 
	GEPolyline(NTILDE + 3, x, y, gc, dd);
 1658 
	GEPolyline(NTILDE + 3, x, y, gc, dd);
1647 
	PMoveTo(savedX + totalwidth, savedY, mc);
 1659 
	PMoveTo(savedX + totalwidth, savedY, mc);
1648 
	gc->lty = savedlty;
 1660 
	gc->lty = savedlty;
1649 
	gc->lwd = savedlwd;
 1661 
	gc->lwd = savedlwd;
1650 
    }
 1662 
    }
Line 1683... Line 1695...
1683 
	PMoveAcross(0.5 * totalwidth, mc);
 1695 
	PMoveAcross(0.5 * totalwidth, mc);
1684 
	PMoveUp(-hatHeight, mc);
 1696 
	PMoveUp(-hatHeight, mc);
1685 
	x[2] = ConvertedX(mc, dd);
 1697 
	x[2] = ConvertedX(mc, dd);
1686 
	y[2] = ConvertedY(mc, dd);
 1698 
	y[2] = ConvertedY(mc, dd);
1687 
	gc->lty = LTY_SOLID;
 1699 
	gc->lty = LTY_SOLID;
- 
 
 1700 
	if (gc->lwd > 1)
1688 
	gc->lwd = 1;
 1701 
	    gc->lwd = 1;
1689 
	GEPolyline(3, x, y, gc, dd);
 1702 
	GEPolyline(3, x, y, gc, dd);
1690 
	PMoveTo(savedX + width, savedY, mc);
 1703 
	PMoveTo(savedX + width, savedY, mc);
1691 
	gc->lty = savedlty;
 1704 
	gc->lty = savedlty;
1692 
	gc->lwd = savedlwd;
 1705 
	gc->lwd = savedlwd;
1693 
    }
 1706 
    }
Line 1720... Line 1733...
1720 
	y[0] = ConvertedY(mc, dd);
 1733 
	y[0] = ConvertedY(mc, dd);
1721 
	PMoveAcross(width, mc);
 1734 
	PMoveAcross(width, mc);
1722 
	x[1] = ConvertedX(mc, dd);
 1735 
	x[1] = ConvertedX(mc, dd);
1723 
	y[1] = ConvertedY(mc, dd);
 1736 
	y[1] = ConvertedY(mc, dd);
1724 
	gc->lty = LTY_SOLID;
 1737 
	gc->lty = LTY_SOLID;
- 
 
 1738 
	if (gc->lwd > 1)
1725 
	gc->lwd = 1;
 1739 
	    gc->lwd = 1;
1726 
	GEPolyline(2, x, y, gc, dd);
 1740 
	GEPolyline(2, x, y, gc, dd);
1727 
	PMoveTo(savedX + width, savedY, mc);
 1741 
	PMoveTo(savedX + width, savedY, mc);
1728 
	gc->lty = savedlty;
 1742 
	gc->lty = savedlty;
1729 
	gc->lwd = savedlwd;
 1743 
	gc->lwd = savedlwd;
1730 
    }
 1744 
    }
Line 1911... Line 1925...
1911 
	    y[0] = ConvertedY(mc, dd);
 1925 
	    y[0] = ConvertedY(mc, dd);
1912 
	    PMoveAcross(width, mc);
 1926 
	    PMoveAcross(width, mc);
1913 
	    x[1] = ConvertedX(mc, dd);
 1927 
	    x[1] = ConvertedX(mc, dd);
1914 
	    y[1] = ConvertedY(mc, dd);
 1928 
	    y[1] = ConvertedY(mc, dd);
1915 
	    gc->lty = LTY_SOLID;
 1929 
	    gc->lty = LTY_SOLID;
- 
 
 1930 
	    if (gc->lwd > 1)
1916 
	    gc->lwd = 1;
 1931 
		gc->lwd = 1;
1917 
	    GEPolyline(2, x, y, gc, dd);
 1932 
	    GEPolyline(2, x, y, gc, dd);
1918 
	    PMoveUp(-AxisHeight(gc, dd), mc);
 1933 
	    PMoveUp(-AxisHeight(gc, dd), mc);
1919 
	    gc->lty = savedlty;
 1934 
	    gc->lty = savedlty;
1920 
	    gc->lwd = savedlwd;
 1935 
	    gc->lwd = savedlwd;
1921 
	}
 1936 
	}
Line 1952... Line 1967...
1952 
        y[0] = ConvertedY(mc, dd);
 1967 
        y[0] = ConvertedY(mc, dd);
1953 
        PMoveAcross(width, mc);
 1968 
        PMoveAcross(width, mc);
1954 
        x[1] = ConvertedX(mc, dd);
 1969 
        x[1] = ConvertedX(mc, dd);
1955 
        y[1] = ConvertedY(mc, dd);
 1970 
        y[1] = ConvertedY(mc, dd);
1956 
        gc->lty = LTY_SOLID;
 1971 
        gc->lty = LTY_SOLID;
- 
 
 1972 
	if (gc->lwd > 1)
1957 
        gc->lwd = 1;
 1973 
	    gc->lwd = 1;
1958 
        GEPolyline(2, x, y, gc, dd);
 1974 
        GEPolyline(2, x, y, gc, dd);
1959 
        PMoveUp(depth, mc);
 1975 
        PMoveUp(depth, mc);
1960 
        gc->lty = savedlty;
 1976 
        gc->lty = savedlty;
1961 
        gc->lwd = savedlwd;
 1977 
        gc->lwd = savedlwd;
1962 
        PMoveTo(savedX + width, savedY, mc);
 1978 
        PMoveTo(savedX + width, savedY, mc);
Line 2574... Line 2590...
2574 
	y[3] = ConvertedY(mc, dd);
 2590 
	y[3] = ConvertedY(mc, dd);
2575 
	PMoveAcross(radSpace + bboxWidth(bodyBBox) + radTrail, mc);
 2591 
	PMoveAcross(radSpace + bboxWidth(bodyBBox) + radTrail, mc);
2576 
	x[4] = ConvertedX(mc, dd);
 2592 
	x[4] = ConvertedX(mc, dd);
2577 
	y[4] = ConvertedY(mc, dd);
 2593 
	y[4] = ConvertedY(mc, dd);
2578 
	gc->lty = LTY_SOLID;
 2594 
	gc->lty = LTY_SOLID;
- 
 
 2595 
	if (gc->lwd > 1)
2579 
	gc->lwd = 1;
 2596 
	    gc->lwd = 1;
2580 
	GEPolyline(5, x, y, gc, dd);
 2597 
	GEPolyline(5, x, y, gc, dd);
2581 
	PMoveTo(savedX, savedY, mc);
 2598 
	PMoveTo(savedX, savedY, mc);
2582 
	gc->lty = savedlty;
 2599 
	gc->lty = savedlty;
2583 
	gc->lwd = savedlwd;
 2600 
	gc->lwd = savedlwd;
2584 
    }
 2601 
    }
Line 2623... Line 2640...
2623 
	y[0] = ConvertedY(mc, dd);
 2640 
	y[0] = ConvertedY(mc, dd);
2624 
	PMoveUp(depth + height, mc);
 2641 
	PMoveUp(depth + height, mc);
2625 
	x[1] = ConvertedX(mc, dd);
 2642 
	x[1] = ConvertedX(mc, dd);
2626 
	y[1] = ConvertedY(mc, dd);
 2643 
	y[1] = ConvertedY(mc, dd);
2627 
	gc->lty = LTY_SOLID;
 2644 
	gc->lty = LTY_SOLID;
- 
 
 2645 
	if (gc->lwd > 1)
2628 
	gc->lwd = 1;
 2646 
	    gc->lwd = 1;
2629 
	GEPolyline(2, x, y, gc, dd);
 2647 
	GEPolyline(2, x, y, gc, dd);
2630 
	PMoveUp(-height, mc);
 2648 
	PMoveUp(-height, mc);
2631 
	gc->lty = savedlty;
 2649 
	gc->lty = savedlty;
2632 
	gc->lwd = savedlwd;
 2650 
	gc->lwd = savedlwd;
2633 
    }
 2651 
    }
Line 2643... Line 2661...
2643 
	y[0] = ConvertedY(mc, dd);
 2661 
	y[0] = ConvertedY(mc, dd);
2644 
	PMoveUp(depth + height, mc);
 2662 
	PMoveUp(depth + height, mc);
2645 
	x[1] = ConvertedX(mc, dd);
 2663 
	x[1] = ConvertedX(mc, dd);
2646 
	y[1] = ConvertedY(mc, dd);
 2664 
	y[1] = ConvertedY(mc, dd);
2647 
	gc->lty = LTY_SOLID;
 2665 
	gc->lty = LTY_SOLID;
- 
 
 2666 
	if (gc->lwd > 1)
2648 
	gc->lwd = 1;
 2667 
	    gc->lwd = 1;
2649 
	GEPolyline(2, x, y, gc, dd);
 2668 
	GEPolyline(2, x, y, gc, dd);
2650 
	PMoveUp(-height, mc);
 2669 
	PMoveUp(-height, mc);
2651 
	gc->lty = savedlty;
 2670 
	gc->lty = savedlty;
2652 
	gc->lwd = savedlwd;
 2671 
	gc->lwd = savedlwd;
2653 
    }
 2672 
    }