From 400fa26f84efb6d1eb5ec7eae2b3ca0f6e88f30a Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby Date: Wed, 16 Apr 2025 14:28:37 +0200 Subject: [PATCH] Acoused: Remove 'Ubuntu' font and replace by 'DejaVu Sans' font. --- View/about_window.py | 6 ++---- View/acoustic_inversion_tab.py | 4 +--- View/plot_noise_window.py | 3 +-- View/sediment_calibration_tab.py | 10 +++++----- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/View/about_window.py b/View/about_window.py index 56da4d5..ada19f4 100644 --- a/View/about_window.py +++ b/View/about_window.py @@ -71,12 +71,12 @@ class AboutWindow(QDialog): self.label_acoused = QLabel() self.label_acoused.setText("Acoused 2.0") - self.label_acoused.setFont(QFont("Ubuntu", 14)) + self.label_acoused.setFont(QFont("DejaVu Sans", 14)) self.gridLayout.addWidget(self.label_acoused, 0, 1, 1, 1, Qt.AlignCenter) self.label_date = QLabel() self.label_date.setText("2025.01.01") - self.label_date.setFont(QFont("Ubuntu", 12)) + self.label_date.setFont(QFont("DejaVu Sans", 12)) self.gridLayout.addWidget(self.label_date, 1, 1, 1, 1, Qt.AlignCenter) self.label_logo_INRAE = QLabel() @@ -302,5 +302,3 @@ class Authors(QDialog): # w = AboutWindow() # w.show() # sys.exit(app.exec_()) - - diff --git a/View/acoustic_inversion_tab.py b/View/acoustic_inversion_tab.py index 334f42d..1072728 100644 --- a/View/acoustic_inversion_tab.py +++ b/View/acoustic_inversion_tab.py @@ -444,15 +444,13 @@ class AcousticInversionTab(QWidget): self.pushbutton_plot_sand_sample_choice\ .clicked.connect(self.plot_measured_vs_inverted_SSC_sand) - @trace def full_update(self): logger.debug(f"{__name__}: Update") self.blockSignals(True) self.update_acoustic_data_choice() - - # TODO: Update all widgets + self.function_run_inversion() self.blockSignals(False) diff --git a/View/plot_noise_window.py b/View/plot_noise_window.py index f00b024..37cbc67 100644 --- a/View/plot_noise_window.py +++ b/View/plot_noise_window.py @@ -66,7 +66,7 @@ class PlotNoiseWindow(QDialog): eval("self.ax" + str(i) + "[" + str(freq_ind) + "]" + ".text(1, .70, stg.freq_text[" + str(i) + "][" + str(freq_ind) + "]," + - "fontsize=10, fontweight='bold', fontname='Ubuntu', c='black', alpha=0.5," + + "fontsize=10, fontweight='bold', fontname='DejaVu Sans', c='black', alpha=0.5," + "horizontalalignment='right', verticalalignment='bottom'," + "transform=self.ax" + str(i) + "[" + str(freq_ind) + "].transAxes)") @@ -91,4 +91,3 @@ class PlotNoiseWindow(QDialog): exec("self.verticalLayout_tab" + str(i) + ".addWidget(self.toolbar" + str(i) + ")") exec("self.verticalLayout_tab" + str(i) + ".addWidget(self.scroll" + str(i) + ")") - diff --git a/View/sediment_calibration_tab.py b/View/sediment_calibration_tab.py index b9db4bc..45a86ae 100644 --- a/View/sediment_calibration_tab.py +++ b/View/sediment_calibration_tab.py @@ -648,7 +648,7 @@ class SedimentCalibrationTab(QWidget): self.label_FCB_explanation_alphas_positive.setText( "αs FCB > 0 : comparison with calibration" ) - self.label_FCB_explanation_alphas_positive.setFont(QFont('Ubuntu', 12)) + self.label_FCB_explanation_alphas_positive.setFont(QFont('DejaVu Sans', 12)) self.gridLayout_groupbox_FCB_text_alphas.addWidget( self.label_FCB_explanation_alphas_positive, 0, 1, 1, 1, Qt.AlignLeft @@ -669,7 +669,7 @@ class SedimentCalibrationTab(QWidget): self.label_FCB_explanation_alphas_negative.setText( "αs FCB < 0 : do not compare with calibration" ) - self.label_FCB_explanation_alphas_negative.setFont(QFont('Ubuntu', 12)) + self.label_FCB_explanation_alphas_negative.setFont(QFont('DejaVu Sans', 12)) self.gridLayout_groupbox_FCB_text_alphas.addWidget( self.label_FCB_explanation_alphas_negative, 1, 1, 1, 1, Qt.AlignLeft @@ -736,7 +736,7 @@ class SedimentCalibrationTab(QWidget): self.label_alphaS_FCB.setText( "αs = " + "0.0" + "dB/m" ) - self.label_alphaS_FCB.setFont(QFont("Ubuntu", 14, QFont.Normal)) + self.label_alphaS_FCB.setFont(QFont("DejaVu Sans", 14, QFont.Normal)) self.gridLayout_groupbox_FCB_compute.addWidget( self.label_alphaS_FCB, 2, 4, 1, 2 ) @@ -2622,7 +2622,7 @@ class SedimentCalibrationTab(QWidget): self.axis_FCB.text(.95, .05, stg.freq_text[self.combobox_acoustic_data_choice.currentIndex()][ self.combobox_frequency_FCB.currentIndex()], - fontsize=10, fontweight='bold', fontname="Ubuntu", + fontsize=10, fontweight='bold', fontname="DejaVu Sans", fontstyle="normal", c="black", alpha=0.2, horizontalalignment='right', verticalalignment='bottom', transform=self.axis_FCB.transAxes) @@ -2658,7 +2658,7 @@ class SedimentCalibrationTab(QWidget): self.axis_FCB.text(.95, .05, stg.freq_text[self.combobox_acoustic_data_choice.currentIndex()][ self.combobox_frequency_FCB.currentIndex()], - fontsize=10, fontweight='bold', fontname="Ubuntu", + fontsize=10, fontweight='bold', fontname="DejaVu Sans", fontstyle="normal", c="black", alpha=0.2, horizontalalignment='right', verticalalignment='bottom', transform=self.axis_FCB.transAxes)