Permalink
Browse files

Merge pull request #49 from wezzix/master

Fix splitLineCSV and broken CSV export in non US culture
  • Loading branch information...
2 parents 0004b10 + a234387 commit 35b086bc726372f28d1d7ba5e0366b6866632e68 @aj-ptw aj-ptw committed on GitHub Dec 13, 2016
Showing with 3 additions and 3 deletions.
  1. +3 −3 OpenBCI_GUI/dataFiles.pde
@@ -80,7 +80,7 @@ public class OutputFile_rawtxt {
int nVal = values.length;
for (int Ival = 0; Ival < nVal; Ival++) {
output.print(", ");
- output.print(String.format("%.2f", scale_fac * float(values[Ival])));
+ output.print(String.format(Locale.US, "%.2f", scale_fac * float(values[Ival])));
}
}
@@ -139,11 +139,11 @@ class Table_CSV extends Table {
setRowCount(row << 1);
}
if (row == 0 && header) {
- setColumnTitles(tsv ? PApplet.split(line, '\t') : splitLineCSV(line));
+ setColumnTitles(tsv ? PApplet.split(line, '\t') : splitLineCSV(line, reader));
header = false;
}
else {
- setRow(row, tsv ? PApplet.split(line, '\t') : splitLineCSV(line));
+ setRow(row, tsv ? PApplet.split(line, '\t') : splitLineCSV(line, reader));
row++;
}

0 comments on commit 35b086b

Please sign in to comment.