Djalim Simaila
f0de315d30
✨ feat(data_processing.py): add raw_data parameter to get_advanced_data function to improve flexibility The L variable was not being computed in the get_advanced_data function, which is necessary for the calculation of the tortuosity. The raw_data parameter was added to the get_advanced_data function to improve flexibility and allow for more advanced calculations to be performed. 🐛 fix(input.py): add filename attribute to ScannedObject class The filename attribute was not being set in the ScannedObject class, which is necessary for generating the output file headers. ✨ feat(output.py): add function to generate headers for output file The generate_headers function was added to generate the headers for the output file. The headers include the filename, date, version, discretisation method, and whether the data was verticalised. 🚀 chore(MainWindow.py): enable process_advanced_data function 🎨 style(MainWindow.ui, UI_MainWindow.py): adjust GUI layout and label text for better user experience The GUI layout has been adjusted to improve the user experience. The window width has been reduced from 1419 to 1336 pixels to better fit the screen. The minimum and maximum sizes of the MainSettings widget have been increased from 518 to 600 pixels to allow for more space for the labels. The labels have been updated to include the units of measurement to improve clarity. 🐛 fix(AdvancedDataWorker.py): add raw_data parameter to __init__ method ✨ feat(AdvancedDataWorker.py): add support for raw data processing in get_advanced_data method The AdvancedDataWorker class now has a raw_data parameter in its __init__ method, which is used in the get_advanced_data method. This allows for raw data processing in addition to the existing discrete data processing. 🐛 fix(DiscreteDataWorker.py): generate headers before formatting data ✨ feat(DiscreteDataWorker.py): add support for generating headers in output file The DiscreteDataWorker class now generates headers for the output file if the add_headers setting is enabled. The headers are generated before formatting the data to ensure that the headers are included in the output file. 🐛 fix(PreProcessWorker.py): set filename of ScannedObject The PreProcessWorker class now sets the filename of the ScannedObject to the basename 🎨 style(UI_Settings.py): reorganize widgets in the settings UI for better readability 🐛 fix(data_extraction.py): fix standard deviation calculation to use unbiased estimator 🔧 chore(SettingManager.py): add "add_headers" setting with default value of True The changes in UI_Settings.py are purely cosmetic and do not affect the functionality of the code. The fix in data_extraction.py corrects the standard deviation calculation to use the unbiased estimator. The addition of the "add_headers" setting in SettingManager.py allows for the addition of headers to output files.
93 lines
5.4 KiB
Python
93 lines
5.4 KiB
Python
# -*- coding: utf-8 -*-
|
|
|
|
# Form implementation generated from reading ui file 'settings.ui'
|
|
#
|
|
# Created by: PyQt5 UI code generator 5.15.9
|
|
#
|
|
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
|
|
# run again. Do not edit this file unless you know what you are doing.
|
|
|
|
|
|
from PyQt5 import QtCore, QtGui, QtWidgets
|
|
|
|
|
|
class Ui_Settings(object):
|
|
def setupUi(self, Settings):
|
|
Settings.setObjectName("Settings")
|
|
Settings.resize(712, 250)
|
|
self.centralwidget = QtWidgets.QWidget(Settings)
|
|
self.centralwidget.setObjectName("centralwidget")
|
|
self.gridLayout = QtWidgets.QGridLayout(self.centralwidget)
|
|
self.gridLayout.setObjectName("gridLayout")
|
|
self.gridLayout_2 = QtWidgets.QGridLayout()
|
|
self.gridLayout_2.setObjectName("gridLayout_2")
|
|
self.extention = QtWidgets.QLineEdit(self.centralwidget)
|
|
self.extention.setObjectName("extention")
|
|
self.gridLayout_2.addWidget(self.extention, 4, 1, 1, 1)
|
|
self.raw_data_suffix_label = QtWidgets.QLabel(self.centralwidget)
|
|
self.raw_data_suffix_label.setObjectName("raw_data_suffix_label")
|
|
self.gridLayout_2.addWidget(self.raw_data_suffix_label, 2, 0, 1, 1)
|
|
self.prettify_label = QtWidgets.QLabel(self.centralwidget)
|
|
self.prettify_label.setObjectName("prettify_label")
|
|
self.gridLayout_2.addWidget(self.prettify_label, 6, 0, 1, 1)
|
|
self.discrete_data_suffix = QtWidgets.QLineEdit(self.centralwidget)
|
|
self.discrete_data_suffix.setObjectName("discrete_data_suffix")
|
|
self.gridLayout_2.addWidget(self.discrete_data_suffix, 3, 1, 1, 1)
|
|
self.separator = QtWidgets.QLineEdit(self.centralwidget)
|
|
self.separator.setObjectName("separator")
|
|
self.gridLayout_2.addWidget(self.separator, 5, 1, 1, 1)
|
|
self.should_verticalise_label = QtWidgets.QLabel(self.centralwidget)
|
|
self.should_verticalise_label.setObjectName("should_verticalise_label")
|
|
self.gridLayout_2.addWidget(self.should_verticalise_label, 1, 0, 1, 1)
|
|
self.should_verticalise = QtWidgets.QCheckBox(self.centralwidget)
|
|
self.should_verticalise.setText("")
|
|
self.should_verticalise.setObjectName("should_verticalise")
|
|
self.gridLayout_2.addWidget(self.should_verticalise, 1, 1, 1, 1)
|
|
self.prettify = QtWidgets.QCheckBox(self.centralwidget)
|
|
self.prettify.setText("")
|
|
self.prettify.setObjectName("prettify")
|
|
self.gridLayout_2.addWidget(self.prettify, 6, 1, 1, 1)
|
|
self.extention_label = QtWidgets.QLabel(self.centralwidget)
|
|
self.extention_label.setObjectName("extention_label")
|
|
self.gridLayout_2.addWidget(self.extention_label, 4, 0, 1, 1)
|
|
self.discrete_data_suffix_label = QtWidgets.QLabel(self.centralwidget)
|
|
self.discrete_data_suffix_label.setObjectName("discrete_data_suffix_label")
|
|
self.gridLayout_2.addWidget(self.discrete_data_suffix_label, 3, 0, 1, 1)
|
|
self.separator_label = QtWidgets.QLabel(self.centralwidget)
|
|
self.separator_label.setObjectName("separator_label")
|
|
self.gridLayout_2.addWidget(self.separator_label, 5, 0, 1, 1)
|
|
self.discretisation_method_label = QtWidgets.QLabel(self.centralwidget)
|
|
self.discretisation_method_label.setObjectName("discretisation_method_label")
|
|
self.gridLayout_2.addWidget(self.discretisation_method_label, 0, 0, 1, 1)
|
|
self.raw_data_suffix = QtWidgets.QLineEdit(self.centralwidget)
|
|
self.raw_data_suffix.setObjectName("raw_data_suffix")
|
|
self.gridLayout_2.addWidget(self.raw_data_suffix, 2, 1, 1, 1)
|
|
self.discretisation_method = QtWidgets.QComboBox(self.centralwidget)
|
|
self.discretisation_method.setObjectName("discretisation_method")
|
|
self.gridLayout_2.addWidget(self.discretisation_method, 0, 1, 1, 1)
|
|
self.add_headers_label = QtWidgets.QLabel(self.centralwidget)
|
|
self.add_headers_label.setObjectName("add_headers_label")
|
|
self.gridLayout_2.addWidget(self.add_headers_label, 7, 0, 1, 1)
|
|
self.add_headers = QtWidgets.QCheckBox(self.centralwidget)
|
|
self.add_headers.setText("")
|
|
self.add_headers.setChecked(True)
|
|
self.add_headers.setObjectName("add_headers")
|
|
self.gridLayout_2.addWidget(self.add_headers, 7, 1, 1, 1)
|
|
self.gridLayout.addLayout(self.gridLayout_2, 0, 0, 1, 1)
|
|
Settings.setCentralWidget(self.centralwidget)
|
|
|
|
self.retranslateUi(Settings)
|
|
QtCore.QMetaObject.connectSlotsByName(Settings)
|
|
|
|
def retranslateUi(self, Settings):
|
|
_translate = QtCore.QCoreApplication.translate
|
|
Settings.setWindowTitle(_translate("Settings", "Préférences"))
|
|
self.raw_data_suffix_label.setText(_translate("Settings", "Suffixe des fichiers de données brutes"))
|
|
self.prettify_label.setText(_translate("Settings", "Aligner les colones"))
|
|
self.should_verticalise_label.setText(_translate("Settings", "Mettre l\'objet droit"))
|
|
self.extention_label.setText(_translate("Settings", "Extensions des fichiers de sorties"))
|
|
self.discrete_data_suffix_label.setText(_translate("Settings", "Suffixe des fichiers de données discretisées"))
|
|
self.separator_label.setText(_translate("Settings", "Separateur de colone"))
|
|
self.discretisation_method_label.setText(_translate("Settings", "Methode de discretisation"))
|
|
self.add_headers_label.setText(_translate("Settings", "Ajouter des en-têtes"))
|