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

update 更新表格修改逻辑

Browse Source
This commit is contained in:
FrankCV2048
2024-12-12 22:02:35 +08:00
parent ad90c9f1f6
commit 8e8498be73
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Config/FeedLine.ini
View File

@ -20,8 +20,8 @@ id = 2
name = 未定义 name = 未定义
[Position3] [Position3]
x = 0.0 x = 1.0
y = 0.0 y = 2.0
z = 0.0 z = 0.0
u = 0.0 u = 0.0
v = 0.0 v = 0.0

7
main.py
View File

@ -247,6 +247,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
# self.tableWidget_lines.setItem(0, 0, QTableWidgetItem("线1")) # self.tableWidget_lines.setItem(0, 0, QTableWidgetItem("线1"))
# self.tableWidget_lines.setItem(1, 0, QTableWidgetItem("线2")) # self.tableWidget_lines.setItem(1, 0, QTableWidgetItem("线2"))
# self.tableWidget_lines.setItem() # self.tableWidget_lines.setItem()
self.tableWidget_lines.blockSignals(True)
self.selected_line_section = '' self.selected_line_section = ''
self.table_line_changed = False self.table_line_changed = False
self.table_position_changed = False self.table_position_changed = False
@ -263,7 +264,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
self.selected_line_section = '' self.selected_line_section = ''
self.tableWidget_line_positions.setRowCount(0) self.tableWidget_line_positions.setRowCount(0)
self.tableWidget_lines.blockSignals(False)
def show_lines_context_menu(self): def show_lines_context_menu(self):
menu = QMenu(self) menu = QMenu(self)
action_add = menu.addAction("添加投料线") action_add = menu.addAction("添加投料线")
@ -311,6 +312,8 @@ class MainWindow(QMainWindow, Ui_MainWindow):
else: else:
# 重新初始化· # 重新初始化·
self.init_table_lines_data() 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_name = self.tableWidget_lines.item(line_index,0).text()
line_model = self.feedLine_dict.get(line_name) line_model = self.feedLine_dict.get(line_name)
self.init_table_positions_data(line_model.positions) 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.customContextMenuRequested.connect(self.show_positions_context_menu)
self.tableWidget_line_positions.cellChanged.connect(self.send_table_line_position_cell_changed) self.tableWidget_line_positions.cellChanged.connect(self.send_table_line_position_cell_changed)
def init_table_positions_data(self,position_list): def init_table_positions_data(self,position_list):
self.tableWidget_line_positions.blockSignals(True)
self.tableWidget_line_positions.setRowCount(0) self.tableWidget_line_positions.setRowCount(0)
for index,position_model in enumerate(position_list): for index,position_model in enumerate(position_list):
self.tableWidget_line_positions.insertRow(self.tableWidget_line_positions.rowCount()) self.tableWidget_line_positions.insertRow(self.tableWidget_line_positions.rowCount())
self.set_positionModel_to_tabel(index,position_model) self.set_positionModel_to_tabel(index,position_model)
self.tableWidget_line_positions.blockSignals(False)
def show_positions_context_menu(self): def show_positions_context_menu(self):
menu = QMenu(self) menu = QMenu(self)