diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c66a59..66fdeb7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# 2.1.2 + +### Bug Fixes +* Fix #120 - Locale dependent formatting cause issue with output ODF file. + # 2.1.1 ### Bug Fixes diff --git a/OpenBCI_GUI/DataLogging.pde b/OpenBCI_GUI/DataLogging.pde index 20be10a..f89371d 100644 --- a/OpenBCI_GUI/DataLogging.pde +++ b/OpenBCI_GUI/DataLogging.pde @@ -87,9 +87,9 @@ void openNewLogFileODF(String _fileName) { */ void playbackSelected(File selection) { if (selection == null) { - println("ControlPanel: playbackSelected: Window was closed or the user hit cancel."); + println("DataLogging: playbackSelected: Window was closed or the user hit cancel."); } else { - println("ControlPanel: playbackSelected: User selected " + selection.getAbsolutePath()); + println("DataLogging: playbackSelected: User selected " + selection.getAbsolutePath()); output("You have selected \"" + selection.getAbsolutePath() + "\" for playback."); playbackData_fname = selection.getAbsolutePath(); } @@ -135,7 +135,7 @@ void fileSelected(File selection) { //called by the Open File dialog box after println("fileSelected: no selection so far..."); } else { //inputFile = selection; - playbackData_fname = selection.getAbsolutePath(); + playbackData_fname = selection.getAbsolutePath(); //<>// } } @@ -260,7 +260,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]))); } } @@ -268,7 +268,7 @@ public class OutputFile_rawtxt { int nVal = values.length; for (int Ival = 0; Ival < nVal; Ival++) { output.print(", "); - output.print(String.format("%.3f", scale_fac * float(values[Ival]))); + output.print(String.format(Locale.US, "%.3f", scale_fac * float(values[Ival]))); } } @@ -1475,4 +1475,4 @@ public void convertSDFile() { dataWriter.println(); } } -} +} \ No newline at end of file diff --git a/OpenBCI_GUI/OpenBCI_GUI.pde b/OpenBCI_GUI/OpenBCI_GUI.pde index 4734abb..04da94d 100644 --- a/OpenBCI_GUI/OpenBCI_GUI.pde +++ b/OpenBCI_GUI/OpenBCI_GUI.pde @@ -979,7 +979,7 @@ void introAnimation() { textLeading(24); fill(31, 69, 110, transparency); textAlign(CENTER, CENTER); - text("OpenBCI GUI v2.1.1\nJanuary 2017", width/2, height/2 + width/9); + text("OpenBCI GUI v2.1.2\nJanuary 2017", width/2, height/2 + width/9); } //exit intro animation at t2 @@ -1039,4 +1039,4 @@ PVector getWindowLocation(String renderer) { } return l; } -//END OF CODE FOR FIXING WEIRD EXIT CRASH ISSUE -- 7/27/16 =========================== \ No newline at end of file +//END OF CODE FOR FIXING WEIRD EXIT CRASH ISSUE -- 7/27/16 ===========================