修改说明

字体修改
按钮添加
2022-06-17 01:32:10 +08:00 · 2022-06-13 22:51:59 +08:00 · 2022-06-13 22:45:48 +08:00 · 2022-06-13 22:35:45 +08:00 · 2022-06-13 22:30:40 +08:00 · 2022-06-13 22:22:53 +08:00
8 changed files with 94 additions and 23 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
+# WARNING! All changes made in this file will be lost!
 # run again.  Do not edit this file unless you know what you are doing.
 from PyQt5 import QtCore, QtGui, QtWidgets
@ -96,6 +95,13 @@ class Ui_MainWindow(object):
        self.horizontalLayout.addLayout(self.formLayout_2)
        self.verticalLayout_2 = QtWidgets.QVBoxLayout()
        self.verticalLayout_2.setObjectName("verticalLayout_2")
        self.pushButton_2 = QtWidgets.QPushButton(self.centralwidget)
        font = QtGui.QFont()
        font.setFamily("宋体")
        font.setPointSize(12)
        self.pushButton_2.setFont(font)
        self.pushButton_2.setObjectName("pushButton_2")
        self.verticalLayout_2.addWidget(self.pushButton_2)
        self.pushButton_run = QtWidgets.QPushButton(self.centralwidget)
        font = QtGui.QFont()
        font.setFamily("宋体")
@ -110,6 +116,20 @@ class Ui_MainWindow(object):
        self.pushButton_stop.setFont(font)
        self.pushButton_stop.setObjectName("pushButton_stop")
        self.verticalLayout_2.addWidget(self.pushButton_stop)
        self.pushButton_3 = QtWidgets.QPushButton(self.centralwidget)
        font = QtGui.QFont()
        font.setFamily("宋体")
        font.setPointSize(12)
        self.pushButton_3.setFont(font)
        self.pushButton_3.setObjectName("pushButton_3")
        self.verticalLayout_2.addWidget(self.pushButton_3)
        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 +151,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):
@ -149,6 +170,9 @@ class Ui_MainWindow(object):
        self.label_9.setText(_translate("MainWindow", "移动节点电池容量"))
        self.lineEdit_bettery.setText(_translate("MainWindow", "100"))
        self.label_4.setText(_translate("MainWindow", "算法选择"))
        self.pushButton_2.setText(_translate("MainWindow", "使用说明"))
        self.pushButton_run.setText(_translate("MainWindow", "运行"))
        self.pushButton_stop.setText(_translate("MainWindow", "停止"))
        self.pushButton_3.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
@ -157,6 +157,19 @@
        </item>
        <item>
         <layout class="QVBoxLayout" name="verticalLayout_2">
          <item>
           <widget class="QPushButton" name="pushButton_2">
            <property name="font">
             <font>
              <family>宋体</family>
              <pointsize>12</pointsize>
             </font>
            </property>
            <property name="text">
             <string>使用说明</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QPushButton" name="pushButton_run">
            <property name="font">
@ -183,6 +196,32 @@
            </property>
           </widget>
          </item>
          <item>
           <widget class="QPushButton" name="pushButton_3">
            <property name="font">
             <font>
              <family>宋体</family>
              <pointsize>12</pointsize>
             </font>
            </property>
            <property name="text">
             <string>关于我们</string>
            </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 +269,8 @@
   <slot>stop()</slot>
   <hints>
    <hint type="sourcelabel">
-     <x>1275</x>
+     <x>1284</x>
-     <y>160</y>
+     <y>85</y>
    </hint>
    <hint type="destinationlabel">
     <x>1273</x>
@ -246,8 +285,8 @@
   <slot>slot_bettery()</slot>
   <hints>
    <hint type="sourcelabel">
-     <x>792</x>
+     <x>857</x>
-     <y>120</y>
+     <y>109</y>
    </hint>
    <hint type="destinationlabel">
     <x>899</x>
@ -255,10 +294,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/README.md
+++ b/README.md
@ -4,7 +4,7 @@ SeAI Palette集智调色板是面向集群网络的多节点智能协同路径
 集智调色板软件设计了参数输入模块、算法运行模块及信息输出模块，在不同节点数量要求的前提下划分区域方向，按区域进行算法的运行。并可以综合考虑固定节点、覆盖率、电池容量等条件下，给出运行步数、重复步数和重复率等等性能指标。
-软件界面简单，易学已用，包含参数的输入选择，程序的运行，算法结果的展示等，源代码公开，算法可修改。
+软件界面简单，易学易用，包含参数的输入选择，程序的运行，算法结果的展示等，源代码公开，算法可修改。
 开发人员：H.P. Yu、K. Wang、J. Li、H.T. Li、Z.Q. Wang、Z.Y. Zhao、L.F. Zhang、G. Chen
--- 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
@ -3,7 +3,6 @@ from MainWindow_map import Ui_MainWindow
 from PyQt5 import QtWidgets, QtCore, QtSql, QtGui
 from PyQt5.QtWidgets import *
 from PyQt5.QtCore import *
 from PyQt5.QtGui import QPixmap
 import threading, time, subprocess
@ -117,11 +116,13 @@ class mywindow(QtWidgets.QMainWindow, Ui_MainWindow):
    def stop(self):
        print('2')
-
+    def quit(self):
        app = QApplication.instance()
        app.quit()
        print('3')
 if __name__ == '__main__':
    app = QApplication(sys.argv)
    window = mywindow()
    # window.showMaximized()
    window.show()
    sys.exit(app.exec_())
Author	SHA1	Message	Date
p57492168	4f47ba3895	修改说明	2022-06-17 01:32:10 +08:00
p57492168	298fa0fadd	字体修改	2022-06-13 22:51:59 +08:00
p57492168	296027d69d	按钮添加	2022-06-13 22:45:48 +08:00
p57492168	10cb046bff	代码优化	2022-06-13 22:35:45 +08:00
p57492168	614c03a64c	注释添加	2022-06-13 22:30:40 +08:00
p57492168	130307cc9a	字体修改	2022-06-13 22:22:53 +08:00
p57492168	6286918643	按钮添加	2022-06-13 22:20:06 +08:00
p57492168	651eae98c7	代码优化	2022-06-13 22:16:39 +08:00
p57492168	a0d97d6cd9	精简代码	2022-06-13 22:13:18 +08:00
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`