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

fix for header rows

Browse Source
This commit is contained in:
benfry
2012-12-13 17:09:53 +00:00
parent ecafcab8a2
commit 4194da736c
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,6 +33,7 @@ import java.util.*;
import processing.core.PApplet;
import processing.core.PConstants;
import quicktime.streaming.SettingsDialog;
// function that will convert awful CSV to TSV.. or something else?
// maybe to write binary instead? then read the binary file once it's ok?
@@ -270,14 +271,21 @@ public class Table {
if (rowCount == 0) {
setRowCount(10);
}
int prev = 0; //-1;
//int prev = 0; //-1;
while ((line = reader.readLine()) != null) {
if (row == getRowCount()) {
setRowCount(row << 1);
}
setRow(row, tsv ? PApplet.split(line, '\t') : splitLineCSV(line));
row++;
if (row == 0 && header) {
setColumnTitles(tsv ? PApplet.split(line, '\t') : splitLineCSV(line));
header = false;
} else {
setRow(row, tsv ? PApplet.split(line, '\t') : splitLineCSV(line));
row++;
}
/*
// this is problematic unless we're going to calculate rowCount first
if (row % 10000 == 0) {
if (row < rowCount) {
int pct = (100 * row) / rowCount;
@@ -292,6 +300,7 @@ public class Table {
e.printStackTrace();
}
}
*/
}
// shorten or lengthen based on what's left
if (row != getRowCount()) {