diff --git a/utils/files/output.py b/utils/files/output.py index ec1f1aba7adaff5a6592cb7c24cd01edcc9d06a5..9f0ca90f81671b41210ec6323561938085fc5535 100644 --- a/utils/files/output.py +++ b/utils/files/output.py @@ -28,11 +28,11 @@ def format_data(data:dict, separator:str, selected_columns:list = None) -> str: if selected_columns is None: selected_columns = list(data.keys()) for column_name in selected_columns: - output += column_name + separator + output += column_name.ljust(len(column_name) if len(column_name) > 8 else 9 ) + separator output += '\n' for i in range(len(data[selected_columns[0]])): for column in selected_columns: - output += str(data[column][i]).ljust(len(column) if len(column) > 6 else 7 ) + separator + output += str(data[column][i]).ljust(len(column) if len(column) > 8 else 9 ) + separator output += '\n' return output diff --git a/utils/gui/pyqt/main_window/MainWindow.py b/utils/gui/pyqt/main_window/MainWindow.py index 108289276f2e830a9e970a47153309a522d8f247..a0b189ca1e3823f622276c335f897f0254fd6734 100644 --- a/utils/gui/pyqt/main_window/MainWindow.py +++ b/utils/gui/pyqt/main_window/MainWindow.py @@ -84,9 +84,12 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow): """ Show the graph """ + if not self.show_graph_checkbox.checked: + return self.slot0.addWidget(Mesh3DCanvas(obj).canvas.native) self.slot1.addWidget(CrossSection2DCanvas(obj.get_x(),obj.get_z(),"Coupe X").canvas.native) self.slot2.addWidget(CrossSection2DCanvas(obj.get_y(),obj.get_z(),"Coupe Y").canvas.native) + def finish_analyse(self): """ Finish the analyse diff --git a/utils/gui/pyqt/main_window/MainWindow.ui b/utils/gui/pyqt/main_window/MainWindow.ui index fe46fcbf971628fac903c36e9cb5d02a8c46b1ac..993ea64f7568fda3b75047cca69dbcd4e6acf8f0 100644 --- a/utils/gui/pyqt/main_window/MainWindow.ui +++ b/utils/gui/pyqt/main_window/MainWindow.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>1067</width> - <height>517</height> + <width>1419</width> + <height>842</height> </rect> </property> <property name="windowTitle"> diff --git a/utils/gui/pyqt/main_window/UI_MainWindow.py b/utils/gui/pyqt/main_window/UI_MainWindow.py index a65805508e16999be2cdf90d2341ff410dc8bb81..20ea7f0a616f8f457248e09311cced5612834157 100644 --- a/utils/gui/pyqt/main_window/UI_MainWindow.py +++ b/utils/gui/pyqt/main_window/UI_MainWindow.py @@ -14,7 +14,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_MainWindow(object): def setupUi(self, MainWindow): MainWindow.setObjectName("MainWindow") - MainWindow.resize(1067, 517) + MainWindow.resize(1419, 842) self.centralwidget = QtWidgets.QWidget(MainWindow) self.centralwidget.setObjectName("centralwidget") self.gridLayout = QtWidgets.QGridLayout(self.centralwidget)