Fix remaining model editor sync issues with RawSource changes. (#5936)
* [Companion] Fix RawSource updates in Custom Function selectors (part fix for #4917). * [Companion] Fix RawSource updates in HeliPanel selectors (closes #4917).
This commit is contained in:
committed by
Bertrand Songis
parent
9796654816
commit
3af2b090e5
@@ -69,6 +69,9 @@ void RepeatComboBox::update()
|
|||||||
CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData * model, GeneralSettings & generalSettings, Firmware * firmware):
|
CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData * model, GeneralSettings & generalSettings, Firmware * firmware):
|
||||||
GenericPanel(parent, model, generalSettings, firmware),
|
GenericPanel(parent, model, generalSettings, firmware),
|
||||||
functions(model ? model->customFn : generalSettings.customFn),
|
functions(model ? model->customFn : generalSettings.customFn),
|
||||||
|
rawSwitchItemModel(NULL),
|
||||||
|
rawSrcInputsItemModel(NULL),
|
||||||
|
rawSrcAllItemModel(NULL),
|
||||||
mediaPlayerCurrent(-1),
|
mediaPlayerCurrent(-1),
|
||||||
mediaPlayer(NULL)
|
mediaPlayer(NULL)
|
||||||
{
|
{
|
||||||
@@ -76,11 +79,7 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData * model,
|
|||||||
lock = true;
|
lock = true;
|
||||||
int num_fsw = model ? firmware->getCapability(CustomFunctions) : firmware->getCapability(GlobalFunctions);
|
int num_fsw = model ? firmware->getCapability(CustomFunctions) : firmware->getCapability(GlobalFunctions);
|
||||||
|
|
||||||
rawSwitchItemModel = new RawSwitchFilterItemModel(&generalSettings, model, model ? SpecialFunctionsContext : GlobalFunctionsContext);
|
setDataModels();
|
||||||
rawSrcInputsItemModel = Helpers::getRawSourceItemModel(&generalSettings, model, POPULATE_NONE|POPULATE_SOURCES|POPULATE_VIRTUAL_INPUTS|POPULATE_TRIMS|POPULATE_SWITCHES);
|
|
||||||
rawSrcInputsItemModel->setParent(this);
|
|
||||||
rawSrcAllItemModel = Helpers::getRawSourceItemModel(&generalSettings, model, POPULATE_NONE|POPULATE_SOURCES|POPULATE_VIRTUAL_INPUTS|POPULATE_SWITCHES|POPULATE_GVARS|POPULATE_TRIMS|POPULATE_TELEMETRY|POPULATE_TELEMETRYEXT|POPULATE_SCRIPT_OUTPUTS);
|
|
||||||
rawSrcAllItemModel->setParent(this);
|
|
||||||
|
|
||||||
if (!firmware->getCapability(VoicesAsNumbers)) {
|
if (!firmware->getCapability(VoicesAsNumbers)) {
|
||||||
tracksSet = getFilesSet(getSoundsPath(generalSettings), QStringList() << "*.wav" << "*.WAV", firmware->getCapability(VoicesMaxLength));
|
tracksSet = getFilesSet(getSoundsPath(generalSettings), QStringList() << "*.wav" << "*.WAV", firmware->getCapability(VoicesMaxLength));
|
||||||
@@ -251,6 +250,26 @@ CustomFunctionsPanel::~CustomFunctionsPanel()
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CustomFunctionsPanel::setDataModels()
|
||||||
|
{
|
||||||
|
if (rawSwitchItemModel)
|
||||||
|
rawSwitchItemModel->update();
|
||||||
|
else
|
||||||
|
rawSwitchItemModel = new RawSwitchFilterItemModel(&generalSettings, model, model ? SpecialFunctionsContext : GlobalFunctionsContext);
|
||||||
|
|
||||||
|
// The RawSource item models have to be reloaded on every update(). TODO: convert to filtered model like for RawSwitches
|
||||||
|
|
||||||
|
if (rawSrcInputsItemModel)
|
||||||
|
rawSrcInputsItemModel->deleteLater();
|
||||||
|
if (rawSrcAllItemModel)
|
||||||
|
rawSrcAllItemModel->deleteLater();
|
||||||
|
|
||||||
|
rawSrcInputsItemModel = Helpers::getRawSourceItemModel(&generalSettings, model, POPULATE_NONE|POPULATE_SOURCES|POPULATE_VIRTUAL_INPUTS|POPULATE_TRIMS|POPULATE_SWITCHES);
|
||||||
|
rawSrcInputsItemModel->setParent(this);
|
||||||
|
rawSrcAllItemModel = Helpers::getRawSourceItemModel(&generalSettings, model, POPULATE_NONE|POPULATE_SOURCES|POPULATE_VIRTUAL_INPUTS|POPULATE_SWITCHES|POPULATE_GVARS|POPULATE_TRIMS|POPULATE_TELEMETRY|POPULATE_TELEMETRYEXT|POPULATE_SCRIPT_OUTPUTS);
|
||||||
|
rawSrcAllItemModel->setParent(this);
|
||||||
|
}
|
||||||
|
|
||||||
void CustomFunctionsPanel::onMediaPlayerStateChanged(QMediaPlayer::State state)
|
void CustomFunctionsPanel::onMediaPlayerStateChanged(QMediaPlayer::State state)
|
||||||
{
|
{
|
||||||
if (!lock) {
|
if (!lock) {
|
||||||
@@ -589,7 +608,7 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
|
|||||||
|
|
||||||
void CustomFunctionsPanel::update()
|
void CustomFunctionsPanel::update()
|
||||||
{
|
{
|
||||||
rawSwitchItemModel->update();
|
setDataModels();
|
||||||
|
|
||||||
lock = true;
|
lock = true;
|
||||||
int num_fsw = model ? firmware->getCapability(CustomFunctions) : firmware->getCapability(GlobalFunctions);
|
int num_fsw = model ? firmware->getCapability(CustomFunctions) : firmware->getCapability(GlobalFunctions);
|
||||||
|
|||||||
@@ -60,6 +60,7 @@ class CustomFunctionsPanel : public GenericPanel
|
|||||||
CustomFunctionData * functions;
|
CustomFunctionData * functions;
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
|
void setDataModels();
|
||||||
void customFunctionEdited();
|
void customFunctionEdited();
|
||||||
void functionEdited();
|
void functionEdited();
|
||||||
void fsw_customContextMenuRequested(QPoint pos);
|
void fsw_customContextMenuRequested(QPoint pos);
|
||||||
|
|||||||
@@ -24,12 +24,12 @@
|
|||||||
|
|
||||||
HeliPanel::HeliPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings, Firmware * firmware):
|
HeliPanel::HeliPanel(QWidget *parent, ModelData & model, GeneralSettings & generalSettings, Firmware * firmware):
|
||||||
ModelPanel(parent, model, generalSettings, firmware),
|
ModelPanel(parent, model, generalSettings, firmware),
|
||||||
ui(new Ui::Heli)
|
ui(new Ui::Heli),
|
||||||
|
rawSourceItemModel(nullptr)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
rawSourceItemModel = Helpers::getRawSourceItemModel(&generalSettings, &model, POPULATE_NONE | POPULATE_SOURCES | POPULATE_VIRTUAL_INPUTS | POPULATE_SWITCHES | POPULATE_TRIMS);
|
setDataModels();
|
||||||
rawSourceItemModel->setParent(this);
|
|
||||||
|
|
||||||
connect(ui->swashType, SIGNAL(currentIndexChanged(int)), this, SLOT(edited()));
|
connect(ui->swashType, SIGNAL(currentIndexChanged(int)), this, SLOT(edited()));
|
||||||
connect(ui->swashRingVal, SIGNAL(editingFinished()), this, SLOT(edited()));
|
connect(ui->swashRingVal, SIGNAL(editingFinished()), this, SLOT(edited()));
|
||||||
@@ -66,9 +66,19 @@ HeliPanel::~HeliPanel()
|
|||||||
delete ui;
|
delete ui;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void HeliPanel::setDataModels()
|
||||||
|
{
|
||||||
|
if (rawSourceItemModel)
|
||||||
|
rawSourceItemModel->deleteLater();
|
||||||
|
|
||||||
|
rawSourceItemModel = Helpers::getRawSourceItemModel(&generalSettings, model, POPULATE_NONE | POPULATE_SOURCES | POPULATE_VIRTUAL_INPUTS | POPULATE_SWITCHES | POPULATE_TRIMS);
|
||||||
|
rawSourceItemModel->setParent(this);
|
||||||
|
}
|
||||||
|
|
||||||
void HeliPanel::update()
|
void HeliPanel::update()
|
||||||
{
|
{
|
||||||
lock = true;
|
lock = true;
|
||||||
|
setDataModels();
|
||||||
|
|
||||||
ui->swashType->setCurrentIndex(model->swashRingData.type);
|
ui->swashType->setCurrentIndex(model->swashRingData.type);
|
||||||
ui->swashCollectiveSource->setModel(rawSourceItemModel);
|
ui->swashCollectiveSource->setModel(rawSourceItemModel);
|
||||||
|
|||||||
@@ -37,6 +37,7 @@ class HeliPanel : public ModelPanel
|
|||||||
void update();
|
void update();
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
|
void setDataModels();
|
||||||
void edited();
|
void edited();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|||||||
Reference in New Issue
Block a user