kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2026-10-25 23:54:22 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix PLC table dangling reference warning and row deletion

Browse Source
This commit is contained in:
Kellermorph
2026-08-22 16:42:13 +02:00
parent 56464629bf
commit 4edd4932bb
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/editor/ui/elementpropertieseditorwidget.cpp
+1 -1
View File
@@ -690,7 +690,7 @@ void ElementPropertiesEditorWidget::createPlcConfigWidgets()
m_plc_table->horizontalHeader()->resizeSection(2, 150);
m_plc_table->horizontalHeader()->resizeSection(3, 150);
m_plc_table->horizontalHeader()->resizeSection(4, 100);
m_plc_table->setSelectionBehavior(QAbstractItemView::SelectItems);
m_plc_table->setSelectionBehavior(QAbstractItemView::SelectRows);
m_plc_table->setSelectionMode(QAbstractItemView::ExtendedSelection);
m_plc_table->setMinimumHeight(200);
m_plc_table->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
sources/ui/masterpropertieswidget.cpp
+4 -3
View File
@@ -976,7 +976,8 @@ void MasterPropertiesWidget::plcUpdateDisplaySettings()
// Preserve existing display settings
ElementData ed = m_element->elementData();
ElementData::PlcMasterData plc_data = ed.plcMasterData();
const auto orig_plc = ed.plcMasterData();
ElementData::PlcMasterData plc_data = orig_plc;
plc_data.ios.clear();
// Read IOs from table, preserving terminal data from original IOs by row index
@@ -1007,8 +1008,8 @@ void MasterPropertiesWidget::plcUpdateDisplaySettings()
// This avoids address-based lookup which fails when all addresses
// are empty (common in PLC masters) — a hash collision would cause
// only the last IO's terminals to be used for all rows.
if (row < ed.plcMasterData().ios.size()) {
const auto &orig_io = ed.plcMasterData().ios.at(row);
if (row < orig_plc.ios.size()) {
const auto &orig_io = orig_plc.ios.at(row);
io.terminalCount = orig_io.terminalCount;
io.terminals = orig_io.terminals;
}