From 9b4b630d8dbfaa82be6481ad8a23968f2ccda81a Mon Sep 17 00:00:00 2001
From: Djalim Simaila <DjalimS.pro@outlook.fr>
Date: Thu, 27 Apr 2023 09:54:17 +0200
Subject: [PATCH 1/2] added new panes in ui
---
utils/gui/pyqt/main_window/MainWindow.ui | 116 ++++++++++++++++++++
utils/gui/pyqt/main_window/UI_MainWindow.py | 81 ++++++++++++++
2 files changed, 197 insertions(+)
diff --git a/utils/gui/pyqt/main_window/MainWindow.ui b/utils/gui/pyqt/main_window/MainWindow.ui
index c832984..7290326 100644
--- a/utils/gui/pyqt/main_window/MainWindow.ui
+++ b/utils/gui/pyqt/main_window/MainWindow.ui
@@ -327,6 +327,74 @@
</item>
</layout>
</widget>
+ <widget class="QWidget" name="tab_3">
+ <attribute name="title">
+ <string>3</string>
+ </attribute>
+ <layout class="QHBoxLayout" name="horizontalLayout_5">
+ <item>
+ <widget class="QFrame" name="slot8_frame">
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_7">
+ <item row="0" column="0">
+ <widget class="QComboBox" name="slot8ComboBox"/>
+ </item>
+ <item row="1" column="0">
+ <layout class="QGridLayout" name="slot8"/>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QFrame" name="slot9_frame">
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_6">
+ <item row="0" column="0">
+ <widget class="QComboBox" name="slot9ComboBox"/>
+ </item>
+ <item row="1" column="0">
+ <layout class="QGridLayout" name="slot9"/>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="tab_4">
+ <attribute name="title">
+ <string>4</string>
+ </attribute>
+ <layout class="QGridLayout" name="gridLayout_4">
+ <item row="0" column="0">
+ <widget class="QFrame" name="slot10_frame">
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_9">
+ <item row="0" column="0">
+ <widget class="QComboBox" name="slot10ComboBox"/>
+ </item>
+ <item row="1" column="0">
+ <layout class="QGridLayout" name="slot10"/>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
</widget>
</item>
</layout>
@@ -336,6 +404,54 @@
</item>
</layout>
</widget>
+ <widget class="QMenuBar" name="menuBar">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>1419</width>
+ <height>22</height>
+ </rect>
+ </property>
+ <widget class="QMenu" name="menuRichier">
+ <property name="title">
+ <string>Fichier</string>
+ </property>
+ <addaction name="actionOuvrir_un_fichier"/>
+ <addaction name="actionSauvegarder_le_model_redress"/>
+ <addaction name="separator"/>
+ <addaction name="actionPr_f_rennces"/>
+ <addaction name="separator"/>
+ <addaction name="actionQuitter"/>
+ </widget>
+ <widget class="QMenu" name="menuA_propos">
+ <property name="title">
+ <string>A propos</string>
+ </property>
+ </widget>
+ <addaction name="menuRichier"/>
+ <addaction name="menuA_propos"/>
+ </widget>
+ <action name="actionOuvrir_un_fichier">
+ <property name="text">
+ <string>Ouvrir un fichier</string>
+ </property>
+ </action>
+ <action name="actionSauvegarder_le_model_redress">
+ <property name="text">
+ <string>Sauvegarder le model 3D redressé</string>
+ </property>
+ </action>
+ <action name="actionPr_f_rennces">
+ <property name="text">
+ <string>Préférennces</string>
+ </property>
+ </action>
+ <action name="actionQuitter">
+ <property name="text">
+ <string>Quitter</string>
+ </property>
+ </action>
</widget>
<resources/>
<connections/>
diff --git a/utils/gui/pyqt/main_window/UI_MainWindow.py b/utils/gui/pyqt/main_window/UI_MainWindow.py
index 69fd36d..3abc8a1 100644
--- a/utils/gui/pyqt/main_window/UI_MainWindow.py
+++ b/utils/gui/pyqt/main_window/UI_MainWindow.py
@@ -212,10 +212,83 @@ class Ui_MainWindow(object):
self.gridLayout_20.addWidget(self.slot7ComboBox, 0, 0, 1, 1)
self.gridLayout_13.addWidget(self.slot7_frame, 1, 1, 1, 1)
self.tabWidget.addTab(self.tab_2, "")
+ self.tab_3 = QtWidgets.QWidget()
+ self.tab_3.setObjectName("tab_3")
+ self.horizontalLayout_5 = QtWidgets.QHBoxLayout(self.tab_3)
+ self.horizontalLayout_5.setObjectName("horizontalLayout_5")
+ self.slot8_frame = QtWidgets.QFrame(self.tab_3)
+ self.slot8_frame.setFrameShape(QtWidgets.QFrame.StyledPanel)
+ self.slot8_frame.setFrameShadow(QtWidgets.QFrame.Raised)
+ self.slot8_frame.setObjectName("slot8_frame")
+ self.gridLayout_7 = QtWidgets.QGridLayout(self.slot8_frame)
+ self.gridLayout_7.setObjectName("gridLayout_7")
+ self.slot8ComboBox = QtWidgets.QComboBox(self.slot8_frame)
+ self.slot8ComboBox.setObjectName("slot8ComboBox")
+ self.gridLayout_7.addWidget(self.slot8ComboBox, 0, 0, 1, 1)
+ self.slot8 = QtWidgets.QGridLayout()
+ self.slot8.setObjectName("slot8")
+ self.gridLayout_7.addLayout(self.slot8, 1, 0, 1, 1)
+ self.horizontalLayout_5.addWidget(self.slot8_frame)
+ self.slot9_frame = QtWidgets.QFrame(self.tab_3)
+ self.slot9_frame.setFrameShape(QtWidgets.QFrame.StyledPanel)
+ self.slot9_frame.setFrameShadow(QtWidgets.QFrame.Raised)
+ self.slot9_frame.setObjectName("slot9_frame")
+ self.gridLayout_6 = QtWidgets.QGridLayout(self.slot9_frame)
+ self.gridLayout_6.setObjectName("gridLayout_6")
+ self.slot9ComboBox = QtWidgets.QComboBox(self.slot9_frame)
+ self.slot9ComboBox.setObjectName("slot9ComboBox")
+ self.gridLayout_6.addWidget(self.slot9ComboBox, 0, 0, 1, 1)
+ self.slot9 = QtWidgets.QGridLayout()
+ 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.tab_4 = QtWidgets.QWidget()
+ self.tab_4.setObjectName("tab_4")
+ self.gridLayout_4 = QtWidgets.QGridLayout(self.tab_4)
+ self.gridLayout_4.setObjectName("gridLayout_4")
+ self.slot10_frame = QtWidgets.QFrame(self.tab_4)
+ self.slot10_frame.setFrameShape(QtWidgets.QFrame.StyledPanel)
+ self.slot10_frame.setFrameShadow(QtWidgets.QFrame.Raised)
+ self.slot10_frame.setObjectName("slot10_frame")
+ self.gridLayout_9 = QtWidgets.QGridLayout(self.slot10_frame)
+ self.gridLayout_9.setObjectName("gridLayout_9")
+ self.slot10ComboBox = QtWidgets.QComboBox(self.slot10_frame)
+ self.slot10ComboBox.setObjectName("slot10ComboBox")
+ self.gridLayout_9.addWidget(self.slot10ComboBox, 0, 0, 1, 1)
+ self.slot10 = QtWidgets.QGridLayout()
+ 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, 0, 0, 1, 1)
self.horizontalLayout_4.addWidget(self.Graphs)
self.gridLayout.addLayout(self.horizontalLayout_4, 1, 0, 1, 1)
MainWindow.setCentralWidget(self.centralwidget)
+ self.menuBar = QtWidgets.QMenuBar(MainWindow)
+ self.menuBar.setGeometry(QtCore.QRect(0, 0, 1419, 22))
+ self.menuBar.setObjectName("menuBar")
+ self.menuRichier = QtWidgets.QMenu(self.menuBar)
+ self.menuRichier.setObjectName("menuRichier")
+ self.menuA_propos = QtWidgets.QMenu(self.menuBar)
+ self.menuA_propos.setObjectName("menuA_propos")
+ MainWindow.setMenuBar(self.menuBar)
+ self.actionOuvrir_un_fichier = QtWidgets.QAction(MainWindow)
+ self.actionOuvrir_un_fichier.setObjectName("actionOuvrir_un_fichier")
+ self.actionSauvegarder_le_model_redress = QtWidgets.QAction(MainWindow)
+ self.actionSauvegarder_le_model_redress.setObjectName("actionSauvegarder_le_model_redress")
+ self.actionPr_f_rennces = QtWidgets.QAction(MainWindow)
+ self.actionPr_f_rennces.setObjectName("actionPr_f_rennces")
+ self.actionQuitter = QtWidgets.QAction(MainWindow)
+ self.actionQuitter.setObjectName("actionQuitter")
+ self.menuRichier.addAction(self.actionOuvrir_un_fichier)
+ self.menuRichier.addAction(self.actionSauvegarder_le_model_redress)
+ self.menuRichier.addSeparator()
+ self.menuRichier.addAction(self.actionPr_f_rennces)
+ self.menuRichier.addSeparator()
+ self.menuRichier.addAction(self.actionQuitter)
+ self.menuBar.addAction(self.menuRichier.menuAction())
+ self.menuBar.addAction(self.menuA_propos.menuAction())
self.retranslateUi(MainWindow)
self.tabWidget.setCurrentIndex(0)
@@ -234,3 +307,11 @@ class Ui_MainWindow(object):
self.start_analyse_button.setText(_translate("MainWindow", "Analyser le fichier"))
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.menuRichier.setTitle(_translate("MainWindow", "Fichier"))
+ self.menuA_propos.setTitle(_translate("MainWindow", "A propos"))
+ self.actionOuvrir_un_fichier.setText(_translate("MainWindow", "Ouvrir un fichier"))
+ self.actionSauvegarder_le_model_redress.setText(_translate("MainWindow", "Sauvegarder le model 3D redressé"))
+ self.actionPr_f_rennces.setText(_translate("MainWindow", "Préférennces"))
+ self.actionQuitter.setText(_translate("MainWindow", "Quitter"))
--
GitLab
From 8c964967c288d228601032392a794535664085d6 Mon Sep 17 00:00:00 2001
From: Djalim Simaila <DjalimS.pro@outlook.fr>
Date: Thu, 27 Apr 2023 10:05:02 +0200
Subject: [PATCH 2/2] added new panes in code
---
utils/gui/pyqt/main_window/MainWindow.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/utils/gui/pyqt/main_window/MainWindow.py b/utils/gui/pyqt/main_window/MainWindow.py
index d9caf3d..c987da5 100644
--- a/utils/gui/pyqt/main_window/MainWindow.py
+++ b/utils/gui/pyqt/main_window/MainWindow.py
@@ -48,7 +48,10 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
self.slot4ComboBox,
self.slot5ComboBox,
self.slot6ComboBox,
- self.slot7ComboBox
+ self.slot7ComboBox,
+ self.slot8ComboBox,
+ self.slot9ComboBox,
+ self.slot10ComboBox
]
for cb in self.comboBoxes:
@@ -62,7 +65,10 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
[self.slot4,None],
[self.slot5,None],
[self.slot6,None],
- [self.slot7,None]
+ [self.slot7,None],
+ [self.slot8,None],
+ [self.slot9,None],
+ [self.slot10,None]
]
self.threads = []
--
GitLab