From eff96beee5d0463c03fa0caf6e184b9906e43895 Mon Sep 17 00:00:00 2001 From: yanganjie Date: Tue, 4 Nov 2025 09:45:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=91=84=E5=83=8F=E5=A4=B4?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/camera_config.ini | 6 +++--- controller/main_controller.py | 8 +++++--- view/main_window.py | 2 +- view/widgets/hopper_widget.py | 14 +++++++++++--- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/config/camera_config.ini b/config/camera_config.ini index 9d66244..b6b58d0 100644 --- a/config/camera_config.ini +++ b/config/camera_config.ini @@ -1,21 +1,21 @@ # camera_config.ini # 相关的摄像头的配置文件 [上位料斗] -ip = 192.168.1.50 +ip = 192.168.250.60 port = 554 username = admin password = XJ123456 channel = 101 [下位料斗] -ip = 192.168.1.51 +ip = 192.168.250.61 port = 554 username = admin password = XJ123456 channel = 101 [模具车] -ip = 192.168.1.51 +ip = 192.168.250.61 port = 554 username = admin password = XJ123456 diff --git a/controller/main_controller.py b/controller/main_controller.py index 6c0f506..060fe1c 100644 --- a/controller/main_controller.py +++ b/controller/main_controller.py @@ -32,7 +32,8 @@ class MainController: def _onTimer(self): # 定时任务逻辑 - loc_tra=TransmitterController(RelayController()) + # 变送器是 192.168.250.63，端口 502 + loc_tra=TransmitterController(RelayController(host="192.168.250.63", port=502)) upper_weight=loc_tra.read_data(1) lower_weight=loc_tra.read_data(2) if upper_weight is None: @@ -49,7 +50,7 @@ class MainController: pass def _onTimer2(self): - print(str(self.angle)) + # print(str(self.angle)) # 定时任务逻辑 if self.is_add: self.angle+=1 @@ -71,7 +72,8 @@ class MainController: def showMainWindow(self): - self.main_window.show() + # self.main_window.show() + self.main_window.showFullScreen() self.main_window.dispatch_task_widget.set_task_time("task1","15:44 PM") self.main_window.dispatch_task_widget.set_task_time("task2","17:37 PM") self.main_window.segment_task_widget.set_task_time("task1","15:38 PM") diff --git a/view/main_window.py b/view/main_window.py index 1e1ccff..127be50 100644 --- a/view/main_window.py +++ b/view/main_window.py @@ -63,7 +63,7 @@ class MainWindow(QWidget): # self.setStyleSheet("background-color: #ffffff;") # #001558 # Qt.FramelessWindowHint - self.setWindowFlags(Qt.FramelessWindowHint) + # self.setWindowFlags(Qt.FramelessWindowHint) # 设置主界面背景图片 try: diff --git a/view/widgets/hopper_widget.py b/view/widgets/hopper_widget.py index 557094f..3390208 100644 --- a/view/widgets/hopper_widget.py +++ b/view/widgets/hopper_widget.py @@ -323,18 +323,26 @@ class HopperWidget(QWidget): volume : 传入多少方 """ self.upper_extra_label.setText(f"{volume}方（预估）") + + # 上料斗夹爪开合角度设置 + def setUpperHopperClampAngle(self, angle: float): + """ + Args: + angle: 传入多少角度（单位°） + """ + self.upper_clamp_widget.set_angle(angle) # 下料斗重量设置 def setLowerHopperWeight(self, weight:float): self.lower_weight_label.setText(f"{weight}kg") - # 下料斗开合角度设置 + # 下料斗开合角度设置 (包括 夹爪和标签) def setLowerHopperOpeningAngle(self, angle: float): """Args: angle : 传入多少度 （单位°） """ - self.lower_extra_label.setText(f"开: {angle}°") - self.lower_clamp_widget.set_angle(angle) + self.lower_extra_label.setText(f"开: {angle}°") # 设置下料斗角度标签 + self.lower_clamp_widget.set_angle(angle) # 设置下料斗夹爪开合角度 # ------------------------------ # 设置上料斗状态（0=绿，1=黄，2=红）