chuyiwen/AutoControlSystem-G
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ui界面的剩余袋数显示改成已投袋数，我改了显示不了，其余修改完成，备注修改点1、修改点2

Browse Source
This commit is contained in:
琉璃月光
2025-08-15 13:00:10 +08:00
parent eaa1cee17f
commit 817291a425
6 changed files with 175 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
main.py
View File

@ -909,7 +909,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
#提示
remain_messageBox = QMessageBox()
remain_messageBox.setIcon(QMessageBox.Icon.Warning)
remain_messageBox.setText(f'还有{self.remain_Count}袋未投料，是否继续？')
remain_messageBox.setText(f'还有{self.remain_Count}袋未投料，是否继续？') # 这里返回多少袋没有投料
# remain_messageBox.setStandardButtons(QMessageBox.StandardButton.Ok | QMessageBox.StandardButton.Cancel)
ok_button = remain_messageBox.addButton("确定", PySide6.QtWidgets.QMessageBox.ButtonRole.AcceptRole)
cancel_button = remain_messageBox.addButton("取消", PySide6.QtWidgets.QMessageBox.ButtonRole.RejectRole)
@ -922,9 +922,8 @@ class MainWindow(QMainWindow, Ui_MainWindow):
current_index = self.comboBox_lineIndex.findText(line_name)
self.comboBox_lineIndex.setCurrentIndex(current_index)
#self.horizontalSlider_feedingNum.setMaximum(self.remain_Count)
self.horizontalSlider_feedingNum.setMaximum(self.remain_Count)
self.label_maxNum.setText(str(self.remain_Count))
self.label_maxNum.setText(str(self.remain_Count)) #目标投料袋数设置为setini文件中保存的remain_count
self.horizontalSlider_feedingNum.setValue(0)
self.send_startFeed_button_click()
@ -1499,8 +1498,10 @@ class MainWindow(QMainWindow, Ui_MainWindow):
else:
self.set_run_status_button(False)
if self.feeding.feedConfig!=None:
self.label_remain_num.setText(str(self.feeding.feedConfig.num))
#修改点1：这里修改显示剩余袋数的逻辑
#原来的逻辑是显示剩余袋数：self.label_remain_num.setText(self.feeding.feedConfig.num))
#我改成了目标袋数减剩余袋数就是已经投料的袋数self.label_remain_num.setText(str(self.horizontalSlider_feedingNum.maximum()-self.feeding.feedConfig.num))
self.label_remain_num.setText(str(self.horizontalSlider_feedingNum.maximum()-self.feeding.feedConfig.num))
if self.feeding.feedStatus == FeedStatus.FNone:
self.stackedWidget_num.setCurrentIndex(0)
else:
@ -2066,13 +2067,14 @@ class MainWindow(QMainWindow, Ui_MainWindow):
if index == 3:
self.updateUI_Base_Set()
#修改点2：设置一键投料的目标袋数从999设置到40袋
def send_onekeyfeed_button_click(self):
# if self.feeding.feedStatus != FeedStatus.FNone:
# self.show_infomessage_box("正在执行")
# return
self.horizontalSlider_feedingNum.setMaximum(999)
self.label_maxNum.setText(str(999))
self.horizontalSlider_feedingNum.setMaximum(40)
self.label_maxNum.setText(str(40))
self.horizontalSlider_feedingNum.setValue(0)
self.send_startFeed_button_click()
@ -2112,7 +2114,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self.robotClient.close()
log.log_message(logging.INFO, Constant.str_sys_exit)
#记录投料袋数
def record_remain_num(self):
try:
self.configReader = configparser.ConfigParser()