piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Add back refresh line on LS func change and cosmetics

Browse Source
This commit is contained in:
elecpower
2020-09-24 06:42:10 +10:00
parent 8eceebd779
commit 1364a88eb0
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/modeledit/logicalswitches.cpp
+20 -18
View File
@@ -193,28 +193,12 @@ void LogicalSwitchesPanel::onFunctionChanged()
if (oldFunc == LS_FN_OFF || newFunc == LS_FN_OFF)
updateCBLists();
else
updateLine(i);
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)
{
if (!lock) {
@@ -651,6 +635,24 @@ void LogicalSwitchesPanel::swapData(int idx1, int idx2)
}
}
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::onModelDataAboutToBeUpdated()
{
lock = true;