From 8e8498be73adc96f2caf20a35af86d9b88139a98 Mon Sep 17 00:00:00 2001 From: FrankCV2048 <1395405735@qq.com> Date: Thu, 12 Dec 2024 22:02:35 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=9B=B4=E6=96=B0=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Config/FeedLine.ini | 4 ++-- main.py | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Config/FeedLine.ini b/Config/FeedLine.ini index ba2ae06..5ab633b 100644 --- a/Config/FeedLine.ini +++ b/Config/FeedLine.ini @@ -20,8 +20,8 @@ id = 2 name = 未定义 [Position3] -x = 0.0 -y = 0.0 +x = 1.0 +y = 2.0 z = 0.0 u = 0.0 v = 0.0 diff --git a/main.py b/main.py index c526d7e..d491af7 100644 --- a/main.py +++ b/main.py @@ -247,6 +247,7 @@ class MainWindow(QMainWindow, Ui_MainWindow): # self.tableWidget_lines.setItem(0, 0, QTableWidgetItem("线1")) # self.tableWidget_lines.setItem(1, 0, QTableWidgetItem("线2")) # self.tableWidget_lines.setItem() + self.tableWidget_lines.blockSignals(True) self.selected_line_section = '' self.table_line_changed = False self.table_position_changed = False @@ -263,7 +264,7 @@ class MainWindow(QMainWindow, Ui_MainWindow): self.selected_line_section = '' self.tableWidget_line_positions.setRowCount(0) - + self.tableWidget_lines.blockSignals(False) def show_lines_context_menu(self): menu = QMenu(self) action_add = menu.addAction("添加投料线") @@ -311,6 +312,8 @@ class MainWindow(QMainWindow, Ui_MainWindow): else: # 重新初始化· self.init_table_lines_data() + self.table_line_changed = False + self.table_position_changed = False line_name = self.tableWidget_lines.item(line_index,0).text() line_model = self.feedLine_dict.get(line_name) self.init_table_positions_data(line_model.positions) @@ -339,10 +342,12 @@ class MainWindow(QMainWindow, Ui_MainWindow): self.tableWidget_line_positions.customContextMenuRequested.connect(self.show_positions_context_menu) self.tableWidget_line_positions.cellChanged.connect(self.send_table_line_position_cell_changed) def init_table_positions_data(self,position_list): + self.tableWidget_line_positions.blockSignals(True) self.tableWidget_line_positions.setRowCount(0) for index,position_model in enumerate(position_list): self.tableWidget_line_positions.insertRow(self.tableWidget_line_positions.rowCount()) self.set_positionModel_to_tabel(index,position_model) + self.tableWidget_line_positions.blockSignals(False) def show_positions_context_menu(self): menu = QMenu(self)