From 94d755c30b7d19d5f753f892af592ffb37477076 Mon Sep 17 00:00:00 2001 From: "cuijingwei@brisonus.com" <12345678> Date: Fri, 21 Feb 2025 15:34:15 +0800 Subject: [PATCH] [update] param_service.py set_params --- param_service_test.py | 51 ++++++++++++++++++++++++------------------- params_service.py | 31 +++++++++++++++++--------- 2 files changed, 49 insertions(+), 33 deletions(-) diff --git a/param_service_test.py b/param_service_test.py index ca95d8f..7b18227 100644 --- a/param_service_test.py +++ b/param_service_test.py @@ -65,7 +65,7 @@ class MyWindow(QWidget): # 设置窗口的布局 self.setLayout(layout) - self.params_service = ParamsService("127.0.0.1", 12345) + self.params_service = ParamsService("192.168.5.4", 5000) # self.params_service.signal_request_complete.connect(self.on_params_service) def on_params_service(self, res: Response): @@ -73,29 +73,34 @@ class MyWindow(QWidget): widget.set_data(res.data) def on_button_clicked(self): - self.params_service.get_params( - widget=self.test_widget1, - param_names=[self.test_widget1.param_name], - callback=self.on_params_service - ) - self.params_service.get_params( - widget=self.test_widget2, - param_names=[self.test_widget2.param_name], - callback=self.on_params_service - ) - self.params_service.get_params( - widget=self.test_widget3, - param_names=[self.test_widget3.param_name], - callback=self.on_params_service - ) - self.params_service.get_params( - widget=self.test_widget4, - param_names=[self.test_widget4.param_name], - callback=self.on_params_service - ) - self.params_service.get_params( + # self.params_service.get_params( + # widget=self.test_widget1, + # param_names=[self.test_widget1.param_name], + # callback=self.on_params_service + # ) + # self.params_service.get_params( + # widget=self.test_widget2, + # param_names=[self.test_widget2.param_name], + # callback=self.on_params_service + # ) + # self.params_service.get_params( + # widget=self.test_widget3, + # param_names=[self.test_widget3.param_name], + # callback=self.on_params_service + # ) + # self.params_service.get_params( + # widget=self.test_widget4, + # param_names=[self.test_widget4.param_name], + # callback=self.on_params_service + # ) + # self.params_service.get_params( + # widget=self.test_widget5, + # param_names=[self.test_widget5.param_name], + # callback=self.on_params_service + # ) + self.params_service.set_params( widget=self.test_widget5, - param_names=[self.test_widget5.param_name], + params={self.test_widget5.param_name: 10}, callback=self.on_params_service ) diff --git a/params_service.py b/params_service.py index ceb9c0e..13c4bb1 100644 --- a/params_service.py +++ b/params_service.py @@ -155,17 +155,27 @@ class ParamsService(QObject): def _send_request(self, request: Request): """发送请求到服务器""" try: - self.pending_requests[request.token] = request + match request.cmd: + case CMD.GET_PARAMS: + self.pending_requests[request.token] = request - request_data = { - "cmd": "get_params", - "token": request.token, - "data": request.data - } - - json_data = json.dumps(request_data) - self.socket.write(json_data.encode('utf-8')) - self.socket.flush() + request_data = { + "cmd": "get_params", + "token": request.token, + "data": request.data + } + json_data = json.dumps(request_data) + self.socket.write(json_data.encode('utf-8')) + self.socket.flush() + case CMD.SET_PARAMS: + request_data = { + "cmd": "set_params", + "token": request.token, + "data": request.data + } + json_data = json.dumps(request_data) + self.socket.write(json_data.encode('utf-8')) + self.socket.flush() except Exception as e: print(f"Error sending request: {e}") @@ -235,6 +245,7 @@ class ParamsService(QObject): token = self.generate_token() request = Request( token=token, + cmd=CMD.SET_PARAMS, widget=widget, data={"params": params}, callback=callback