From 0879520fd248e49a82c8ec0b66df7c4ad45d28d2 Mon Sep 17 00:00:00 2001 From: brahim Date: Wed, 5 Mar 2025 14:24:00 +0100 Subject: [PATCH] mainwindow program is cleaned from useless commented lines and useless print --- View/mainwindow.py | 88 +++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 47 deletions(-) diff --git a/View/mainwindow.py b/View/mainwindow.py index 3a9abe2..d2c4b4a 100644 --- a/View/mainwindow.py +++ b/View/mainwindow.py @@ -43,8 +43,6 @@ from subprocess import check_call, run import time -from View.acoustic_data_tab import AcousticDataTab - class Ui_MainWindow(object): def setupUi(self, MainWindow): @@ -55,10 +53,13 @@ class Ui_MainWindow(object): self.mainwindow.setDocumentMode(False) self.mainwindow.setDockNestingEnabled(False) self.mainwindow.setUnifiedTitleAndToolBarOnMac(False) + self.centralwidget = QtWidgets.QWidget(self.mainwindow) self.centralwidget.setObjectName("centralwidget") + self.verticalLayout = QtWidgets.QVBoxLayout(self.centralwidget) self.verticalLayout.setObjectName("verticalLayout") + self.tabWidget = QtWidgets.QTabWidget(self.centralwidget) self.tabWidget.setAutoFillBackground(False) self.tabWidget.setLocale(QtCore.QLocale(QtCore.QLocale.French, QtCore.QLocale.France)) @@ -66,115 +67,125 @@ class Ui_MainWindow(object): self.tabWidget.setTabsClosable(False) self.tabWidget.setTabBarAutoHide(False) self.tabWidget.setObjectName("tabWidget") + self.tab1 = QtWidgets.QWidget() self.tab1.setContextMenuPolicy(QtCore.Qt.ActionsContextMenu) self.tab1.setObjectName("tab1") self.tabWidget.addTab(self.tab1, "") + self.tab2 = QtWidgets.QWidget() self.tab2.setObjectName("tab2") self.tabWidget.addTab(self.tab2, "") + self.tab3 = QtWidgets.QWidget() self.tab3.setObjectName("tab3") self.tabWidget.addTab(self.tab3, "") + self.tab4 = QtWidgets.QWidget() self.tab4.setObjectName("tab4") self.tabWidget.addTab(self.tab4, "") + self.tab5 = QtWidgets.QWidget() self.tab5.setObjectName("tab5") self.tabWidget.addTab(self.tab5, "") + self.tab6 = QtWidgets.QWidget() self.tab6.setObjectName("tab6") self.tabWidget.addTab(self.tab6, "") - # self.tab7 = QtWidgets.QWidget() - # self.tab7.setObjectName("tab7") - # self.tabWidget.addTab(self.tab7, "") + self.verticalLayout.addWidget(self.tabWidget) self.mainwindow.setCentralWidget(self.centralwidget) + self.menubar = QtWidgets.QMenuBar(self.mainwindow) self.menubar.setGeometry(QtCore.QRect(0, 0, 898, 22)) self.menubar.setObjectName("menubar") + self.menuFile = QtWidgets.QMenu(self.menubar) self.menuFile.setLocale(QtCore.QLocale(QtCore.QLocale.French, QtCore.QLocale.France)) self.menuFile.setObjectName("menuFile") + self.menuSettings = QtWidgets.QMenu(self.menuFile) self.menuSettings.setObjectName("menuSettings") + self.menuLanguage = QtWidgets.QMenu(self.menuSettings) self.menuLanguage.setObjectName("menuLanguage") + self.menuExport = QtWidgets.QMenu(self.menuFile) self.menuExport.setObjectName("menuExport") + self.menuTools = QtWidgets.QMenu(self.menubar) self.menuTools.setLocale(QtCore.QLocale(QtCore.QLocale.French, QtCore.QLocale.France)) self.menuTools.setObjectName("menuTools") + self.menuHelp = QtWidgets.QMenu(self.menubar) self.menuHelp.setObjectName("menuHelp") + self.mainwindow.setMenuBar(self.menubar) + self.statusbar = QtWidgets.QStatusBar(self.mainwindow) self.statusbar.setObjectName("statusbar") self.mainwindow.setStatusBar(self.statusbar) + self.toolBar = QtWidgets.QToolBar(self.mainwindow) self.toolBar.setObjectName("toolBar") self.mainwindow.addToolBar(QtCore.Qt.TopToolBarArea, self.toolBar) - # self.actionNew = QtWidgets.QAction(self.mainwindow) - # icon = QtGui.QIcon() - # icon.addPixmap(QtGui.QPixmap("icons/new.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) - # self.actionNew.setIcon(icon) - # self.actionNew.setObjectName("actionNew") + self.actionOpen = QtWidgets.QAction(self.mainwindow) icon1 = QtGui.QIcon() icon1.addPixmap(QtGui.QPixmap("icons/icon_folder.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.actionOpen.setIcon(icon1) self.actionOpen.setObjectName("actionOpen") + self.actionSave = QtWidgets.QAction(self.mainwindow) icon2 = QtGui.QIcon() icon2.addPixmap(QtGui.QPixmap("icons/save.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.actionSave.setIcon(icon2) self.actionSave.setObjectName("actionSave") - # self.actionCopy = QtWidgets.QAction(self.mainwindow) - # icon3 = QtGui.QIcon() - # icon3.addPixmap(QtGui.QPixmap("icons/copy.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) - # self.actionCopy.setIcon(icon3) - # self.actionCopy.setObjectName("actionCopy") - # self.actionCut = QtWidgets.QAction(self.mainwindow) - # icon4 = QtGui.QIcon() - # icon4.addPixmap(QtGui.QPixmap("icons/cut.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) - # self.actionCut.setIcon(icon4) - # self.actionCut.setObjectName("actionCut") - # self.actionPaste = QtWidgets.QAction(self.mainwindow) - # icon5 = QtGui.QIcon() - # icon5.addPixmap(QtGui.QPixmap("icons/paste.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) - # self.actionPaste.setIcon(icon5) - # self.actionPaste.setObjectName("actionPaste") + self.actionEnglish = QtWidgets.QAction(self.mainwindow) icon6 = QtGui.QIcon() icon6.addPixmap(QtGui.QPixmap("icons/en.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.actionEnglish.setIcon(icon6) self.actionEnglish.setObjectName("actionEnglish") + self.actionFrench = QtWidgets.QAction(self.mainwindow) icon7 = QtGui.QIcon() icon7.addPixmap(QtGui.QPixmap("icons/fr.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) self.actionFrench.setIcon(icon7) self.actionFrench.setObjectName("actionFrench") + self.action_ABSCalibrationConstant = QtWidgets.QAction(self.mainwindow) self.action_ABSCalibrationConstant.setText("ABS constant calibration kt") + self.actionTable_of_Backscatter_values = QtWidgets.QAction(self.mainwindow) self.actionTable_of_Backscatter_values.setObjectName("actionTable_of_Backscatter_values") + self.actionSave_As = QtWidgets.QAction(self.mainwindow) self.actionSave_As.setObjectName("actionSave_As") + self.actionAbout = QtWidgets.QAction(self.mainwindow) self.actionAbout.setObjectName("actionAbout") + self.actionUserManual = QtWidgets.QAction(self.mainwindow) self.actionUserManual.setText("User Manual") + self.action_AcousticInversionTheory = QtWidgets.QAction(self.mainwindow) self.action_AcousticInversionTheory.setText("Acoustic inversion theory") + self.action_AQUAscatUserManual = QtWidgets.QAction(self.mainwindow) self.action_AQUAscatUserManual.setText("Tutorial AQUAscat software") + self.actionDB_Browser_for_SQLite = QtWidgets.QAction(self.mainwindow) self.actionDB_Browser_for_SQLite.setObjectName("actionDB_Browser_for_SQLite") + self.menuLanguage.addAction(self.actionEnglish) self.menuLanguage.addAction(self.actionFrench) + self.menuSettings.addAction(self.menuLanguage.menuAction()) self.menuSettings.addAction(self.action_ABSCalibrationConstant) + self.menuExport.addAction(self.actionTable_of_Backscatter_values) + self.menuFile.addAction(self.actionOpen) self.menuFile.addAction(self.actionSave) self.menuFile.addAction(self.actionSave_As) @@ -182,21 +193,21 @@ class Ui_MainWindow(object): self.menuFile.addAction(self.menuSettings.menuAction()) self.menuFile.addSeparator() self.menuFile.addAction(self.menuExport.menuAction()) + self.menuTools.addAction(self.actionDB_Browser_for_SQLite) + self.menuHelp.addAction(self.actionAbout) self.menuHelp.addAction(self.actionUserManual) self.menuHelp.addAction(self.action_AcousticInversionTheory) self.menuHelp.addAction(self.action_AQUAscatUserManual) + self.menubar.addAction(self.menuFile.menuAction()) self.menubar.addAction(self.menuTools.menuAction()) self.menubar.addAction(self.menuHelp.menuAction()) - # self.toolBar.addAction(self.actionNew) + self.toolBar.addAction(self.actionOpen) self.toolBar.addAction(self.actionSave) self.toolBar.addSeparator() - # self.toolBar.addAction(self.actionCopy) - # self.toolBar.addAction(self.actionCut) - # self.toolBar.addAction(self.actionPaste) self.toolBar.addSeparator() self.toolBar.addAction(self.actionEnglish) self.toolBar.addAction(self.actionFrench) @@ -257,12 +268,7 @@ class Ui_MainWindow(object): UpdateTableForSave() def open(self): - pass - # ReadTableForOpen() - - # acoustic_data_tab = AcousticDataTab() - # - # acoustic_data_tab.fileListWidget.addItems(stg.acoustic_data) + ReadTableForOpen() def load_calibration_constant_values(self): cc_kt = CalibrationConstantKt() @@ -330,13 +336,6 @@ class Ui_MainWindow(object): exec("DataFrame_acoustic_" + str(i) + "= pd.DataFrame(None)") exec("DataFrame_acoustic_" + str(i) + "= pd.DataFrame(data=table_data.transpose(), columns=header_list)") - # exec("DataFrame_acoustic_" + str(i) + ".to_csv(" + - # "excel_writer=" + - # '/home/bmoudjed/Documents/3 SSC acoustic meas project/Graphical interface project/BS_raw_data_table.xlsx' + "," + - # "sheet_name=stg.filename_BS_raw_data[i]," + - # "header=DataFrame_acoustic.columns," + - # "engine=" + "xlsxwriter" + ")") - exec("DataFrame_acoustic_" + str(i) + ".to_csv(" + "path_or_buf=" + "'" + name + "/" + "Table_" + @@ -357,7 +356,6 @@ class Ui_MainWindow(object): self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab4), _translate("MainWindow", "Sediment Calibration")) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab5), _translate("MainWindow", "Acoustic inversion")) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab6), _translate("MainWindow", "Note")) - # self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab7), _translate("MainWindow", "User manual")) self.menuFile.setTitle(_translate("MainWindow", "File")) self.menuSettings.setTitle(_translate("MainWindow", "Settings")) self.menuLanguage.setTitle(_translate("MainWindow", "Language")) @@ -365,12 +363,8 @@ class Ui_MainWindow(object): self.menuTools.setTitle(_translate("MainWindow", "Tools")) self.menuHelp.setTitle(_translate("MainWindow", "Help")) self.toolBar.setWindowTitle(_translate("MainWindow", "toolBar")) - # self.actionNew.setText(_translate("MainWindow", "New")) self.actionOpen.setText(_translate("MainWindow", "Open ...")) self.actionSave.setText(_translate("MainWindow", "Save")) - # self.actionCopy.setText(_translate("MainWindow", "Copy")) - # self.actionCut.setText(_translate("MainWindow", "Cut")) - # self.actionPaste.setText(_translate("MainWindow", "Paste")) self.actionEnglish.setText(_translate("MainWindow", "English")) self.actionFrench.setText(_translate("MainWindow", "French")) self.actionTable_of_Backscatter_values.setText(_translate("MainWindow", "Table of Backscatter values"))