Model: Continue refactoring.
parent
680f18b741
commit
bdfcff88a5
|
|
@ -470,12 +470,16 @@ class ReadTableForOpen:
|
|||
|
||||
def read_table_settings(self):
|
||||
for s in range(len(stg.acoustic_data)):
|
||||
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,
|
||||
SNR_filter_value, Nb_cells_to_average_BS_signal
|
||||
FROM Settings WHERE (acoustic_data = {s})'''
|
||||
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,
|
||||
SNR_filter_value, Nb_cells_to_average_BS_signal
|
||||
FROM Settings
|
||||
WHERE (acoustic_data = {s})
|
||||
'''
|
||||
|
||||
data3 = self.execute(query3)
|
||||
|
||||
|
|
@ -489,28 +493,37 @@ class ReadTableForOpen:
|
|||
stg.Nb_cells_to_average_BS_signal.append([x[13] for x in data3])
|
||||
|
||||
def read_table_sediment_file(self):
|
||||
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'''
|
||||
query = 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 = self.execute(query4)
|
||||
data = self.execute(query)[0]
|
||||
|
||||
print("data4 ", data4)
|
||||
|
||||
stg.path_fine = data4[0][0]
|
||||
stg.filename_fine = data4[0][1]
|
||||
stg.radius_grain_fine = np.array(np.frombuffer(data4[0][2], dtype=np.float64))
|
||||
stg.path_sand = data4[0][3]
|
||||
stg.filename_sand = data4[0][4]
|
||||
stg.radius_grain_sand = np.array(np.frombuffer(data4[0][5], dtype=np.float64))
|
||||
stg.columns_fine = [data4[0][6], data4[0][7], data4[0][8], data4[0][9], data4[0][10]] + list(stg.radius_grain_fine)
|
||||
stg.columns_sand = [data4[0][6], data4[0][7], data4[0][8], data4[0][11], data4[0][12]] + list(stg.radius_grain_sand)
|
||||
|
||||
print("sediment file : ", stg.path_fine, stg.filename_fine, stg.path_sand, stg.filename_sand)
|
||||
print(stg.radius_grain_fine, stg.radius_grain_sand)
|
||||
print('stg.columns_fine ', stg.columns_fine)
|
||||
stg.path_fine = data[0]
|
||||
stg.filename_fine = data[1]
|
||||
stg.radius_grain_fine = np.array(
|
||||
np.frombuffer(data[2], dtype=np.float64)
|
||||
)
|
||||
stg.path_sand = data[3]
|
||||
stg.filename_sand = data[4]
|
||||
stg.radius_grain_sand = np.array(
|
||||
np.frombuffer(data[5], dtype=np.float64)
|
||||
)
|
||||
stg.columns_fine = (
|
||||
[data[6], data[7], data[8], data[9], data[10]]
|
||||
+ list(stg.radius_grain_fine)
|
||||
)
|
||||
stg.columns_sand = (
|
||||
[data[6], data[7], data[8], data[11], data[12]]
|
||||
+ list(stg.radius_grain_sand)
|
||||
)
|
||||
|
||||
def read_table_table_sediment_data(self):
|
||||
query5 = f'''SELECT sample_fine_name, sample_fine_index, distance_from_bank_fine, depth_fine, time_fine,
|
||||
|
|
|
|||
Loading…
Reference in New Issue