eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-04 14:19:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

minor Table bug fixes, add static version of JSON load for File

Browse Source
This commit is contained in:
Ben Fry
2013-08-24 12:14:33 -04:00
parent 424894e9e2
commit 575d7ab313
4 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/processing/data/Table.java
View File

@@ -60,6 +60,7 @@ import processing.core.PConstants;
*/
public class Table {
protected int rowCount;
protected int allocCount;
// protected boolean skipEmptyRows = true;
// protected boolean skipCommentLines = true;
@@ -153,6 +154,7 @@ public class Table {
public Table(Iterable<TableRow> rows) {
init();
boolean typed = false;
for (TableRow row : rows) {
if (!typed) {
@@ -1558,6 +1560,7 @@ public class Table {
public void setColumnTypes(int[] types) {
ensureColumn(types.length - 1);
for (int col = 0; col < types.length; col++) {
setColumnType(col, types[col]);
}
@@ -1573,6 +1576,7 @@ public class Table {
* @param dictionary
*/
public void setColumnTypes(final Table dictionary) {
ensureColumn(dictionary.getRowCount() - 1);
int titleCol = 0;
int typeCol = 1;
if (dictionary.hasColumnTitles()) {