diff --git a/Model/read_table_for_open.py b/Model/read_table_for_open.py index 7e5e075..188316c 100644 --- a/Model/read_table_for_open.py +++ b/Model/read_table_for_open.py @@ -76,7 +76,7 @@ class ReadTableForOpen: for k in range(len(stg.acoustic_data)): print("hello") - query = f'''SELECT acoustic_data, acoustic_file, ABS_name, path_BS_noise_data, filename_BS_noise_data, + query = f'''SELECT acoustic_data, acoustic_file, ABS_name, path_BS_noise_data, filename_BS_noise_data, noise_method, noise_value, data_preprocessed FROM AcousticFile WHERE (acoustic_data = {k})''' data = cur.execute(query).fetchall() print("data acoustic file", data) @@ -101,8 +101,8 @@ class ReadTableForOpen: stg.hour = [0]*len(stg.acoustic_data) for i in range(len(stg.acoustic_data)): print("i = ", i) - query1 = f'''SELECT acoustic_data, Date, Hour, frequency, sound_attenuation, kt_read, kt_corrected, NbProfiles, - NbProfilesPerSeconds, NbCells, CellSize, PulseLength, NbPingsPerSeconds, NbPingsAveragedPerProfile, + query1 = f'''SELECT acoustic_data, Date, Hour, frequency, sound_attenuation, kt_read, kt_corrected, NbProfiles, + NbProfilesPerSeconds, NbCells, CellSize, PulseLength, NbPingsPerSeconds, NbPingsAveragedPerProfile, GainRx, GainTx FROM Measure WHERE (acoustic_data = {i})''' data1 = cur.execute(query1).fetchall() @@ -140,16 +140,16 @@ class ReadTableForOpen: print("len stg.acoustic_data ", len(stg.acoustic_data)) for j in range(len(stg.acoustic_data)): print(f"j = {j}") - query2 = f'''SELECT acoustic_data, time, depth, BS_raw_data, + query2 = f'''SELECT acoustic_data, time, depth, BS_raw_data, time_reshape, depth_reshape, BS_raw_data_reshape, - time_cross_section, depth_cross_section, - BS_cross_section, BS_stream_bed, + time_cross_section, depth_cross_section, + BS_cross_section, BS_stream_bed, depth_bottom, val_bottom, ind_bottom, - time_noise, depth_noise, BS_noise_raw_data, + time_noise, depth_noise, BS_noise_raw_data, SNR_raw_data, SNR_cross_section, SNR_stream_bed, - BS_raw_data_pre_process_SNR, BS_raw_data_pre_process_average, - BS_cross_section_pre_process_SNR, BS_cross_section_pre_process_average, - BS_stream_bed_pre_process_SNR, BS_stream_bed_pre_process_average, BS_mean + BS_raw_data_pre_process_SNR, BS_raw_data_pre_process_average, + BS_cross_section_pre_process_SNR, BS_cross_section_pre_process_average, + BS_stream_bed_pre_process_SNR, BS_stream_bed_pre_process_average, BS_mean FROM BSRawData WHERE (acoustic_data = {j})''' data2 = cur.execute(query2).fetchall() @@ -270,10 +270,10 @@ class ReadTableForOpen: # +++++++++++++++++++++++ for s in range(len(stg.acoustic_data)): - query3 = f'''SELECT acoustic_data, temperature, + query3 = f'''SELECT acoustic_data, temperature, tmin_index, tmin_value, tmax_index, tmax_value, rmin_index, rmin_value, rmax_index, rmax_value, - freq_bottom_detection_index, freq_bottom_detection_value, + freq_bottom_detection_index, freq_bottom_detection_value, SNR_filter_value, Nb_cells_to_average_BS_signal FROM Settings WHERE (acoustic_data = {s})''' @@ -293,10 +293,10 @@ class ReadTableForOpen: # --- Table Sediment File --- # +++++++++++++++++++++++++++ - query4 = f'''SELECT path_fine, filename_fine, radius_grain_fine, path_sand, filename_sand, radius_grain_sand, - time_column_label, distance_from_bank_column_label, depth_column_label, - Ctot_fine_column_label, D50_fine_column_label, - Ctot_sand_column_label, D50_sand_column_label + query4 = f'''SELECT path_fine, filename_fine, radius_grain_fine, path_sand, filename_sand, radius_grain_sand, + time_column_label, distance_from_bank_column_label, depth_column_label, + Ctot_fine_column_label, D50_fine_column_label, + Ctot_sand_column_label, D50_sand_column_label from SedimentsFile''' data4 = cur.execute(query4).fetchall() @@ -321,10 +321,10 @@ class ReadTableForOpen: # --- Table Sediment Data --- # +++++++++++++++++++++++++++ - query5 = f'''SELECT sample_fine_name, sample_fine_index, distance_from_bank_fine, depth_fine, time_fine, + query5 = f'''SELECT sample_fine_name, sample_fine_index, distance_from_bank_fine, depth_fine, time_fine, Ctot_fine, Ctot_fine_per_cent, D50_fine, frac_vol_fine, frac_vol_fine_cumul, - sample_sand_name, sample_sand_index, distance_from_bank_sand, depth_sand, time_sand, - Ctot_sand, Ctot_sand_per_cent, D50_sand, frac_vol_sand, frac_vol_sand_cumul + sample_sand_name, sample_sand_index, distance_from_bank_sand, depth_sand, time_sand, + Ctot_sand, Ctot_sand_per_cent, D50_sand, frac_vol_sand, frac_vol_sand_cumul from SedimentsData''' data5 = cur.execute(query5).fetchall()