diff --git a/View/sample_data_tab.py b/View/sample_data_tab.py index d8400b8..cf9128f 100644 --- a/View/sample_data_tab.py +++ b/View/sample_data_tab.py @@ -271,7 +271,6 @@ class SampleDataTab(QWidget): self.groupbox_plot_PSD.setTitle(_translate("CONSTANT_STRING", cs.DISTRIBUTION_PLOT)) - def full_update(self): logger.debug(f"{__name__}: Update") self.blockSignals(True) @@ -281,6 +280,10 @@ class SampleDataTab(QWidget): self.lineEdit_fine_sediment.setToolTip(stg.path_fine) self.fill_table_fine() + self.lineEdit_sand_sediment.setText(stg.filename_sand) + self.lineEdit_sand_sediment.setToolTip(stg.path_sand) + self.fill_table_sand() + self.blockSignals(False) def last_opened_file_path(self, priority="sand"): @@ -407,7 +410,7 @@ class SampleDataTab(QWidget): horizontal_header = list( itertools.chain( ["Color", "Sample"], - list(map(str, stg.columns_fine[[0, 2]])), + [str(stg.columns_fine[0]), str(stg.columns_fine[2])], list(map(str, stg.columns_fine[3:])) ) ) @@ -506,7 +509,7 @@ class SampleDataTab(QWidget): horizontal_header = list( itertools.chain( ["Color", "Sample"], - list(map(str, stg.columns_sand[[0, 2]])), + [str(stg.columns_fine[0]), str(stg.columns_fine[2])], list(map(str, stg.columns_sand[3:])) ) ) @@ -1009,7 +1012,7 @@ class SampleDataTab(QWidget): self.axis_plot_sample_position_on_transect.text( 1, .85, stg.freq_text[self.combobox_acoustic_data.currentIndex()][self.combobox_frequencies.currentIndex()], - fontsize=14, fontweight='bold', fontname="Ubuntu", c="black", alpha=0.5, + fontsize=14, fontweight='bold', fontname="DejaVu Sans", c="black", alpha=0.5, horizontalalignment='right', verticalalignment='bottom', transform=self.axis_plot_sample_position_on_transect.transAxes) @@ -1017,11 +1020,11 @@ class SampleDataTab(QWidget): self.axis_plot_sample_position_on_transect.tick_params(axis='both', labelsize=8) self.axis_plot_sample_position_on_transect.text(.98, .03, "Time (sec)", - fontsize=10, fontweight='bold', fontname="Ubuntu", c="black", alpha=0.9, + fontsize=10, fontweight='bold', fontname="DejaVu Sans", c="black", alpha=0.9, horizontalalignment='right', verticalalignment='bottom', rotation='horizontal', transform=self.axis_plot_sample_position_on_transect.transAxes) self.axis_plot_sample_position_on_transect.text(.04, .53, "Depth (m)", - fontsize=10, fontweight='bold', fontname="Ubuntu", c="black", alpha=0.9, + fontsize=10, fontweight='bold', fontname="DejaVu Sans", c="black", alpha=0.9, horizontalalignment='right', verticalalignment='bottom', rotation='vertical', transform=self.axis_plot_sample_position_on_transect.transAxes) @@ -1335,7 +1338,7 @@ class SampleDataTab(QWidget): self.axis_plot_sample_position_on_transect.text( 1, .85, stg.freq_text[self.combobox_acoustic_data.currentIndex()][self.combobox_frequencies.currentIndex()], - fontsize=14, fontweight='bold', fontname="Ubuntu", c="black", alpha=0.5, + fontsize=14, fontweight='bold', fontname="DejaVu Sans", c="black", alpha=0.5, horizontalalignment='right', verticalalignment='bottom', transform=self.axis_plot_sample_position_on_transect.transAxes) @@ -1343,13 +1346,13 @@ class SampleDataTab(QWidget): self.axis_plot_sample_position_on_transect.tick_params(axis='both', labelsize=8) self.axis_plot_sample_position_on_transect.text(.98, .03, "Time (sec)", - fontsize=10, fontweight='bold', fontname="Ubuntu", c="black", + fontsize=10, fontweight='bold', fontname="DejaVu Sans", c="black", alpha=0.9, horizontalalignment='right', verticalalignment='bottom', rotation='horizontal', transform=self.axis_plot_sample_position_on_transect.transAxes) self.axis_plot_sample_position_on_transect.text(.04, .53, "Depth (m)", - fontsize=10, fontweight='bold', fontname="Ubuntu", c="black", + fontsize=10, fontweight='bold', fontname="DejaVu Sans", c="black", alpha=0.9, horizontalalignment='right', verticalalignment='bottom', rotation='vertical', diff --git a/main.py b/main.py index 74587f7..df670a7 100644 --- a/main.py +++ b/main.py @@ -98,7 +98,7 @@ class MainApplication(QMainWindow): self.tabs = [ self.acoustic_data_tab, self.signal_processing_tab, - # self.sample_data_tab, + self.sample_data_tab, # self.sediment_calibration_tab, # self.acoustic_inversion_tab, # self.note_tab