diff --git a/utils/gui/pyqt/main_window/MainWindow.ui b/utils/gui/pyqt/main_window/MainWindow.ui
index 4067727..fd30d8b 100644
--- a/utils/gui/pyqt/main_window/MainWindow.ui
+++ b/utils/gui/pyqt/main_window/MainWindow.ui
@@ -24,8 +24,8 @@
- 331
- 0
+ 518
+ 794
@@ -35,137 +35,543 @@
- -
-
-
-
-
-
-
-
-
- Chemin du fichier .obj
-
-
-
- -
-
-
- Choisir le fichier
-
-
+
-
+
+
+ 0
+
+
+
+ Parametres
+
+
+
-
+
+
-
+
+
-
+
+
+ Chemin du fichier .obj
+
+
+
+ -
+
+
+ Choisir le fichier
+
+
+
+
+
+ -
+
+
+ -
+
+
-
+
+
+ Repertoire de sortie
+
+
+
+ -
+
+
+ Choisir le repertoire
+
+
+
+
+
+ -
+
+
+ -
+
+
-
+
+
+ Préfix du fichier de sortie
+
+
+
+ -
+
+
+
+
+ -
+
+
+ Discretisation (en mm)
+
+
+
+ -
+
+
+ 0.000000000000000
+
+
+ 1.000000000000000
+
+
+
+ -
+
+
+ 0
+
+
+
+ -
+
+
-
+
+
+ afficher les graphes
+
+
+ true
+
+
+
+ -
+
+
+ Nombre de graphes :
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+ true
+
+
+ QAbstractSpinBox::NoButtons
+
+
+
+
+
+ -
+
+
+ Analyser le fichier
+
+
+
+ -
+
+
+ true
+
+
+
+
-
- -
-
-
- -
-
-
-
-
-
- Repertoire de sortie
-
-
-
- -
-
-
- Choisir le repertoire
-
-
+
+
+
+ Valeurs
+
+
+
-
+
+
-
+
+
+ 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
+
+
+
+ -
+
+
+ true
+
+
+ QAbstractSpinBox::NoButtons
+
+
+ 6
+
+
+ -999999.000000000000000
+
+
+ 999999.000000000000000
+
+
+
+ -
+
+
+ Surface
+
+
+
+ -
+
+
+ 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
+
+
+
+
-
- -
-
-
- -
-
-
-
-
-
- Préfix du fichier de sortie
-
-
-
- -
-
-
-
-
- -
-
-
- Discretisation (en mm)
-
-
-
- -
-
-
- 0.000000000000000
-
-
- 1.000000000000000
-
-
-
- -
-
-
- 0
-
-
-
- -
-
-
-
-
-
- afficher les graphes
-
-
- true
-
-
-
- -
-
-
- Nombre de graphes :
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- true
-
-
- QAbstractSpinBox::NoButtons
-
-
-
-
-
- -
-
-
- Analyser le fichier
-
-
-
- -
-
-
- true
-
-
-
-
+
+
@@ -182,23 +588,13 @@
- -
-
-
- Numero de la couche a afficher :
-
-
- Qt::AlignCenter
-
-
-
-
-
+
true
- 1
+ 0
@@ -431,9 +827,6 @@
- -
-
-
diff --git a/utils/gui/pyqt/main_window/UI_MainWindow.py b/utils/gui/pyqt/main_window/UI_MainWindow.py
index 6f65175..8362cd7 100644
--- a/utils/gui/pyqt/main_window/UI_MainWindow.py
+++ b/utils/gui/pyqt/main_window/UI_MainWindow.py
@@ -23,82 +23,263 @@ class Ui_MainWindow(object):
self.horizontalLayout_4.setObjectName("horizontalLayout_4")
self.MainSettings = QtWidgets.QWidget(self.centralwidget)
self.MainSettings.setEnabled(True)
- self.MainSettings.setMinimumSize(QtCore.QSize(331, 0))
+ self.MainSettings.setMinimumSize(QtCore.QSize(518, 794))
self.MainSettings.setMaximumSize(QtCore.QSize(518, 16777215))
self.MainSettings.setObjectName("MainSettings")
self.gridLayout_2 = QtWidgets.QGridLayout(self.MainSettings)
self.gridLayout_2.setObjectName("gridLayout_2")
+ self.SettingsTab = QtWidgets.QTabWidget(self.MainSettings)
+ self.SettingsTab.setObjectName("SettingsTab")
+ self.tab_5 = QtWidgets.QWidget()
+ self.tab_5.setObjectName("tab_5")
+ self.gridLayout_14 = QtWidgets.QGridLayout(self.tab_5)
+ self.gridLayout_14.setObjectName("gridLayout_14")
self.MainSettingsLayout = QtWidgets.QVBoxLayout()
self.MainSettingsLayout.setObjectName("MainSettingsLayout")
self.horizontalLayout = QtWidgets.QHBoxLayout()
self.horizontalLayout.setObjectName("horizontalLayout")
- self.input_file_label = QtWidgets.QLabel(self.MainSettings)
+ self.input_file_label = QtWidgets.QLabel(self.tab_5)
self.input_file_label.setObjectName("input_file_label")
self.horizontalLayout.addWidget(self.input_file_label)
- self.input_file_choose_btn = QtWidgets.QPushButton(self.MainSettings)
+ self.input_file_choose_btn = QtWidgets.QPushButton(self.tab_5)
self.input_file_choose_btn.setObjectName("input_file_choose_btn")
self.horizontalLayout.addWidget(self.input_file_choose_btn)
self.MainSettingsLayout.addLayout(self.horizontalLayout)
- self.input_file_path = QtWidgets.QPlainTextEdit(self.MainSettings)
+ self.input_file_path = QtWidgets.QPlainTextEdit(self.tab_5)
self.input_file_path.setObjectName("input_file_path")
self.MainSettingsLayout.addWidget(self.input_file_path)
self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
self.horizontalLayout_2.setObjectName("horizontalLayout_2")
- self.output_folder_label = QtWidgets.QLabel(self.MainSettings)
+ self.output_folder_label = QtWidgets.QLabel(self.tab_5)
self.output_folder_label.setObjectName("output_folder_label")
self.horizontalLayout_2.addWidget(self.output_folder_label)
- self.output_folder_choose_btn = QtWidgets.QPushButton(self.MainSettings)
+ self.output_folder_choose_btn = QtWidgets.QPushButton(self.tab_5)
self.output_folder_choose_btn.setObjectName("output_folder_choose_btn")
self.horizontalLayout_2.addWidget(self.output_folder_choose_btn)
self.MainSettingsLayout.addLayout(self.horizontalLayout_2)
- self.output_folder_path = QtWidgets.QPlainTextEdit(self.MainSettings)
+ self.output_folder_path = QtWidgets.QPlainTextEdit(self.tab_5)
self.output_folder_path.setObjectName("output_folder_path")
self.MainSettingsLayout.addWidget(self.output_folder_path)
self.horizontalLayout_3 = QtWidgets.QHBoxLayout()
self.horizontalLayout_3.setObjectName("horizontalLayout_3")
- self.output_file_prefix_label = QtWidgets.QLabel(self.MainSettings)
+ self.output_file_prefix_label = QtWidgets.QLabel(self.tab_5)
self.output_file_prefix_label.setObjectName("output_file_prefix_label")
self.horizontalLayout_3.addWidget(self.output_file_prefix_label)
- self.output_file_prefix = QtWidgets.QLineEdit(self.MainSettings)
+ self.output_file_prefix = QtWidgets.QLineEdit(self.tab_5)
self.output_file_prefix.setObjectName("output_file_prefix")
self.horizontalLayout_3.addWidget(self.output_file_prefix)
self.MainSettingsLayout.addLayout(self.horizontalLayout_3)
- self.discretisation_label = QtWidgets.QLabel(self.MainSettings)
+ self.discretisation_label = QtWidgets.QLabel(self.tab_5)
self.discretisation_label.setObjectName("discretisation_label")
self.MainSettingsLayout.addWidget(self.discretisation_label, 0, QtCore.Qt.AlignHCenter)
- self.discretisation_value_selector = QtWidgets.QDoubleSpinBox(self.MainSettings)
+ self.discretisation_value_selector = QtWidgets.QDoubleSpinBox(self.tab_5)
self.discretisation_value_selector.setMinimum(0.0)
self.discretisation_value_selector.setProperty("value", 1.0)
self.discretisation_value_selector.setObjectName("discretisation_value_selector")
self.MainSettingsLayout.addWidget(self.discretisation_value_selector)
- self.analyse_progress_bar = QtWidgets.QProgressBar(self.MainSettings)
+ self.analyse_progress_bar = QtWidgets.QProgressBar(self.tab_5)
self.analyse_progress_bar.setProperty("value", 0)
self.analyse_progress_bar.setObjectName("analyse_progress_bar")
self.MainSettingsLayout.addWidget(self.analyse_progress_bar)
self.graphs_params_layout = QtWidgets.QHBoxLayout()
self.graphs_params_layout.setObjectName("graphs_params_layout")
- self.show_graph_checkbox = QtWidgets.QCheckBox(self.MainSettings)
+ self.show_graph_checkbox = QtWidgets.QCheckBox(self.tab_5)
self.show_graph_checkbox.setChecked(True)
self.show_graph_checkbox.setObjectName("show_graph_checkbox")
self.graphs_params_layout.addWidget(self.show_graph_checkbox)
- self.label = QtWidgets.QLabel(self.MainSettings)
+ self.label = QtWidgets.QLabel(self.tab_5)
self.label.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
self.label.setObjectName("label")
self.graphs_params_layout.addWidget(self.label)
- self.graph_nb_spinbox = QtWidgets.QSpinBox(self.MainSettings)
+ self.graph_nb_spinbox = QtWidgets.QSpinBox(self.tab_5)
self.graph_nb_spinbox.setReadOnly(True)
self.graph_nb_spinbox.setButtonSymbols(QtWidgets.QAbstractSpinBox.NoButtons)
self.graph_nb_spinbox.setObjectName("graph_nb_spinbox")
self.graphs_params_layout.addWidget(self.graph_nb_spinbox)
self.MainSettingsLayout.addLayout(self.graphs_params_layout)
- self.start_analyse_button = QtWidgets.QPushButton(self.MainSettings)
+ self.start_analyse_button = QtWidgets.QPushButton(self.tab_5)
self.start_analyse_button.setObjectName("start_analyse_button")
self.MainSettingsLayout.addWidget(self.start_analyse_button)
- self.status_text = QtWidgets.QLineEdit(self.MainSettings)
+ self.status_text = QtWidgets.QLineEdit(self.tab_5)
self.status_text.setReadOnly(True)
self.status_text.setObjectName("status_text")
self.MainSettingsLayout.addWidget(self.status_text)
- self.gridLayout_2.addLayout(self.MainSettingsLayout, 0, 0, 1, 1)
+ self.gridLayout_14.addLayout(self.MainSettingsLayout, 0, 0, 1, 1)
+ self.SettingsTab.addTab(self.tab_5, "")
+ self.tab_6 = QtWidgets.QWidget()
+ self.tab_6.setObjectName("tab_6")
+ self.gridLayout_15 = QtWidgets.QGridLayout(self.tab_6)
+ self.gridLayout_15.setObjectName("gridLayout_15")
+ self.formLayout = QtWidgets.QFormLayout()
+ self.formLayout.setObjectName("formLayout")
+ self.layer_label = QtWidgets.QLabel(self.tab_6)
+ 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.tab_6)
+ self.layer_ComboBox.setObjectName("layer_ComboBox")
+ self.formLayout.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.layer_ComboBox)
+ self.interval_size_label = QtWidgets.QLabel(self.tab_6)
+ 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.tab_6)
+ 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.setObjectName("interval_size")
+ self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.interval_size)
+ self.x_mean_label = QtWidgets.QLabel(self.tab_6)
+ 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.tab_6)
+ 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.setObjectName("x_mean")
+ self.formLayout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.x_mean)
+ self.y_mean_label = QtWidgets.QLabel(self.tab_6)
+ 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.tab_6)
+ 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.setObjectName("y_mean")
+ self.formLayout.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.y_mean)
+ self.z_mean_label = QtWidgets.QLabel(self.tab_6)
+ 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.tab_6)
+ 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.setObjectName("z_mean")
+ self.formLayout.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.z_mean)
+ self.r_mean_label = QtWidgets.QLabel(self.tab_6)
+ 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.tab_6)
+ 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.setObjectName("r_mean")
+ self.formLayout.setWidget(5, QtWidgets.QFormLayout.FieldRole, self.r_mean)
+ self.sigma_r_label = QtWidgets.QLabel(self.tab_6)
+ 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.tab_6)
+ 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.setObjectName("sigma_r")
+ self.formLayout.setWidget(6, QtWidgets.QFormLayout.FieldRole, self.sigma_r)
+ self.tortuosity_label = QtWidgets.QLabel(self.tab_6)
+ self.tortuosity_label.setObjectName("tortuosity_label")
+ self.formLayout.setWidget(8, QtWidgets.QFormLayout.LabelRole, self.tortuosity_label)
+ self.tortuosity = QtWidgets.QDoubleSpinBox(self.tab_6)
+ 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.setObjectName("tortuosity")
+ self.formLayout.setWidget(8, QtWidgets.QFormLayout.FieldRole, self.tortuosity)
+ self.volume_label = QtWidgets.QLabel(self.tab_6)
+ self.volume_label.setObjectName("volume_label")
+ self.formLayout.setWidget(9, QtWidgets.QFormLayout.LabelRole, self.volume_label)
+ self.volume = QtWidgets.QDoubleSpinBox(self.tab_6)
+ 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.setObjectName("volume")
+ self.formLayout.setWidget(9, QtWidgets.QFormLayout.FieldRole, self.volume)
+ self.surface_label = QtWidgets.QLabel(self.tab_6)
+ self.surface_label.setObjectName("surface_label")
+ self.formLayout.setWidget(10, QtWidgets.QFormLayout.LabelRole, self.surface_label)
+ self.surface = QtWidgets.QDoubleSpinBox(self.tab_6)
+ 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.setObjectName("surface")
+ self.formLayout.setWidget(10, QtWidgets.QFormLayout.FieldRole, self.surface)
+ self.mean_r_mean_label = QtWidgets.QLabel(self.tab_6)
+ 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.tab_6)
+ 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.setObjectName("mean_r_mean")
+ self.formLayout.setWidget(11, QtWidgets.QFormLayout.FieldRole, self.mean_r_mean)
+ self.sigma_r_mean_label = QtWidgets.QLabel(self.tab_6)
+ 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.tab_6)
+ 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.setObjectName("sigma_r_mean")
+ self.formLayout.setWidget(12, QtWidgets.QFormLayout.FieldRole, self.sigma_r_mean)
+ self.sigma_r_tot_label = QtWidgets.QLabel(self.tab_6)
+ 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.tab_6)
+ 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.setObjectName("sigma_r_tot")
+ self.formLayout.setWidget(13, QtWidgets.QFormLayout.FieldRole, self.sigma_r_tot)
+ self.MI_p_label = QtWidgets.QLabel(self.tab_6)
+ 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.tab_6)
+ 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.setObjectName("MI_p")
+ self.formLayout.setWidget(14, QtWidgets.QFormLayout.FieldRole, self.MI_p)
+ self.MI_l_label = QtWidgets.QLabel(self.tab_6)
+ 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.tab_6)
+ 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.setObjectName("MI_l")
+ self.formLayout.setWidget(15, QtWidgets.QFormLayout.FieldRole, self.MI_l)
+ self.line = QtWidgets.QFrame(self.tab_6)
+ 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.gridLayout_15.addLayout(self.formLayout, 0, 0, 1, 1)
+ self.SettingsTab.addTab(self.tab_6, "")
+ self.gridLayout_2.addWidget(self.SettingsTab, 1, 0, 1, 1)
self.horizontalLayout_4.addWidget(self.MainSettings)
self.Graphs = QtWidgets.QWidget(self.centralwidget)
self.Graphs.setEnabled(True)
@@ -106,13 +287,9 @@ class Ui_MainWindow(object):
self.Graphs.setObjectName("Graphs")
self.gridLayout_3 = QtWidgets.QGridLayout(self.Graphs)
self.gridLayout_3.setObjectName("gridLayout_3")
- self.layer_label = QtWidgets.QLabel(self.Graphs)
- self.layer_label.setAlignment(QtCore.Qt.AlignCenter)
- self.layer_label.setObjectName("layer_label")
- self.gridLayout_3.addWidget(self.layer_label, 0, 0, 1, 1)
- self.tabWidget = QtWidgets.QTabWidget(self.Graphs)
- self.tabWidget.setEnabled(True)
- self.tabWidget.setObjectName("tabWidget")
+ self.GraphTabs = QtWidgets.QTabWidget(self.Graphs)
+ self.GraphTabs.setEnabled(True)
+ self.GraphTabs.setObjectName("GraphTabs")
self.tab = QtWidgets.QWidget()
self.tab.setEnabled(True)
self.tab.setObjectName("tab")
@@ -170,7 +347,7 @@ class Ui_MainWindow(object):
self.slot0ComboBox.setObjectName("slot0ComboBox")
self.gridLayout_8.addWidget(self.slot0ComboBox, 0, 0, 1, 1)
self.gridLayout_5.addWidget(self.slot0_frame, 0, 0, 1, 1)
- self.tabWidget.addTab(self.tab, "")
+ self.GraphTabs.addTab(self.tab, "")
self.tab_2 = QtWidgets.QWidget()
self.tab_2.setObjectName("tab_2")
self.gridLayout_13 = QtWidgets.QGridLayout(self.tab_2)
@@ -227,7 +404,7 @@ class Ui_MainWindow(object):
self.slot7ComboBox.setObjectName("slot7ComboBox")
self.gridLayout_20.addWidget(self.slot7ComboBox, 0, 0, 1, 1)
self.gridLayout_13.addWidget(self.slot7_frame, 2, 1, 1, 1)
- self.tabWidget.addTab(self.tab_2, "")
+ self.GraphTabs.addTab(self.tab_2, "")
self.tab_3 = QtWidgets.QWidget()
self.tab_3.setObjectName("tab_3")
self.horizontalLayout_5 = QtWidgets.QHBoxLayout(self.tab_3)
@@ -258,7 +435,7 @@ class Ui_MainWindow(object):
self.slot9.setObjectName("slot9")
self.gridLayout_6.addLayout(self.slot9, 1, 0, 1, 1)
self.horizontalLayout_5.addWidget(self.slot9_frame)
- self.tabWidget.addTab(self.tab_3, "")
+ self.GraphTabs.addTab(self.tab_3, "")
self.tab_4 = QtWidgets.QWidget()
self.tab_4.setObjectName("tab_4")
self.gridLayout_4 = QtWidgets.QGridLayout(self.tab_4)
@@ -276,11 +453,8 @@ class Ui_MainWindow(object):
self.slot10.setObjectName("slot10")
self.gridLayout_9.addLayout(self.slot10, 1, 0, 1, 1)
self.gridLayout_4.addWidget(self.slot10_frame, 0, 0, 1, 1)
- self.tabWidget.addTab(self.tab_4, "")
- self.gridLayout_3.addWidget(self.tabWidget, 2, 0, 1, 1)
- self.layer_ComboBox = QtWidgets.QComboBox(self.Graphs)
- self.layer_ComboBox.setObjectName("layer_ComboBox")
- self.gridLayout_3.addWidget(self.layer_ComboBox, 1, 0, 1, 1)
+ self.GraphTabs.addTab(self.tab_4, "")
+ self.gridLayout_3.addWidget(self.GraphTabs, 2, 0, 1, 1)
self.horizontalLayout_4.addWidget(self.Graphs)
self.gridLayout.addLayout(self.horizontalLayout_4, 1, 0, 1, 1)
MainWindow.setCentralWidget(self.centralwidget)
@@ -313,7 +487,8 @@ class Ui_MainWindow(object):
self.menuBar.addAction(self.menuA_propos.menuAction())
self.retranslateUi(MainWindow)
- self.tabWidget.setCurrentIndex(1)
+ self.SettingsTab.setCurrentIndex(0)
+ self.GraphTabs.setCurrentIndex(0)
QtCore.QMetaObject.connectSlotsByName(MainWindow)
def retranslateUi(self, MainWindow):
@@ -328,11 +503,27 @@ class Ui_MainWindow(object):
self.show_graph_checkbox.setText(_translate("MainWindow", "afficher les graphes"))
self.label.setText(_translate("MainWindow", "Nombre de graphes :"))
self.start_analyse_button.setText(_translate("MainWindow", "Analyser le fichier"))
- self.layer_label.setText(_translate("MainWindow", "Numero de la couche a afficher :"))
- self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), _translate("MainWindow", "1"))
- self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), _translate("MainWindow", "2"))
- self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_3), _translate("MainWindow", "3"))
- self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_4), _translate("MainWindow", "4"))
+ self.SettingsTab.setTabText(self.SettingsTab.indexOf(self.tab_5), _translate("MainWindow", "Parametres"))
+ 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"))
+ self.y_mean_label.setText(_translate("MainWindow", "Y Moyen"))
+ self.z_mean_label.setText(_translate("MainWindow", "Z Moyen"))
+ 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"))
+ self.surface_label.setText(_translate("MainWindow", "Surface"))
+ 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.MI_p_label.setText(_translate("MainWindow", "MI_p"))
+ self.MI_l_label.setText(_translate("MainWindow", "MI_l"))
+ self.SettingsTab.setTabText(self.SettingsTab.indexOf(self.tab_6), _translate("MainWindow", "Valeurs"))
+ self.GraphTabs.setTabText(self.GraphTabs.indexOf(self.tab), _translate("MainWindow", "1"))
+ self.GraphTabs.setTabText(self.GraphTabs.indexOf(self.tab_2), _translate("MainWindow", "2"))
+ self.GraphTabs.setTabText(self.GraphTabs.indexOf(self.tab_3), _translate("MainWindow", "3"))
+ self.GraphTabs.setTabText(self.GraphTabs.indexOf(self.tab_4), _translate("MainWindow", "4"))
self.menuRichier.setTitle(_translate("MainWindow", "Fichier"))
self.menuA_propos.setTitle(_translate("MainWindow", "A propos"))
self.actionOuvrir_un_fichier.setText(_translate("MainWindow", "Ouvrir un fichier"))