代码优化

功能完善
代码修改
2022-06-13 19:59:29 +08:00 · 2022-06-13 19:52:49 +08:00 · 2022-06-13 19:45:36 +08:00 · 2022-06-13 16:33:26 +08:00 · 2022-06-12 22:19:01 +08:00 · 2022-06-12 22:16:53 +08:00
7 changed files with 52 additions and 20 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,3 +2,4 @@
 __pycache__
 TODO.md
 script.py
+.idea
--- a/MainWindow_map.py
+++ b/MainWindow_map.py
@ -2,10 +2,9 @@

 # Form implementation generated from reading ui file 'MainWindow_map.ui'
 #
-# Created by: PyQt5 UI code generator 5.15.1
+# Created by: PyQt5 UI code generator 5.12.3
 #
-# 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.
+# WARNING! All changes made in this file will be lost!


 from PyQt5 import QtCore, QtGui, QtWidgets
@ -110,6 +109,13 @@ class Ui_MainWindow(object):
        self.pushButton_stop.setFont(font)
        self.pushButton_stop.setObjectName("pushButton_stop")
        self.verticalLayout_2.addWidget(self.pushButton_stop)
+        self.pushButton = QtWidgets.QPushButton(self.centralwidget)
+        font = QtGui.QFont()
+        font.setFamily("宋体")
+        font.setPointSize(12)
+        self.pushButton.setFont(font)
+        self.pushButton.setObjectName("pushButton")
+        self.verticalLayout_2.addWidget(self.pushButton)
        self.horizontalLayout.addLayout(self.verticalLayout_2)
        self.horizontalLayout.setStretch(0, 1)
        self.horizontalLayout.setStretch(1, 1)
@ -131,6 +137,7 @@ class Ui_MainWindow(object):
        self.pushButton_run.clicked.connect(MainWindow.run)
        self.pushButton_stop.clicked.connect(MainWindow.stop)
        self.comboBox_bettery.currentTextChanged['QString'].connect(MainWindow.slot_bettery)
+        self.pushButton.clicked.connect(MainWindow.quit)
        QtCore.QMetaObject.connectSlotsByName(MainWindow)

    def retranslateUi(self, MainWindow):
@ -151,4 +158,5 @@ class Ui_MainWindow(object):
        self.label_4.setText(_translate("MainWindow", "算法选择"))
        self.pushButton_run.setText(_translate("MainWindow", "运行"))
        self.pushButton_stop.setText(_translate("MainWindow", "停止"))
+        self.pushButton.setText(_translate("MainWindow", "退出程序"))
        self.label_show.setText(_translate("MainWindow", "<html><head/><body><p><br/></p></body></html>"))
--- a/MainWindow_map.ui
+++ b/MainWindow_map.ui
@ -183,6 +183,19 @@
            </property>
           </widget>
          </item>
+          <item>
+           <widget class="QPushButton" name="pushButton">
+            <property name="font">
+             <font>
+              <family>宋体</family>
+              <pointsize>12</pointsize>
+             </font>
+            </property>
+            <property name="text">
+             <string>退出程序</string>
+            </property>
+           </widget>
+          </item>
         </layout>
        </item>
       </layout>
@ -230,8 +243,8 @@
   <slot>stop()</slot>
   <hints>
    <hint type="sourcelabel">
-     <x>1275</x>
-     <y>160</y>
+     <x>1284</x>
+     <y>85</y>
    </hint>
    <hint type="destinationlabel">
     <x>1273</x>
@ -246,8 +259,8 @@
   <slot>slot_bettery()</slot>
   <hints>
    <hint type="sourcelabel">
-     <x>792</x>
-     <y>120</y>
+     <x>857</x>
+     <y>109</y>
    </hint>
    <hint type="destinationlabel">
     <x>899</x>
@ -255,10 +268,27 @@
    </hint>
   </hints>
  </connection>
+  <connection>
+   <sender>pushButton</sender>
+   <signal>clicked()</signal>
+   <receiver>MainWindow</receiver>
+   <slot>quit()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>959</x>
+     <y>117</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>940</x>
+     <y>136</y>
+    </hint>
+   </hints>
+  </connection>
 </connections>
 <slots>
  <slot>run()</slot>
  <slot>stop()</slot>
  <slot>slot_bettery()</slot>
+  <slot>quit()</slot>
 </slots>
 </ui>
--- a/1
+++ b/1
@ -1 +0,0 @@
-Subproject commit 82e80a5b3b1884cacc479d9918a1ff2b0ca61faa
--- a/create_env.yaml
+++ b/create_env.yaml
@ -9,3 +9,4 @@ dependencies:
      - pyyaml==5.4.1
      - numpy==1.20.3
      - easydict==1.9
+      - pyqt == 5.15.4
--- a/create_env.yaml.bak
+++ b/create_env.yaml.bak
@ -1,11 +0,0 @@
-name: Palette
-dependencies:
-  - python=3.7.6
-  - anaconda
-  - pip
-  - pip:
-      - pygame==2.0.1
-      - pymunk==6.0.0
-      - pyyaml==5.4.1
-      - numpy==1.20.3
-      - easydict==1.9
--- a/main_tt.py
+++ b/main_tt.py
@ -117,11 +117,15 @@ class mywindow(QtWidgets.QMainWindow, Ui_MainWindow):
    def stop(self):
        print('2')

+    def quit(self):
+        #sender = self.sender()
+        #print(sender.text() + '按钮被按下')
+        app = QApplication.instance()
+        app.quit()


 if __name__ == '__main__':
    app = QApplication(sys.argv)
    window = mywindow()
-    # window.showMaximized()
    window.show()
    sys.exit(app.exec_())
Author	SHA1	Message	Date
p57492168	664637ae08	代码优化	2022-06-13 19:59:29 +08:00
p57492168	9ec9767e18	功能完善	2022-06-13 19:52:49 +08:00
p57492168	65d0ef32a4	代码修改	2022-06-13 19:45:36 +08:00
p57492168	75bbd439e9	字体大小调整	2022-06-13 16:33:26 +08:00
p57492168	68f3fe56a1	按钮添加	2022-06-12 22:19:01 +08:00
p57492168	a48cd146f8	按钮添加	2022-06-12 22:16:53 +08:00
p57492168	85a7e606aa	增加安装包	2022-06-06 21:08:36 +08:00
				`@ -1 +0,0 @@`
				`Subproject commit 82e80a5b3b1884cacc479d9918a1ff2b0ca61faa`