Fix compilation error splitLineCSV, missing argument. Write float usi…

…ng Locale.US to ensure consistent export in cultures which use a ',' as decimal separator.
OpenBCI · a2343876ceb77f879df3a8d7efbd3d7044aadb4d · wezzix committed Dec 11, 2016 · Dec 11, 2016 · a234387
1 parent 0004b10
commit a2343876ceb77f879df3a8d7efbd3d7044aadb4d
Unified Split

Showing with 3 additions and 3 deletions.

+3 −3 OpenBCI_GUI/dataFiles.pde
diff --git a/OpenBCI_GUI/dataFiles.pde b/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++;
         }