fix(radio): multiplex setting is not valid for 1st line in a mix (#5465)

This commit is contained in:
philmoz
2024-08-26 20:53:55 +10:00
committed by GitHub
parent 262edf1a6b
commit 2be160f1d2
10 changed files with 51 additions and 40 deletions
+6 -1
View File
@@ -27,7 +27,7 @@
#include "namevalidator.h"
#include "sourcenumref.h"
MixerDialog::MixerDialog(QWidget *parent, ModelData & model, MixData * mixdata, GeneralSettings & generalSettings, Firmware * firmware,
MixerDialog::MixerDialog(QWidget *parent, ModelData & model, MixData * mixdata, int index, GeneralSettings & generalSettings, Firmware * firmware,
CompoundItemModelFactory * sharedItemModels) :
QDialog(parent),
ui(new Ui::MixerDialog),
@@ -94,6 +94,11 @@ MixerDialog::MixerDialog(QWidget *parent, ModelData & model, MixData * mixdata,
ui->label_MixDR->hide();
}
if (index == 0 || model.mixData[index - 1].destCh != mixdata->destCh) {
ui->mltpxCB->hide();
ui->mltpxLbl->hide();
}
if (!firmware->getCapability(VirtualInputs)) {
for(int i = 0; i < CPN_MAX_STICKS; i++) {
ui->trimCB->addItem(Boards::getInputName(i, board));
+1 -1
View File
@@ -37,7 +37,7 @@ namespace Ui {
class MixerDialog : public QDialog {
Q_OBJECT
public:
MixerDialog(QWidget *parent, ModelData & model, MixData *mixdata, GeneralSettings & generalSettings, Firmware * firmware,
MixerDialog(QWidget *parent, ModelData & model, MixData *mixdata, int index, GeneralSettings & generalSettings, Firmware * firmware,
CompoundItemModelFactory * sharedItemModels);
~MixerDialog();
+1 -1
View File
@@ -165,7 +165,7 @@
</widget>
</item>
<item row="10" column="0">
<widget class="QLabel" name="label_7">
<widget class="QLabel" name="mltpxLbl">
<property name="text">
<string>Multiplex</string>
</property>
+1 -1
View File
@@ -184,7 +184,7 @@ void MixesPanel::gm_openMix(int index)
MixData mixd(model->mixData[index]);
MixerDialog *dlg = new MixerDialog(this, *model, &mixd, generalSettings, firmware, sharedItemModels);
MixerDialog *dlg = new MixerDialog(this, *model, &mixd, index, generalSettings, firmware, sharedItemModels);
if(dlg->exec()) {
model->mixData[index] = mixd;
emit modified();
+1 -4
View File
@@ -416,10 +416,7 @@ QString ModelPrinter::printMixerLine(const MixData & mix, bool showMultiplex, in
}
str += "&nbsp;" + source;
if (mix.mltpx == MLTPX_MUL && !showMultiplex)
str += " " + tr("MULT!").toHtmlEscaped();
else
str += " " + tr("Weight(%1)").arg(SourceNumRef(mix.weight).toString(&model, &generalSettings)).toHtmlEscaped();
str += " " + tr("Weight(%1)").arg(SourceNumRef(mix.weight).toString(&model, &generalSettings)).toHtmlEscaped();
QString flightModesStr = printFlightModes(mix.flightModes);
if (!flightModesStr.isEmpty())