Workaround for LS ui data model updates

This commit is contained in:
elecpower
2020-09-24 06:24:12 +10:00
parent 0922e56f0b
commit 8eceebd779
3 changed files with 31 additions and 21 deletions
+29 -15
View File
@@ -174,6 +174,7 @@ void LogicalSwitchesPanel::onFunctionChanged()
if (model->logicalSw[i].func == newFunc) if (model->logicalSw[i].func == newFunc)
return; return;
unsigned oldFunc = model->logicalSw[i].func;
CSFunctionFamily oldFuncFamily = model->logicalSw[i].getFunctionFamily(); CSFunctionFamily oldFuncFamily = model->logicalSw[i].getFunctionFamily();
model->logicalSw[i].func = newFunc; model->logicalSw[i].func = newFunc;
CSFunctionFamily newFuncFamily = model->logicalSw[i].getFunctionFamily(); CSFunctionFamily newFuncFamily = model->logicalSw[i].getFunctionFamily();
@@ -190,11 +191,30 @@ void LogicalSwitchesPanel::onFunctionChanged()
} }
} }
updateLine(i); if (oldFunc == LS_FN_OFF || newFunc == LS_FN_OFF)
updateCBLists();
emit modified(); emit modified();
} }
} }
void LogicalSwitchesPanel::updateCBLists()
{
// We need to update the data models as (de)activating the current LS needs to be reflected in all LS source and switch lists
// However triggering after the input or mix edit dialogs displayed causes the application to crash
// So this workaround gives time for other events to be processed before refreshing
// Not sure if this an OS related issue or a QT bug in QT 5.7 (and higher?)
// The delay is abitary
QTimer::singleShot(1000, this, &LogicalSwitchesPanel::updateDataModels);
}
void LogicalSwitchesPanel::updateDataModels()
{
// This is inconsistent but needed as part of the workaround
//emit updateCBLists(); adds to the event stack so call direct
rawSourceModel->update();
rawSwitchModel->update();
}
void LogicalSwitchesPanel::onV1Changed(int value) void LogicalSwitchesPanel::onV1Changed(int value)
{ {
if (!lock) { if (!lock) {
@@ -347,7 +367,7 @@ void LogicalSwitchesPanel::updateLine(int i)
cbFunction[i]->setCurrentIndex(cbFunction[i]->findData(model->logicalSw[i].func)); cbFunction[i]->setCurrentIndex(cbFunction[i]->findData(model->logicalSw[i].func));
cbAndSwitch[i]->setCurrentIndex(cbAndSwitch[i]->findData(RawSwitch(model->logicalSw[i].andsw).toValue())); cbAndSwitch[i]->setCurrentIndex(cbAndSwitch[i]->findData(RawSwitch(model->logicalSw[i].andsw).toValue()));
//if (!model->logicalSw[i].isEmpty()) { if (!model->logicalSw[i].isEmpty()) {
mask = LINE_ENABLED | DELAY_ENABLED | DURATION_ENABLED; mask = LINE_ENABLED | DELAY_ENABLED | DURATION_ENABLED;
switch (model->logicalSw[i].getFunctionFamily()) switch (model->logicalSw[i].getFunctionFamily())
@@ -417,7 +437,7 @@ void LogicalSwitchesPanel::updateLine(int i)
updateTimerParam(dsbOffset[i], model->logicalSw[i].val2, 0.1); updateTimerParam(dsbOffset[i], model->logicalSw[i].val2, 0.1);
break; break;
} }
//} }
cbSource1[i]->setVisible(mask & SOURCE1_VISIBLE); cbSource1[i]->setVisible(mask & SOURCE1_VISIBLE);
cbSource2[i]->setVisible(mask & SOURCE2_VISIBLE); cbSource2[i]->setVisible(mask & SOURCE2_VISIBLE);
@@ -487,8 +507,7 @@ void LogicalSwitchesPanel::cmPaste()
QByteArray data; QByteArray data;
if (hasClipboardData(&data)) { if (hasClipboardData(&data)) {
memcpy(&model->logicalSw[selectedIndex], data.constData(), sizeof(LogicalSwitchData)); memcpy(&model->logicalSw[selectedIndex], data.constData(), sizeof(LogicalSwitchData));
emit updateDataModels(); updateCBLists();
updateLine(selectedIndex);
emit modified(); emit modified();
} }
} }
@@ -502,8 +521,7 @@ void LogicalSwitchesPanel::cmDelete()
model->logicalSw[lsCapability - 1].clear(); model->logicalSw[lsCapability - 1].clear();
model->updateAllReferences(ModelData::REF_UPD_TYPE_LOGICAL_SWITCH, ModelData::REF_UPD_ACT_SHIFT, selectedIndex, 0, -1); model->updateAllReferences(ModelData::REF_UPD_TYPE_LOGICAL_SWITCH, ModelData::REF_UPD_ACT_SHIFT, selectedIndex, 0, -1);
emit updateDataModels(); updateCBLists();
update();
emit modified(); emit modified();
} }
@@ -593,8 +611,7 @@ void LogicalSwitchesPanel::cmClear(bool prompt)
model->logicalSw[selectedIndex].clear(); model->logicalSw[selectedIndex].clear();
model->updateAllReferences(ModelData::REF_UPD_TYPE_LOGICAL_SWITCH, ModelData::REF_UPD_ACT_CLEAR, selectedIndex); model->updateAllReferences(ModelData::REF_UPD_TYPE_LOGICAL_SWITCH, ModelData::REF_UPD_ACT_CLEAR, selectedIndex);
update(); updateCBLists();
emit updateDataModels();
emit modified(); emit modified();
} }
@@ -607,8 +624,7 @@ void LogicalSwitchesPanel::cmClearAll()
model->logicalSw[i].clear(); model->logicalSw[i].clear();
model->updateAllReferences(ModelData::REF_UPD_TYPE_LOGICAL_SWITCH, ModelData::REF_UPD_ACT_CLEAR, i); model->updateAllReferences(ModelData::REF_UPD_TYPE_LOGICAL_SWITCH, ModelData::REF_UPD_ACT_CLEAR, i);
} }
update(); updateCBLists();
emit updateDataModels();
emit modified(); emit modified();
} }
@@ -617,8 +633,7 @@ void LogicalSwitchesPanel::cmInsert()
memmove(&model->logicalSw[selectedIndex + 1], &model->logicalSw[selectedIndex], (CPN_MAX_LOGICAL_SWITCHES - (selectedIndex + 1)) * sizeof(LogicalSwitchData)); memmove(&model->logicalSw[selectedIndex + 1], &model->logicalSw[selectedIndex], (CPN_MAX_LOGICAL_SWITCHES - (selectedIndex + 1)) * sizeof(LogicalSwitchData));
model->logicalSw[selectedIndex].clear(); model->logicalSw[selectedIndex].clear();
model->updateAllReferences(ModelData::REF_UPD_TYPE_LOGICAL_SWITCH, ModelData::REF_UPD_ACT_SHIFT, selectedIndex, 0, 1); model->updateAllReferences(ModelData::REF_UPD_TYPE_LOGICAL_SWITCH, ModelData::REF_UPD_ACT_SHIFT, selectedIndex, 0, 1);
update(); updateCBLists();
emit updateDataModels();
emit modified(); emit modified();
} }
@@ -631,8 +646,7 @@ void LogicalSwitchesPanel::swapData(int idx1, int idx2)
memcpy(lsw2, lsw1, sizeof(LogicalSwitchData)); memcpy(lsw2, lsw1, sizeof(LogicalSwitchData));
memcpy(lsw1, &lstmp, sizeof(LogicalSwitchData)); memcpy(lsw1, &lstmp, sizeof(LogicalSwitchData));
model->updateAllReferences(ModelData::REF_UPD_TYPE_LOGICAL_SWITCH, ModelData::REF_UPD_ACT_SWAP, idx1, idx2); model->updateAllReferences(ModelData::REF_UPD_TYPE_LOGICAL_SWITCH, ModelData::REF_UPD_ACT_SWAP, idx1, idx2);
update(); updateCBLists();
emit updateDataModels();
emit modified(); emit modified();
} }
} }
+2 -3
View File
@@ -65,9 +65,6 @@ class LogicalSwitchesPanel : public ModelPanel
void onModelDataAboutToBeUpdated(); void onModelDataAboutToBeUpdated();
void onModelDataUpdateComplete(); void onModelDataUpdateComplete();
signals:
void updateDataModels();
private: private:
QComboBox * cbFunction[CPN_MAX_LOGICAL_SWITCHES]; QComboBox * cbFunction[CPN_MAX_LOGICAL_SWITCHES];
QDoubleSpinBox * dsbValue[CPN_MAX_LOGICAL_SWITCHES]; QDoubleSpinBox * dsbValue[CPN_MAX_LOGICAL_SWITCHES];
@@ -92,6 +89,8 @@ class LogicalSwitchesPanel : public ModelPanel
bool moveDownAllowed() const; bool moveDownAllowed() const;
bool moveUpAllowed() const; bool moveUpAllowed() const;
int modelsUpdateCnt; int modelsUpdateCnt;
void updateCBLists();
void updateDataModels();
}; };
#endif // _LOGICALSWITCHES_H_ #endif // _LOGICALSWITCHES_H_
-3
View File
@@ -122,9 +122,6 @@ ModelEdit::ModelEdit(QWidget * parent, RadioData & radioData, int modelId, Firmw
connect(curvesPanel, &CurvesPanel::updateDataModels, curveModel, &CurveItemModel::update); connect(curvesPanel, &CurvesPanel::updateDataModels, curveModel, &CurveItemModel::update);
connect(logicalSwitchesPanel, &LogicalSwitchesPanel::updateDataModels, rawSourceModel, &RawSourceItemModel::update);
connect(logicalSwitchesPanel, &LogicalSwitchesPanel::updateDataModels, rawSwitchModel, &RawSwitchItemModel::update);
connect(ui->tabWidget, &QTabWidget::currentChanged, this, &ModelEdit::onTabIndexChanged); connect(ui->tabWidget, &QTabWidget::currentChanged, this, &ModelEdit::onTabIndexChanged);
connect(ui->pushButton, &QPushButton::clicked, this, &ModelEdit::launchSimulation); connect(ui->pushButton, &QPushButton::clicked, this, &ModelEdit::launchSimulation);