From 033ecb96b2832bf342140c760ec929fe3fec90fe Mon Sep 17 00:00:00 2001 From: Djalim Simaila Date: Wed, 10 May 2023 15:44:27 +0200 Subject: [PATCH] feat: added new indicators to the values tab --- utils/gui/pyqt/main_window/MainWindow.ui | 1016 ++++++++++++------- utils/gui/pyqt/main_window/UI_MainWindow.py | 285 ++++-- 2 files changed, 824 insertions(+), 477 deletions(-) diff --git a/utils/gui/pyqt/main_window/MainWindow.ui b/utils/gui/pyqt/main_window/MainWindow.ui index ecaa0c5..fc22876 100644 --- a/utils/gui/pyqt/main_window/MainWindow.ui +++ b/utils/gui/pyqt/main_window/MainWindow.ui @@ -135,7 +135,7 @@ afficher les graphes - true + false @@ -185,396 +185,630 @@ - - - - - Numero de la couche a traiter : - - - Qt::AlignCenter - - - - - - - - - - Taille de l'intervale - - - - - - - true - - - QAbstractSpinBox::NoButtons - - - 6 - - - -999999.000000000000000 - - - 999999.000000000000000 - - - - - - - X moyen - - - - - - - QAbstractSpinBox::NoButtons - - - 6 - - - -999999.000000000000000 - - - 999999.000000000000000 - - - - - - - Y Moyen - - - - - - - true - - - QAbstractSpinBox::NoButtons - - - 6 - - - -999999.000000000000000 - - - 999999.000000000000000 - - - - - - - Z Moyen - - - - - - - true - - - QAbstractSpinBox::NoButtons - - - 6 - - - -999999.000000000000000 - - - 999999.000000000000000 - - - - - - - Rayon moyen - - - - - - - true - - - QAbstractSpinBox::NoButtons - - - 6 - - - -999999.000000000000000 - - - 999999.000000000000000 - - - - - - - Ecart type des rayons (σR) - - - - - - - true - - - QAbstractSpinBox::NoButtons - - - 6 - - - -999999.000000000000000 - - - 999999.000000000000000 - - - - - - - Tortuosité - - - - - - - true - - - QAbstractSpinBox::NoButtons - - - 6 - - - -999999.000000000000000 - - - 999999.000000000000000 - - - - - - - Volume en mm3 - - - - - - - true - - - QAbstractSpinBox::NoButtons - - - 6 - - - -999999.000000000000000 - - - 999999.000000000000000 - - - - - - - Surface en mm2 - - - - - - - true - - - QAbstractSpinBox::NoButtons - - - 6 - - - -999999.000000000000000 - - - 999999.000000000000000 - - - - - - - Moyenne des rayons moyens (<R>) - - - - - - - true - - - QAbstractSpinBox::NoButtons - - - 6 - - - -999999.000000000000000 - - - 999999.000000000000000 - - - - - - - Ecart type des rayons moyens(σ<R>) - - - - - - - true - - - QAbstractSpinBox::NoButtons - - - 6 - - - -999999.000000000000000 - - - 999999.000000000000000 - - - - - - - σ<R>tot - - - - - - - true - - - QAbstractSpinBox::NoButtons - - - 6 - - - -999999.000000000000000 - - - 999999.000000000000000 - - - - - - - MI_p - - - - - - - true - - - QAbstractSpinBox::NoButtons - - - 6 - - - -999999.000000000000000 - - - 999999.000000000000000 - - - - - - - MI_l - - - - - - - true - - - QAbstractSpinBox::NoButtons - - - 6 - - - -999999.000000000000000 - - - 999999.000000000000000 - - - - - - - Qt::Horizontal - - - - - - - Exporter les variables - - - - + + + true + + + + + 0 + 0 + 431 + 907 + + + + + 0 + 0 + + + + + + + Recalculer les indicateurs morphologiques + + + + + + + + + Numero de la couche a traiter : + + + Qt::AlignCenter + + + + + + + + + + Taille de l'intervale + + + + + + + true + + + QAbstractSpinBox::NoButtons + + + 6 + + + -999999.000000000000000 + + + 999999.999998999992386 + + + + + + + X moyen + + + + + + + QAbstractSpinBox::NoButtons + + + 6 + + + -999999.000000000000000 + + + 999999.999998999992386 + + + + + + + Y Moyen + + + + + + + true + + + QAbstractSpinBox::NoButtons + + + 6 + + + -999999.000000000000000 + + + 999999.999998999992386 + + + + + + + Z Moyen + + + + + + + true + + + QAbstractSpinBox::NoButtons + + + 6 + + + -999999.000000000000000 + + + 999999.999998999992386 + + + + + + + Rayon moyen + + + + + + + true + + + QAbstractSpinBox::NoButtons + + + 6 + + + -999999.000000000000000 + + + 999999.999998999992386 + + + + + + + Ecart type des rayons (σR) + + + + + + + true + + + QAbstractSpinBox::NoButtons + + + 6 + + + -999999.000000000000000 + + + 999999.999998999992386 + + + + + + + Tortuosité + + + + + + + true + + + QAbstractSpinBox::NoButtons + + + 6 + + + -999999.000000000000000 + + + 999999.999998999992386 + + + + + + + Volume en mm³ + + + + + + + true + + + QAbstractSpinBox::NoButtons + + + 6 + + + -999999.000000000000000 + + + 999999.999998999992386 + + + + + + + Surface en mm² + + + + + + + true + + + QAbstractSpinBox::NoButtons + + + 6 + + + -999999.000000000000000 + + + 999999.999998999992386 + + + + + + + Moyenne des rayons moyens 〈R〉 + + + + + + + true + + + QAbstractSpinBox::NoButtons + + + 6 + + + -999999.000000000000000 + + + 999999.999998999992386 + + + + + + + Ecart type des rayons moyens σ〈R〉 + + + + + + + true + + + QAbstractSpinBox::NoButtons + + + 6 + + + -999999.000000000000000 + + + 999999.999998999992386 + + + + + + + σ〈R〉^tot + + + + + + + true + + + QAbstractSpinBox::NoButtons + + + 6 + + + -999999.000000000000000 + + + 999999.999998999992386 + + + + + + + MI_p + + + + + + + true + + + QAbstractSpinBox::NoButtons + + + 6 + + + -999999.000000000000000 + + + 999999.999998999992386 + + + + + + + MI_l + + + + + + + true + + + QAbstractSpinBox::NoButtons + + + 6 + + + -999999.999998999992386 + + + 999999.999998999992386 + + + + + + + Qt::Horizontal + + + + + + + Rayon hydraulique R_h + + + + + + + true + + + QAbstractSpinBox::NoButtons + + + 6 + + + -999999.000000000000000 + + + 999999.999998999992386 + + + + + + + HI + + + + + + + true + + + QAbstractSpinBox::NoButtons + + + 6 + + + -999999.000000000000000 + + + 999999.999998999992386 + + + + + + + MI_mR + + + + + + + true + + + QAbstractSpinBox::NoButtons + + + 6 + + + -999999.999998999992386 + + + 999999.999998999992386 + + + + + + + MI_mH + + + + + + + true + + + QAbstractSpinBox::NoButtons + + + 6 + + + -999999.999998999992386 + + + 999999.999998999992386 + + + + + + + MI_mR_in + + + + + + + true + + + QAbstractSpinBox::NoButtons + + + 6 + + + -999999.999998999992386 + + + 999999.999998999992386 + + + + + + + R_V_scan + + + + + + + true + + + QAbstractSpinBox::NoButtons + + + 6 + + + -999999.999998999992386 + + + 999999.999998999992386 + + + + + + + S_V_scan + + + + + + + true + + + QAbstractSpinBox::NoButtons + + + 6 + + + -999999.999998999992386 + + + 999999.999998999992386 + + + + + + + V_scan + + + + + + + 6 + + + -999999.999998999992386 + + + 999999.999998999992386 + + + + + + + + + Exporter les variables + + + + + + diff --git a/utils/gui/pyqt/main_window/UI_MainWindow.py b/utils/gui/pyqt/main_window/UI_MainWindow.py index 209284a..e257896 100644 --- a/utils/gui/pyqt/main_window/UI_MainWindow.py +++ b/utils/gui/pyqt/main_window/UI_MainWindow.py @@ -84,7 +84,7 @@ class Ui_MainWindow(object): self.graphs_params_layout = QtWidgets.QHBoxLayout() self.graphs_params_layout.setObjectName("graphs_params_layout") self.show_graph_checkbox = QtWidgets.QCheckBox(self.parameters) - self.show_graph_checkbox.setChecked(True) + self.show_graph_checkbox.setChecked(False) self.show_graph_checkbox.setObjectName("show_graph_checkbox") self.graphs_params_layout.addWidget(self.show_graph_checkbox) self.label = QtWidgets.QLabel(self.parameters) @@ -110,177 +110,281 @@ class Ui_MainWindow(object): self.values.setObjectName("values") self.gridLayout_15 = QtWidgets.QGridLayout(self.values) self.gridLayout_15.setObjectName("gridLayout_15") + self.scrollArea = QtWidgets.QScrollArea(self.values) + self.scrollArea.setWidgetResizable(True) + self.scrollArea.setObjectName("scrollArea") + self.scrollAreaWidgetContents = QtWidgets.QWidget() + self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 431, 907)) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Ignored, QtWidgets.QSizePolicy.Preferred) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.scrollAreaWidgetContents.sizePolicy().hasHeightForWidth()) + self.scrollAreaWidgetContents.setSizePolicy(sizePolicy) + self.scrollAreaWidgetContents.setObjectName("scrollAreaWidgetContents") + self.gridLayout_16 = QtWidgets.QGridLayout(self.scrollAreaWidgetContents) + self.gridLayout_16.setObjectName("gridLayout_16") + self.refresh_morphological_indicators = QtWidgets.QPushButton(self.scrollAreaWidgetContents) + self.refresh_morphological_indicators.setObjectName("refresh_morphological_indicators") + self.gridLayout_16.addWidget(self.refresh_morphological_indicators, 2, 0, 1, 1) self.formLayout = QtWidgets.QFormLayout() self.formLayout.setObjectName("formLayout") - self.layer_label = QtWidgets.QLabel(self.values) + self.layer_label = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.layer_label.setAlignment(QtCore.Qt.AlignCenter) self.layer_label.setObjectName("layer_label") - self.formLayout.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.layer_label) - self.layer_ComboBox = QtWidgets.QComboBox(self.values) + self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.layer_label) + self.layer_ComboBox = QtWidgets.QComboBox(self.scrollAreaWidgetContents) self.layer_ComboBox.setObjectName("layer_ComboBox") - self.formLayout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.layer_ComboBox) - self.interval_size_label = QtWidgets.QLabel(self.values) + self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.layer_ComboBox) + self.interval_size_label = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.interval_size_label.setObjectName("interval_size_label") - self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.interval_size_label) - self.interval_size = QtWidgets.QDoubleSpinBox(self.values) + self.formLayout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.interval_size_label) + self.interval_size = QtWidgets.QDoubleSpinBox(self.scrollAreaWidgetContents) self.interval_size.setReadOnly(True) self.interval_size.setButtonSymbols(QtWidgets.QAbstractSpinBox.NoButtons) self.interval_size.setDecimals(6) self.interval_size.setMinimum(-999999.0) - self.interval_size.setMaximum(999999.0) + self.interval_size.setMaximum(999999.999999) self.interval_size.setObjectName("interval_size") - self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.interval_size) - self.x_mean_label = QtWidgets.QLabel(self.values) + self.formLayout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.interval_size) + self.x_mean_label = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.x_mean_label.setObjectName("x_mean_label") - self.formLayout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.x_mean_label) - self.x_mean = QtWidgets.QDoubleSpinBox(self.values) + self.formLayout.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.x_mean_label) + self.x_mean = QtWidgets.QDoubleSpinBox(self.scrollAreaWidgetContents) self.x_mean.setButtonSymbols(QtWidgets.QAbstractSpinBox.NoButtons) self.x_mean.setDecimals(6) self.x_mean.setMinimum(-999999.0) - self.x_mean.setMaximum(999999.0) + self.x_mean.setMaximum(999999.999999) self.x_mean.setObjectName("x_mean") - self.formLayout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.x_mean) - self.y_mean_label = QtWidgets.QLabel(self.values) + self.formLayout.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.x_mean) + self.y_mean_label = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.y_mean_label.setObjectName("y_mean_label") - self.formLayout.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.y_mean_label) - self.y_mean = QtWidgets.QDoubleSpinBox(self.values) + self.formLayout.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.y_mean_label) + self.y_mean = QtWidgets.QDoubleSpinBox(self.scrollAreaWidgetContents) self.y_mean.setReadOnly(True) self.y_mean.setButtonSymbols(QtWidgets.QAbstractSpinBox.NoButtons) self.y_mean.setDecimals(6) self.y_mean.setMinimum(-999999.0) - self.y_mean.setMaximum(999999.0) + self.y_mean.setMaximum(999999.999999) self.y_mean.setObjectName("y_mean") - self.formLayout.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.y_mean) - self.z_mean_label = QtWidgets.QLabel(self.values) + self.formLayout.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.y_mean) + self.z_mean_label = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.z_mean_label.setObjectName("z_mean_label") - self.formLayout.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.z_mean_label) - self.z_mean = QtWidgets.QDoubleSpinBox(self.values) + self.formLayout.setWidget(5, QtWidgets.QFormLayout.LabelRole, self.z_mean_label) + self.z_mean = QtWidgets.QDoubleSpinBox(self.scrollAreaWidgetContents) self.z_mean.setReadOnly(True) self.z_mean.setButtonSymbols(QtWidgets.QAbstractSpinBox.NoButtons) self.z_mean.setDecimals(6) self.z_mean.setMinimum(-999999.0) - self.z_mean.setMaximum(999999.0) + self.z_mean.setMaximum(999999.999999) self.z_mean.setObjectName("z_mean") - self.formLayout.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.z_mean) - self.r_mean_label = QtWidgets.QLabel(self.values) + self.formLayout.setWidget(5, QtWidgets.QFormLayout.FieldRole, self.z_mean) + self.r_mean_label = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.r_mean_label.setObjectName("r_mean_label") - self.formLayout.setWidget(5, QtWidgets.QFormLayout.LabelRole, self.r_mean_label) - self.r_mean = QtWidgets.QDoubleSpinBox(self.values) + self.formLayout.setWidget(6, QtWidgets.QFormLayout.LabelRole, self.r_mean_label) + self.r_mean = QtWidgets.QDoubleSpinBox(self.scrollAreaWidgetContents) self.r_mean.setReadOnly(True) self.r_mean.setButtonSymbols(QtWidgets.QAbstractSpinBox.NoButtons) self.r_mean.setDecimals(6) self.r_mean.setMinimum(-999999.0) - self.r_mean.setMaximum(999999.0) + self.r_mean.setMaximum(999999.999999) self.r_mean.setObjectName("r_mean") - self.formLayout.setWidget(5, QtWidgets.QFormLayout.FieldRole, self.r_mean) - self.sigma_r_label = QtWidgets.QLabel(self.values) + self.formLayout.setWidget(6, QtWidgets.QFormLayout.FieldRole, self.r_mean) + self.sigma_r_label = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.sigma_r_label.setObjectName("sigma_r_label") - self.formLayout.setWidget(6, QtWidgets.QFormLayout.LabelRole, self.sigma_r_label) - self.sigma_r = QtWidgets.QDoubleSpinBox(self.values) + self.formLayout.setWidget(7, QtWidgets.QFormLayout.LabelRole, self.sigma_r_label) + self.sigma_r = QtWidgets.QDoubleSpinBox(self.scrollAreaWidgetContents) self.sigma_r.setReadOnly(True) self.sigma_r.setButtonSymbols(QtWidgets.QAbstractSpinBox.NoButtons) self.sigma_r.setDecimals(6) self.sigma_r.setMinimum(-999999.0) - self.sigma_r.setMaximum(999999.0) + self.sigma_r.setMaximum(999999.999999) self.sigma_r.setObjectName("sigma_r") - self.formLayout.setWidget(6, QtWidgets.QFormLayout.FieldRole, self.sigma_r) - self.tortuosity_label = QtWidgets.QLabel(self.values) + self.formLayout.setWidget(7, QtWidgets.QFormLayout.FieldRole, self.sigma_r) + self.tortuosity_label = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.tortuosity_label.setObjectName("tortuosity_label") - self.formLayout.setWidget(8, QtWidgets.QFormLayout.LabelRole, self.tortuosity_label) - self.tortuosity = QtWidgets.QDoubleSpinBox(self.values) + self.formLayout.setWidget(9, QtWidgets.QFormLayout.LabelRole, self.tortuosity_label) + self.tortuosity = QtWidgets.QDoubleSpinBox(self.scrollAreaWidgetContents) self.tortuosity.setReadOnly(True) self.tortuosity.setButtonSymbols(QtWidgets.QAbstractSpinBox.NoButtons) self.tortuosity.setDecimals(6) self.tortuosity.setMinimum(-999999.0) - self.tortuosity.setMaximum(999999.0) + self.tortuosity.setMaximum(999999.999999) self.tortuosity.setObjectName("tortuosity") - self.formLayout.setWidget(8, QtWidgets.QFormLayout.FieldRole, self.tortuosity) - self.volume_label = QtWidgets.QLabel(self.values) + self.formLayout.setWidget(9, QtWidgets.QFormLayout.FieldRole, self.tortuosity) + self.volume_label = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.volume_label.setObjectName("volume_label") - self.formLayout.setWidget(9, QtWidgets.QFormLayout.LabelRole, self.volume_label) - self.volume = QtWidgets.QDoubleSpinBox(self.values) + self.formLayout.setWidget(10, QtWidgets.QFormLayout.LabelRole, self.volume_label) + self.volume = QtWidgets.QDoubleSpinBox(self.scrollAreaWidgetContents) self.volume.setReadOnly(True) self.volume.setButtonSymbols(QtWidgets.QAbstractSpinBox.NoButtons) self.volume.setDecimals(6) self.volume.setMinimum(-999999.0) - self.volume.setMaximum(999999.0) + self.volume.setMaximum(999999.999999) self.volume.setObjectName("volume") - self.formLayout.setWidget(9, QtWidgets.QFormLayout.FieldRole, self.volume) - self.surface_label = QtWidgets.QLabel(self.values) + self.formLayout.setWidget(10, QtWidgets.QFormLayout.FieldRole, self.volume) + self.surface_label = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.surface_label.setObjectName("surface_label") - self.formLayout.setWidget(10, QtWidgets.QFormLayout.LabelRole, self.surface_label) - self.surface = QtWidgets.QDoubleSpinBox(self.values) + self.formLayout.setWidget(11, QtWidgets.QFormLayout.LabelRole, self.surface_label) + self.surface = QtWidgets.QDoubleSpinBox(self.scrollAreaWidgetContents) self.surface.setReadOnly(True) self.surface.setButtonSymbols(QtWidgets.QAbstractSpinBox.NoButtons) self.surface.setDecimals(6) self.surface.setMinimum(-999999.0) - self.surface.setMaximum(999999.0) + self.surface.setMaximum(999999.999999) self.surface.setObjectName("surface") - self.formLayout.setWidget(10, QtWidgets.QFormLayout.FieldRole, self.surface) - self.mean_r_mean_label = QtWidgets.QLabel(self.values) + self.formLayout.setWidget(11, QtWidgets.QFormLayout.FieldRole, self.surface) + self.mean_r_mean_label = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.mean_r_mean_label.setObjectName("mean_r_mean_label") - self.formLayout.setWidget(11, QtWidgets.QFormLayout.LabelRole, self.mean_r_mean_label) - self.mean_r_mean = QtWidgets.QDoubleSpinBox(self.values) + self.formLayout.setWidget(12, QtWidgets.QFormLayout.LabelRole, self.mean_r_mean_label) + self.mean_r_mean = QtWidgets.QDoubleSpinBox(self.scrollAreaWidgetContents) self.mean_r_mean.setReadOnly(True) self.mean_r_mean.setButtonSymbols(QtWidgets.QAbstractSpinBox.NoButtons) self.mean_r_mean.setDecimals(6) self.mean_r_mean.setMinimum(-999999.0) - self.mean_r_mean.setMaximum(999999.0) + self.mean_r_mean.setMaximum(999999.999999) self.mean_r_mean.setObjectName("mean_r_mean") - self.formLayout.setWidget(11, QtWidgets.QFormLayout.FieldRole, self.mean_r_mean) - self.sigma_r_mean_label = QtWidgets.QLabel(self.values) + self.formLayout.setWidget(12, QtWidgets.QFormLayout.FieldRole, self.mean_r_mean) + self.sigma_r_mean_label = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.sigma_r_mean_label.setObjectName("sigma_r_mean_label") - self.formLayout.setWidget(12, QtWidgets.QFormLayout.LabelRole, self.sigma_r_mean_label) - self.sigma_r_mean = QtWidgets.QDoubleSpinBox(self.values) + self.formLayout.setWidget(13, QtWidgets.QFormLayout.LabelRole, self.sigma_r_mean_label) + self.sigma_r_mean = QtWidgets.QDoubleSpinBox(self.scrollAreaWidgetContents) self.sigma_r_mean.setReadOnly(True) self.sigma_r_mean.setButtonSymbols(QtWidgets.QAbstractSpinBox.NoButtons) self.sigma_r_mean.setDecimals(6) self.sigma_r_mean.setMinimum(-999999.0) - self.sigma_r_mean.setMaximum(999999.0) + self.sigma_r_mean.setMaximum(999999.999999) self.sigma_r_mean.setObjectName("sigma_r_mean") - self.formLayout.setWidget(12, QtWidgets.QFormLayout.FieldRole, self.sigma_r_mean) - self.sigma_r_tot_label = QtWidgets.QLabel(self.values) + self.formLayout.setWidget(13, QtWidgets.QFormLayout.FieldRole, self.sigma_r_mean) + self.sigma_r_tot_label = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.sigma_r_tot_label.setObjectName("sigma_r_tot_label") - self.formLayout.setWidget(13, QtWidgets.QFormLayout.LabelRole, self.sigma_r_tot_label) - self.sigma_r_tot = QtWidgets.QDoubleSpinBox(self.values) + self.formLayout.setWidget(14, QtWidgets.QFormLayout.LabelRole, self.sigma_r_tot_label) + self.sigma_r_tot = QtWidgets.QDoubleSpinBox(self.scrollAreaWidgetContents) self.sigma_r_tot.setReadOnly(True) self.sigma_r_tot.setButtonSymbols(QtWidgets.QAbstractSpinBox.NoButtons) self.sigma_r_tot.setDecimals(6) self.sigma_r_tot.setMinimum(-999999.0) - self.sigma_r_tot.setMaximum(999999.0) + self.sigma_r_tot.setMaximum(999999.999999) self.sigma_r_tot.setObjectName("sigma_r_tot") - self.formLayout.setWidget(13, QtWidgets.QFormLayout.FieldRole, self.sigma_r_tot) - self.MI_p_label = QtWidgets.QLabel(self.values) + self.formLayout.setWidget(14, QtWidgets.QFormLayout.FieldRole, self.sigma_r_tot) + self.MI_p_label = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.MI_p_label.setObjectName("MI_p_label") - self.formLayout.setWidget(14, QtWidgets.QFormLayout.LabelRole, self.MI_p_label) - self.MI_p = QtWidgets.QDoubleSpinBox(self.values) + self.formLayout.setWidget(15, QtWidgets.QFormLayout.LabelRole, self.MI_p_label) + self.MI_p = QtWidgets.QDoubleSpinBox(self.scrollAreaWidgetContents) self.MI_p.setReadOnly(True) self.MI_p.setButtonSymbols(QtWidgets.QAbstractSpinBox.NoButtons) self.MI_p.setDecimals(6) self.MI_p.setMinimum(-999999.0) - self.MI_p.setMaximum(999999.0) + self.MI_p.setMaximum(999999.999999) self.MI_p.setObjectName("MI_p") - self.formLayout.setWidget(14, QtWidgets.QFormLayout.FieldRole, self.MI_p) - self.MI_l_label = QtWidgets.QLabel(self.values) + self.formLayout.setWidget(15, QtWidgets.QFormLayout.FieldRole, self.MI_p) + self.MI_l_label = QtWidgets.QLabel(self.scrollAreaWidgetContents) self.MI_l_label.setObjectName("MI_l_label") - self.formLayout.setWidget(15, QtWidgets.QFormLayout.LabelRole, self.MI_l_label) - self.MI_l = QtWidgets.QDoubleSpinBox(self.values) + self.formLayout.setWidget(16, QtWidgets.QFormLayout.LabelRole, self.MI_l_label) + self.MI_l = QtWidgets.QDoubleSpinBox(self.scrollAreaWidgetContents) self.MI_l.setReadOnly(True) self.MI_l.setButtonSymbols(QtWidgets.QAbstractSpinBox.NoButtons) self.MI_l.setDecimals(6) - self.MI_l.setMinimum(-999999.0) - self.MI_l.setMaximum(999999.0) + self.MI_l.setMinimum(-999999.999999) + self.MI_l.setMaximum(999999.999999) self.MI_l.setObjectName("MI_l") - self.formLayout.setWidget(15, QtWidgets.QFormLayout.FieldRole, self.MI_l) - self.line = QtWidgets.QFrame(self.values) + self.formLayout.setWidget(16, QtWidgets.QFormLayout.FieldRole, self.MI_l) + self.line = QtWidgets.QFrame(self.scrollAreaWidgetContents) self.line.setFrameShape(QtWidgets.QFrame.HLine) self.line.setFrameShadow(QtWidgets.QFrame.Sunken) self.line.setObjectName("line") - self.formLayout.setWidget(7, QtWidgets.QFormLayout.FieldRole, self.line) - self.export_advanced_metrics = QtWidgets.QPushButton(self.values) + self.formLayout.setWidget(8, QtWidgets.QFormLayout.FieldRole, self.line) + self.R_h_label = QtWidgets.QLabel(self.scrollAreaWidgetContents) + self.R_h_label.setObjectName("R_h_label") + self.formLayout.setWidget(23, QtWidgets.QFormLayout.LabelRole, self.R_h_label) + self.R_h = QtWidgets.QDoubleSpinBox(self.scrollAreaWidgetContents) + self.R_h.setReadOnly(True) + self.R_h.setButtonSymbols(QtWidgets.QAbstractSpinBox.NoButtons) + self.R_h.setDecimals(6) + self.R_h.setMinimum(-999999.0) + self.R_h.setMaximum(999999.999999) + self.R_h.setObjectName("R_h") + self.formLayout.setWidget(23, QtWidgets.QFormLayout.FieldRole, self.R_h) + self.HI_label = QtWidgets.QLabel(self.scrollAreaWidgetContents) + self.HI_label.setObjectName("HI_label") + self.formLayout.setWidget(24, QtWidgets.QFormLayout.LabelRole, self.HI_label) + self.HI = QtWidgets.QDoubleSpinBox(self.scrollAreaWidgetContents) + self.HI.setReadOnly(True) + self.HI.setButtonSymbols(QtWidgets.QAbstractSpinBox.NoButtons) + self.HI.setDecimals(6) + self.HI.setMinimum(-999999.0) + self.HI.setMaximum(999999.999999) + self.HI.setObjectName("HI") + self.formLayout.setWidget(24, QtWidgets.QFormLayout.FieldRole, self.HI) + self.MI_mR_label = QtWidgets.QLabel(self.scrollAreaWidgetContents) + self.MI_mR_label.setObjectName("MI_mR_label") + self.formLayout.setWidget(17, QtWidgets.QFormLayout.LabelRole, self.MI_mR_label) + self.MI_mR = QtWidgets.QDoubleSpinBox(self.scrollAreaWidgetContents) + self.MI_mR.setReadOnly(True) + self.MI_mR.setButtonSymbols(QtWidgets.QAbstractSpinBox.NoButtons) + self.MI_mR.setDecimals(6) + self.MI_mR.setMinimum(-999999.999999) + self.MI_mR.setMaximum(999999.999999) + self.MI_mR.setObjectName("MI_mR") + self.formLayout.setWidget(17, QtWidgets.QFormLayout.FieldRole, self.MI_mR) + self.MI_mH_label = QtWidgets.QLabel(self.scrollAreaWidgetContents) + self.MI_mH_label.setObjectName("MI_mH_label") + self.formLayout.setWidget(18, QtWidgets.QFormLayout.LabelRole, self.MI_mH_label) + self.MI_mH = QtWidgets.QDoubleSpinBox(self.scrollAreaWidgetContents) + self.MI_mH.setReadOnly(True) + self.MI_mH.setButtonSymbols(QtWidgets.QAbstractSpinBox.NoButtons) + self.MI_mH.setDecimals(6) + self.MI_mH.setMinimum(-999999.999999) + self.MI_mH.setMaximum(999999.999999) + self.MI_mH.setObjectName("MI_mH") + self.formLayout.setWidget(18, QtWidgets.QFormLayout.FieldRole, self.MI_mH) + self.MI_mR_in_label = QtWidgets.QLabel(self.scrollAreaWidgetContents) + self.MI_mR_in_label.setObjectName("MI_mR_in_label") + self.formLayout.setWidget(19, QtWidgets.QFormLayout.LabelRole, self.MI_mR_in_label) + self.MI_mR_in = QtWidgets.QDoubleSpinBox(self.scrollAreaWidgetContents) + self.MI_mR_in.setReadOnly(True) + self.MI_mR_in.setButtonSymbols(QtWidgets.QAbstractSpinBox.NoButtons) + self.MI_mR_in.setDecimals(6) + self.MI_mR_in.setMinimum(-999999.999999) + self.MI_mR_in.setMaximum(999999.999999) + self.MI_mR_in.setObjectName("MI_mR_in") + self.formLayout.setWidget(19, QtWidgets.QFormLayout.FieldRole, self.MI_mR_in) + self.R_V_scan_label = QtWidgets.QLabel(self.scrollAreaWidgetContents) + self.R_V_scan_label.setObjectName("R_V_scan_label") + self.formLayout.setWidget(21, QtWidgets.QFormLayout.LabelRole, self.R_V_scan_label) + self.R_V_scan = QtWidgets.QDoubleSpinBox(self.scrollAreaWidgetContents) + self.R_V_scan.setReadOnly(True) + self.R_V_scan.setButtonSymbols(QtWidgets.QAbstractSpinBox.NoButtons) + self.R_V_scan.setDecimals(6) + self.R_V_scan.setMinimum(-999999.999999) + self.R_V_scan.setMaximum(999999.999999) + self.R_V_scan.setObjectName("R_V_scan") + self.formLayout.setWidget(21, QtWidgets.QFormLayout.FieldRole, self.R_V_scan) + self.S_V_scan_label = QtWidgets.QLabel(self.scrollAreaWidgetContents) + self.S_V_scan_label.setObjectName("S_V_scan_label") + self.formLayout.setWidget(22, QtWidgets.QFormLayout.LabelRole, self.S_V_scan_label) + self.S_V_scan = QtWidgets.QDoubleSpinBox(self.scrollAreaWidgetContents) + self.S_V_scan.setReadOnly(True) + self.S_V_scan.setButtonSymbols(QtWidgets.QAbstractSpinBox.NoButtons) + self.S_V_scan.setDecimals(6) + self.S_V_scan.setMinimum(-999999.999999) + self.S_V_scan.setMaximum(999999.999999) + self.S_V_scan.setObjectName("S_V_scan") + self.formLayout.setWidget(22, QtWidgets.QFormLayout.FieldRole, self.S_V_scan) + self.V_scan_label = QtWidgets.QLabel(self.scrollAreaWidgetContents) + self.V_scan_label.setObjectName("V_scan_label") + self.formLayout.setWidget(20, QtWidgets.QFormLayout.LabelRole, self.V_scan_label) + self.V_scan = QtWidgets.QDoubleSpinBox(self.scrollAreaWidgetContents) + self.V_scan.setDecimals(6) + self.V_scan.setMinimum(-999999.999999) + self.V_scan.setMaximum(999999.999999) + self.V_scan.setObjectName("V_scan") + self.formLayout.setWidget(20, QtWidgets.QFormLayout.FieldRole, self.V_scan) + self.gridLayout_16.addLayout(self.formLayout, 0, 0, 1, 1) + self.export_advanced_metrics = QtWidgets.QPushButton(self.scrollAreaWidgetContents) self.export_advanced_metrics.setObjectName("export_advanced_metrics") - self.formLayout.setWidget(16, QtWidgets.QFormLayout.LabelRole, self.export_advanced_metrics) - self.gridLayout_15.addLayout(self.formLayout, 0, 0, 1, 1) + self.gridLayout_16.addWidget(self.export_advanced_metrics, 1, 0, 1, 1) + self.scrollArea.setWidget(self.scrollAreaWidgetContents) + self.gridLayout_15.addWidget(self.scrollArea, 0, 0, 1, 1) self.SettingsTab.addTab(self.values, "") self.gridLayout_2.addWidget(self.SettingsTab, 1, 0, 1, 1) self.horizontalLayout_4.addWidget(self.MainSettings) @@ -507,6 +611,7 @@ class Ui_MainWindow(object): self.label.setText(_translate("MainWindow", "Nombre de graphes :")) self.start_analyse_button.setText(_translate("MainWindow", "Analyser le fichier")) self.SettingsTab.setTabText(self.SettingsTab.indexOf(self.parameters), _translate("MainWindow", "Parametres")) + self.refresh_morphological_indicators.setText(_translate("MainWindow", "Recalculer les indicateurs morphologiques")) self.layer_label.setText(_translate("MainWindow", "Numero de la couche a traiter :")) self.interval_size_label.setText(_translate("MainWindow", "Taille de l\'intervale")) self.x_mean_label.setText(_translate("MainWindow", "X moyen")) @@ -515,13 +620,21 @@ class Ui_MainWindow(object): self.r_mean_label.setText(_translate("MainWindow", "Rayon moyen")) self.sigma_r_label.setText(_translate("MainWindow", "Ecart type des rayons (σR)")) self.tortuosity_label.setText(_translate("MainWindow", "Tortuosité")) - self.volume_label.setText(_translate("MainWindow", "Volume en mm3")) - self.surface_label.setText(_translate("MainWindow", "Surface en mm2")) - self.mean_r_mean_label.setText(_translate("MainWindow", "Moyenne des rayons moyens ()")) - self.sigma_r_mean_label.setText(_translate("MainWindow", "Ecart type des rayons moyens(σ)")) - self.sigma_r_tot_label.setText(_translate("MainWindow", "σtot")) + self.volume_label.setText(_translate("MainWindow", "Volume en mm³")) + self.surface_label.setText(_translate("MainWindow", "Surface en mm²")) + self.mean_r_mean_label.setText(_translate("MainWindow", "Moyenne des rayons moyens 〈R〉")) + self.sigma_r_mean_label.setText(_translate("MainWindow", "Ecart type des rayons moyens σ〈R〉")) + self.sigma_r_tot_label.setText(_translate("MainWindow", "σ〈R〉^tot")) self.MI_p_label.setText(_translate("MainWindow", "MI_p")) self.MI_l_label.setText(_translate("MainWindow", "MI_l")) + self.R_h_label.setText(_translate("MainWindow", "Rayon hydraulique R_h")) + self.HI_label.setText(_translate("MainWindow", "HI")) + self.MI_mR_label.setText(_translate("MainWindow", "MI_mR")) + self.MI_mH_label.setText(_translate("MainWindow", "MI_mH")) + self.MI_mR_in_label.setText(_translate("MainWindow", "MI_mR_in")) + self.R_V_scan_label.setText(_translate("MainWindow", "R_V_scan")) + self.S_V_scan_label.setText(_translate("MainWindow", "S_V_scan")) + self.V_scan_label.setText(_translate("MainWindow", "V_scan")) self.export_advanced_metrics.setText(_translate("MainWindow", "Exporter les variables")) self.SettingsTab.setTabText(self.SettingsTab.indexOf(self.values), _translate("MainWindow", "Valeurs")) self.GraphTabs.setTabText(self.GraphTabs.indexOf(self.graph_pane_1), _translate("MainWindow", "1"))