The R Project SVN R

Rev

Rev 46784 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 46784 Rev 48732
Line 273... Line 273...
273 
		SET_VECTOR_ELT(DE->work, i,
 273 
		SET_VECTOR_ELT(DE->work, i,
274 
			       coerceVector(VECTOR_ELT(DE->work, i), type));
 274 
			       coerceVector(VECTOR_ELT(DE->work, i), type));
275 
	}
 275 
	}
276 
    }
 276 
    }
277 
 
 277 
 
278 
    /* scale scrollbars as needed */
 - 
 
279 
    DE->xScrollbarScale = DE->yScrollbarScale = 1;
 278 
    DE->xScrollbarScale = DE->yScrollbarScale = 1;
280 
    if (DE->xmaxused > 10000) DE->xScrollbarScale = DE->xmaxused/1000;
 - 
 
281 
    if (DE->ymaxused > 10000) DE->yScrollbarScale = DE->ymaxused/1000;
 - 
 
282 
 
 279 
 
283 
    /* start up the window, more initializing in here */
 280 
    /* start up the window, more initializing in here */
284 
    if (initwin(DE, G_("Data Editor")))
 281 
    if (initwin(DE, G_("Data Editor")))
285 
	errorcall(call, G_("invalid device"));
 282 
	errorcall(call, G_("invalid device"));
286 
    R_de_up = TRUE;
 283 
    R_de_up = TRUE;
Line 1603... Line 1600...
1603 
	DE->colmin = min(DE->xmaxused, -pos*DE->xScrollbarScale);
 1600 
	DE->colmin = min(DE->xmaxused, -pos*DE->xScrollbarScale);
1604 
    } else {
 1601 
    } else {
1605 
	DE->rowmin = 1 + pos*DE->yScrollbarScale;
 1602 
	DE->rowmin = 1 + pos*DE->yScrollbarScale;
1606 
	if(DE->rowmin > DE->ymaxused - DE->nhigh + 2)
 1603 
	if(DE->rowmin > DE->ymaxused - DE->nhigh + 2)
1607 
	    DE->rowmin = max(1,DE->ymaxused - DE->nhigh + 2);
 1604 
	    DE->rowmin = max(1,DE->ymaxused - DE->nhigh + 2);
1608 
	printf("pos %d, rowmin %d, scale %d\n", pos, DE->rowmin, DE->yScrollbarScale);
 1605 
/*	printf("pos %d, rowmin %d, scale %d\n", pos, DE->rowmin, DE->yScrollbarScale); */
1609 
    }
 1606 
    }
1610 
    drawwindow(DE);
 1607 
    drawwindow(DE);
1611 
}
 1608 
}
1612 
 
 1609 
 
1613 
static checkbox varwidths;
 1610 
static checkbox varwidths;
Line 1894... Line 1891...
1894 
	type = TYPEOF(VECTOR_ELT(DE->work, i));
 1891 
	type = TYPEOF(VECTOR_ELT(DE->work, i));
1895 
	if (type != STRSXP && type != REALSXP)
 1892 
	if (type != STRSXP && type != REALSXP)
1896 
	    errorcall(call, G_("invalid argument"));
 1893 
	    errorcall(call, G_("invalid argument"));
1897 
    }
 1894 
    }
1898 
 
 1895 
 
1899 
    /* scale scrollbars as needed */
 - 
 
1900 
    DE->xScrollbarScale = DE->yScrollbarScale = 1;
 1896 
    DE->xScrollbarScale = DE->yScrollbarScale = 1;
1901 
    if (DE->xmaxused > 10000) DE->xScrollbarScale = DE->xmaxused/1000;
 - 
 
1902 
    if (DE->ymaxused > 10000) DE->yScrollbarScale = DE->ymaxused/1000;
 - 
 
1903 
 
 1897 
 
1904 
    /* start up the window, more initializing in here */
 1898 
    /* start up the window, more initializing in here */
1905 
    if (initwin(DE, CHAR(STRING_ELT(stitle, 0))))
 1899 
    if (initwin(DE, CHAR(STRING_ELT(stitle, 0))))
1906 
	errorcall(call, G_("invalid device"));
 1900 
	errorcall(call, G_("invalid device"));
1907 
 
 1901