From c5a9c2649ba6a7888a64f18d98772eb7d9989326 Mon Sep 17 00:00:00 2001 From: Markus Koller Date: Sat, 11 Feb 2023 21:30:36 +0100 Subject: [PATCH] Replacing csv sequence decimal and seperator signs throuout code and examples decimal sign now point, seperator now comma --- Test cases/Test1.csv | 46 +++++++++++++-------------- Test cases/Test2.csv | 30 ++++++++--------- Test cases/Test2_slow.csv | 30 ++++++++--------- Test cases/out of bounds.csv | 24 +++++++------- Test cases/test_sequence_rotation.csv | 2 +- src/csv_threading.py | 6 ++-- src/user_interface.py | 2 +- 7 files changed, 70 insertions(+), 70 deletions(-) diff --git a/Test cases/Test1.csv b/Test cases/Test1.csv index ba50a1b..8c87a87 100644 --- a/Test cases/Test1.csv +++ b/Test cases/Test1.csv @@ -1,23 +1,23 @@ -Time (s);xField (T);yField (T);zField (T) -0,5;0,000015;0,000025;0,00002 -1;0,0000155;0,0000245;0,0000205 -1,5;0,000016;0,000024;0,000021 -2;0,0000165;0,0000235;0,0000215 -2,5;0,000017;0,000023;0,000022 -3;0,0000175;0,0000225;0,0000225 -3,5;0,000018;0,000022;0,000023 -4;0,0000185;0,0000215;0,0000235 -4,5;0,000019;0,000021;0,000024 -5;0,0000195;0,0000205;0,0000245 -5,5;0,00002;0,00002;0,000025 -6;0,0000205;0,0000195;0,0000245 -6,5;0,000021;0,000019;0,000024 -7;0,0000215;0,0000185;0,0000235 -7,5;0,000022;0,000018;0,000023 -8;0,0000225;0,0000175;0,0000225 -8,5;0,000023;0,000017;0,000022 -9;0,0000235;0,0000165;0,0000215 -9,5;0,000024;0,000016;0,000021 -10;0,0000245;0,0000155;0,0000205 -10,5;0,000025;0,000015;0,00002 -11;0,000025;0,000015;0,00002 +"Time [s]]","xField [T]","yField [T]","zField [T]" +0.5,0.000015,0.000025,0.00002 +1,0.0000155,0.0000245,0.0000205 +1.5,0.000016,0.000024,0.000021 +2,0.0000165,0.0000235,0.0000215 +2.5,0.000017,0.000023,0.000022 +3,0.0000175,0.0000225,0.0000225 +3.5,0.000018,0.000022,0.000023 +4,0.0000185,0.0000215,0.0000235 +4.5,0.000019,0.000021,0.000024 +5,0.0000195,0.0000205,0.0000245 +5.5,0.00002,0.00002,0.000025 +6,0.0000205,0.0000195,0.0000245 +6.5,0.000021,0.000019,0.000024 +7,0.0000215,0.0000185,0.0000235 +7.5,0.000022,0.000018,0.000023 +8,0.0000225,0.0000175,0.0000225 +8.5,0.000023,0.000017,0.000022 +9,0.0000235,0.0000165,0.0000215 +9.5,0.000024,0.000016,0.000021 +10,0.0000245,0.0000155,0.0000205 +10.5,0.000025,0.000015,0.00002 +11,0.000025,0.000015,0.00002 diff --git a/Test cases/Test2.csv b/Test cases/Test2.csv index 3466d12..b721ae1 100644 --- a/Test cases/Test2.csv +++ b/Test cases/Test2.csv @@ -1,15 +1,15 @@ -Time (s);xField (T);yField (T);zField (T) -0;0,0000145;0,0000255;0,0000195 -0,1;-0,000015;0,000025;0,00002 -0,2;-0,0000155;-0,0000245;0,0000205 -0,3;-0,000016;-0,000024;-0,000021 -0,4;0,0000165;-0,0000235;-0,0000215 -0,5;0,000017;0,000023;-0,000022 -0,6;0,0000175;0,0000225;0,0000225 -0,7;-0,000018;-0,000022;0,000023 -0,8;0,0000185;-0,0000215;-0,0000235 -0,9;-0,000019;0,000021;-0,000024 -1;-0,0000195;-0,0000205;-0,0000245 -1,1;0,00002;0,00002;0,000025 -1,2;-0,0000205;-0,0000195;-0,0000245 -1,3;0,000021;0,000019;0,000024 +"Time [s]]","xField [T]","yField [T]","zField [T]" +0,0.0000145,0.0000255,0.0000195 +0.1,-0.000015,0.000025,0.00002 +0.2,-0.0000155,-0.0000245,0.0000205 +0.3,-0.000016,-0.000024,-0.000021 +0.4,0.0000165,-0.0000235,-0.0000215 +0.5,0.000017,0.000023,-0.000022 +0.6,0.0000175,0.0000225,0.0000225 +0.7,-0.000018,-0.000022,0.000023 +0.8,0.0000185,-0.0000215,-0.0000235 +0.9,-0.000019,0.000021,-0.000024 +1,-0.0000195,-0.0000205,-0.0000245 +1.1,0.00002,0.00002,0.000025 +1.2,-0.0000205,-0.0000195,-0.0000245 +1.3,0.000021,0.000019,0.000024 diff --git a/Test cases/Test2_slow.csv b/Test cases/Test2_slow.csv index b88ab13..09fc391 100644 --- a/Test cases/Test2_slow.csv +++ b/Test cases/Test2_slow.csv @@ -1,15 +1,15 @@ -Time (s);xField (T);yField (T);zField (T) -0;0,0000145;0,0000255;0,0000195 -1;-0,000015;0,000025;0,00002 -2;-0,0000155;-0,0000245;0,0000205 -3;-0,000016;-0,000024;-0,000021 -4;0,0000165;-0,0000235;-0,0000215 -5;0,000017;0,000023;-0,000022 -6;0,0000175;0,0000225;0,0000225 -7;-0,000018;-0,000022;0,000023 -8;0,0000185;-0,0000215;-0,0000235 -9;-0,000019;0,000021;-0,000024 -10;-0,0000195;-0,0000205;-0,0000245 -11;0,00002;0,00002;0,000025 -12;-0,0000205;-0,0000195;-0,0000245 -13;0,000021;0,000019;0,000024 +"Time [s]]","xField [T]","yField [T]","zField [T]" +0,0.0000145,0.0000255,0.0000195 +1,-0.000015,0.000025,0.00002 +2,-0.0000155,-0.0000245,0.0000205 +3,-0.000016,-0.000024,-0.000021 +4,0.0000165,-0.0000235,-0.0000215 +5,0.000017,0.000023,-0.000022 +6,0.0000175,0.0000225,0.0000225 +7,-0.000018,-0.000022,0.000023 +8,0.0000185,-0.0000215,-0.0000235 +9,-0.000019,0.000021,-0.000024 +10,-0.0000195,-0.0000205,-0.0000245 +11,0.00002,0.00002,0.000025 +12,-0.0000205,-0.0000195,-0.0000245 +13,0.000021,0.000019,0.000024 diff --git a/Test cases/out of bounds.csv b/Test cases/out of bounds.csv index 3e10ebc..1b7e5d2 100644 --- a/Test cases/out of bounds.csv +++ b/Test cases/out of bounds.csv @@ -1,12 +1,12 @@ -Time (s);xField (T);yField (T);zField (T); -0;0,00015;-0,00015;0,00002;150 -1;0,00017;-0,00017;0,00002;170 -2;0,00018;-0,00018;0,00002;180 -3;0,00019;-0,00019;0,00002;190 -4;0,0002;-0,0002;0,00002;200 -5;0,00021;0,00021;0,00002;210 -6;0,00022;-0,00022;0,00002;220 -7;0,0002;-0,0002;0,00002;200 -8;0,00018;-0,00018;0,00002;180 -9;0,00005;-0,00005;0,00002;50 -10;-0,00004;0,00004;0,00002;-40 +"Time [s]]","xField [T]","yField [T]","zField [T]" +0,0.00015,-0.00015,0.00002,150 +1,0.00017,-0.00017,0.00002,170 +2,0.00018,-0.00018,0.00002,180 +3,0.00019,-0.00019,0.00002,190 +4,0.0002,-0.0002,0.00002,200 +5,0.00021,0.00021,0.00002,210 +6,0.00022,-0.00022,0.00002,220 +7,0.0002,-0.0002,0.00002,200 +8,0.00018,-0.00018,0.00002,180 +9,0.00005,-0.00005,0.00002,50 +10,-0.00004,0.00004,0.00002,-40 diff --git a/Test cases/test_sequence_rotation.csv b/Test cases/test_sequence_rotation.csv index aa2d882..8439228 100644 --- a/Test cases/test_sequence_rotation.csv +++ b/Test cases/test_sequence_rotation.csv @@ -1,4 +1,4 @@ -"t [s]","x [T]","y [T]","z [T]" +"Time [s]]","xField [T]","yField [T]","zField [T]" 0.0,0.0,-1.7452406437283511e-06,9.998476951563913e-05 1.0,0.0,-3.489949670250097e-06,9.993908270190956e-05 2.0,0.0,-5.233595624294383e-06,9.986295347545739e-05 diff --git a/src/csv_threading.py b/src/csv_threading.py index a48ef77..2f9d332 100644 --- a/src/csv_threading.py +++ b/src/csv_threading.py @@ -112,13 +112,13 @@ class ExecCSVThread(Thread): def read_csv_to_array(filepath): # convert a given csv file to a numpy array - # csv format: time (s); xField (T); yField (T); zField (T) (german excel) + # csv format: time [s], xField [T], yField [T], zField [T] (german excel) # decimal or period commas. Do not use these characters as a thousands seperator! with open(filepath, 'r') as csv_file: # Normalize seperators - csv_string = csv_file.read().replace(',', '.') + csv_string = csv_file.read() # read csv file without column headers - file = pandas.read_csv(StringIO(csv_string), sep=';', decimal='.', header=0) + file = pandas.read_csv(StringIO(csv_string), sep=',', decimal='.', header=0) array = file.to_numpy() # convert csv to array return array diff --git a/src/user_interface.py b/src/user_interface.py index f66ece9..8386250 100644 --- a/src/user_interface.py +++ b/src/user_interface.py @@ -671,7 +671,7 @@ class ExecuteCSVMode(Frame): # Assemble data to export rot_sequence = dict(enumerate(t)) for i in range(len(t)): - rot_sequence[i] = {'Time (s)': t[i], 'xField (T)': x[i], 'yField (T)': y[i], 'zField (T)': z[i]} + rot_sequence[i] = {'Time [s]]': t[i], 'xField [T]': x[i], 'yField [T]': y[i], 'zField [T]': z[i]} # Save dictionary to disk save_dict_list_to_csv2('test_sequence_rotation.csv', rot_sequence, query_path=True) ui_print("Saved test sequence to disc.")