From bbe7a04d2cd5a1e2c8b39541d8fe4ab3a09e5d6f Mon Sep 17 00:00:00 2001
From: Djalim Simaila <DjalimS.pro@outlook.fr>
Date: Tue, 25 Apr 2023 13:31:51 +0200
Subject: [PATCH] stub
---
utils/files/output.py | 4 ++--
utils/gui/pyqt/main_window/MainWindow.py | 3 +++
utils/gui/pyqt/main_window/MainWindow.ui | 4 ++--
utils/gui/pyqt/main_window/UI_MainWindow.py | 2 +-
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/utils/files/output.py b/utils/files/output.py
index ec1f1ab..9f0ca90 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 1082892..a0b189c 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 fe46fcb..993ea64 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 a658055..20ea7f0 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)
--
GitLab