Support of current EEPROM inside Companion. Some more code around
EEPROMS export removed (needed to be fixed, so I preferred to remove in the same commit).
This commit is contained in:
@@ -17,7 +17,9 @@ MixerDialog::MixerDialog(QWidget *parent, MixData *mixdata, int stickMode) :
|
||||
this->setWindowTitle(tr("DEST -> X%1").arg(md->destCh-GetEepromInterface()->getCapability(Outputs)));
|
||||
else
|
||||
this->setWindowTitle(tr("DEST -> CH%1%2").arg(md->destCh/10).arg(md->destCh%10));
|
||||
|
||||
populateSourceCB(ui->sourceCB, md->srcRaw, POPULATE_SOURCES | POPULATE_SWITCHES | (GetEepromInterface()->getCapability(ExtraTrims) ? POPULATE_TRIMS : 0) | (GetEepromInterface()->getCapability(GvarsAsSources) ? POPULATE_GVARS : 0));
|
||||
|
||||
ui->sourceCB->removeItem(0);
|
||||
int limit=GetEepromInterface()->getCapability(OffsetWeight);
|
||||
if (GetEepromInterface()->getCapability(GvarsAsWeight)) {
|
||||
@@ -32,20 +34,15 @@ MixerDialog::MixerDialog(QWidget *parent, MixData *mixdata, int stickMode) :
|
||||
if (gvars==0) {
|
||||
ui->offsetGV->setDisabled(true);
|
||||
ui->weightGV->setDisabled(true);
|
||||
ui->differentialGV->setDisabled(true);
|
||||
if (md->weight>limit || md->weight<-limit) {
|
||||
md->weight=100;
|
||||
}
|
||||
if (md->sOffset>limit || md->sOffset<-limit) {
|
||||
md->sOffset=0;
|
||||
}
|
||||
if (md->differential>100 || md->weight<-100) {
|
||||
md->differential=0;
|
||||
}
|
||||
}
|
||||
populateGVCB(ui->offsetCB,md->sOffset);
|
||||
populateGVCB(ui->weightCB,md->weight);
|
||||
populateGVCB(ui->differentialCB,md->differential);
|
||||
ui->weightSB->setMinimum(-limit);
|
||||
ui->weightSB->setMaximum(limit);
|
||||
if (md->weight>limit || md->weight<-limit) {
|
||||
@@ -65,57 +62,33 @@ MixerDialog::MixerDialog(QWidget *parent, MixData *mixdata, int stickMode) :
|
||||
ui->offsetGV->setChecked(true);
|
||||
ui->offsetSB->hide();
|
||||
ui->offsetCB->show();
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
ui->offsetGV->setChecked(false);
|
||||
ui->offsetSB->setValue(md->sOffset);
|
||||
ui->offsetSB->show();
|
||||
ui->offsetCB->hide();
|
||||
}
|
||||
|
||||
ui->differentialSB->setMinimum(-100);
|
||||
ui->differentialSB->setMaximum(100);
|
||||
if (md->differential>100 || md->differential<-100) {
|
||||
ui->differentialGV->setChecked(true);
|
||||
ui->differentialSB->hide();
|
||||
ui->differentialCB->show();
|
||||
} else {
|
||||
ui->differentialGV->setChecked(false);
|
||||
ui->differentialSB->setValue(md->differential);
|
||||
ui->differentialSB->show();
|
||||
ui->differentialCB->hide();
|
||||
}
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
ui->offsetGV->hide();
|
||||
ui->weightGV->hide();
|
||||
ui->differentialGV->hide();
|
||||
ui->offsetSB->setMinimum(-limit);
|
||||
ui->offsetSB->setMaximum(limit);
|
||||
ui->offsetSB->setValue(md->sOffset);
|
||||
ui->differentialSB->setMinimum(-100);
|
||||
ui->differentialSB->setMaximum(100);
|
||||
ui->differentialSB->setValue(md->differential);
|
||||
ui->weightSB->setMinimum(-limit);
|
||||
ui->weightSB->setMaximum(limit);
|
||||
ui->weightSB->setValue(md->weight);
|
||||
}
|
||||
|
||||
populateCurveReference(ui->curveTypeCB, ui->curveGVarCB, ui->curveValueCB, ui->curveValueSB, md->curve, 0);
|
||||
|
||||
ui->FixOffsetChkB->setChecked(md->lateOffset);
|
||||
ui->MixDR_CB->setChecked(md->noExpo==0);
|
||||
if (md->enableFmTrim==1) {
|
||||
ui->label_4->setText(tr("FM Trim Value"));
|
||||
}
|
||||
else {
|
||||
ui->label_4->setText(tr("Offset"));
|
||||
}
|
||||
if (!GetEepromInterface()->getCapability(MixesWithoutExpo)) {
|
||||
ui->MixDR_CB->hide();
|
||||
ui->label_MixDR->hide();
|
||||
}
|
||||
if (!GetEepromInterface()->getCapability(MixFmTrim)) {
|
||||
ui->FMtrimChkB->hide();
|
||||
ui->label_FMtrim->hide();
|
||||
ui->label_4->setText(tr("Offset"));
|
||||
}
|
||||
if (!GetEepromInterface()->getCapability(HasFixOffset)) {
|
||||
ui->FixOffsetChkB->hide();
|
||||
ui->label_FixOffset->hide();
|
||||
@@ -127,12 +100,6 @@ MixerDialog::MixerDialog(QWidget *parent, MixData *mixdata, int stickMode) :
|
||||
ui->trimCB->addItem(tr("Ail"),4);
|
||||
}
|
||||
ui->trimCB->setCurrentIndex((-md->carryTrim)+1);
|
||||
if (!GetEepromInterface()->getCapability(DiffMixers)) {
|
||||
ui->differentialGV->hide();
|
||||
ui->differentialSB->hide();
|
||||
ui->differentialCB->hide();
|
||||
ui->label_curve->setText(tr("Curve"));
|
||||
}
|
||||
int namelength=GetEepromInterface()->getCapability(HasMixerNames);
|
||||
if (!namelength) {
|
||||
ui->label_name->hide();
|
||||
@@ -146,7 +113,8 @@ MixerDialog::MixerDialog(QWidget *parent, MixData *mixdata, int stickMode) :
|
||||
lb_fp[i]->hide();
|
||||
cb_fp[i]->hide();
|
||||
}
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
int mask=1;
|
||||
for (int i=0; i<9 ; i++) {
|
||||
if ((md->phases & mask)==0) {
|
||||
@@ -159,9 +127,10 @@ MixerDialog::MixerDialog(QWidget *parent, MixData *mixdata, int stickMode) :
|
||||
cb_fp[i]->hide();
|
||||
}
|
||||
}
|
||||
|
||||
ui->mixerName->setValidator(new QRegExpValidator(rx, this));
|
||||
ui->mixerName->setText(md->name);
|
||||
populateCurvesCB(ui->curvesCB,md->curve);
|
||||
|
||||
populateSwitchCB(ui->switchesCB,md->swtch);
|
||||
ui->warningCB->setCurrentIndex(md->mixWarn);
|
||||
ui->mltpxCB->setCurrentIndex(md->mltpx);
|
||||
@@ -190,18 +159,19 @@ MixerDialog::MixerDialog(QWidget *parent, MixData *mixdata, int stickMode) :
|
||||
connect(ui->sourceCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
|
||||
connect(ui->weightCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
|
||||
connect(ui->offsetCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
|
||||
connect(ui->differentialCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
|
||||
|
||||
connect(ui->curveTypeCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
|
||||
connect(ui->curveGVarCB,SIGNAL(stateChanged(int)),this,SLOT(valuesChanged()));
|
||||
connect(ui->curveValueCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
|
||||
connect(ui->curveValueSB,SIGNAL(editingFinished()),this,SLOT(valuesChanged()));
|
||||
|
||||
connect(ui->weightSB,SIGNAL(editingFinished()),this,SLOT(valuesChanged()));
|
||||
connect(ui->offsetSB,SIGNAL(editingFinished()),this,SLOT(valuesChanged()));
|
||||
connect(ui->differentialSB,SIGNAL(editingFinished()),this,SLOT(valuesChanged()));
|
||||
connect(ui->weightGV,SIGNAL(stateChanged(int)),this,SLOT(widgetChanged()));
|
||||
connect(ui->weightGV,SIGNAL(stateChanged(int)),this,SLOT(widgetChanged())); // TODO why the same slot?
|
||||
connect(ui->offsetGV,SIGNAL(stateChanged(int)),this,SLOT(widgetChanged()));
|
||||
connect(ui->differentialGV,SIGNAL(stateChanged(int)),this,SLOT(widgetChanged()));
|
||||
connect(ui->trimCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
|
||||
connect(ui->MixDR_CB,SIGNAL(toggled(bool)),this,SLOT(valuesChanged()));
|
||||
connect(ui->FMtrimChkB,SIGNAL(toggled(bool)),this,SLOT(valuesChanged()));
|
||||
connect(ui->FixOffsetChkB,SIGNAL(toggled(bool)),this,SLOT(valuesChanged()));
|
||||
connect(ui->curvesCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
|
||||
connect(ui->switchesCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
|
||||
connect(ui->warningCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
|
||||
connect(ui->mltpxCB,SIGNAL(currentIndexChanged(int)),this,SLOT(valuesChanged()));
|
||||
@@ -243,15 +213,6 @@ void MixerDialog::widgetChanged()
|
||||
gvars=1;
|
||||
}
|
||||
if (gvars==1) {
|
||||
if (!GetEepromInterface()->getCapability(DiffMixers)) {
|
||||
if (ui->differentialGV->isChecked()) {
|
||||
ui->differentialCB->show();
|
||||
ui->differentialSB->hide();
|
||||
} else {
|
||||
ui->differentialCB->hide();
|
||||
ui->differentialSB->show();
|
||||
}
|
||||
}
|
||||
if (ui->weightGV->isChecked()) {
|
||||
ui->weightCB->show();
|
||||
ui->weightSB->hide();
|
||||
@@ -301,28 +262,15 @@ void MixerDialog::valuesChanged()
|
||||
md->carryTrim = -(ui->trimCB->currentIndex()-1);
|
||||
md->noExpo = ui->MixDR_CB->checkState() ? 0 : 1;
|
||||
md->lateOffset = ui->FixOffsetChkB->checkState() ? 1 : 0;
|
||||
md->enableFmTrim = ui->FMtrimChkB->checkState() ? 1 : 0;
|
||||
int numcurves=GetEepromInterface()->getCapability(NumCurves);
|
||||
if (numcurves==0) {
|
||||
numcurves=16;
|
||||
}
|
||||
if (GetEepromInterface()->getCapability(DiffMixers) && (ui->curvesCB->currentIndex()-(numcurves)*GetEepromInterface()->getCapability(HasNegCurves))==0){
|
||||
ui->differentialGV->show();
|
||||
if (ui->differentialGV->isChecked()) {
|
||||
ui->differentialSB->hide();
|
||||
ui->differentialCB->show();
|
||||
} else {
|
||||
ui->differentialSB->show();
|
||||
ui->differentialCB->hide();
|
||||
}
|
||||
} else {
|
||||
ui->differentialGV->hide();
|
||||
ui->differentialGV->setChecked(false);
|
||||
ui->differentialSB->hide();
|
||||
ui->differentialSB->setValue(0);
|
||||
ui->differentialCB->hide();
|
||||
}
|
||||
md->curve = ui->curvesCB->currentIndex()-(numcurves)*GetEepromInterface()->getCapability(HasNegCurves);
|
||||
|
||||
// TODO md->curve = ui->curvesCB->currentIndex()-(numcurves)*GetEepromInterface()->getCapability(HasNegCurves);
|
||||
// TODO if (ui->differentialGV->isChecked()) {
|
||||
// TODO md->differential = ui->differentialCB->itemData(ui->differentialCB->currentIndex()).toInt();
|
||||
// TODO } else {
|
||||
// TODO md->differential = ui->differentialSB->value();
|
||||
// TODO }
|
||||
// populateCurveReference(QComboBox *curveTypeCB, QCheckBox *curveGVarCB, QComboBox *curveValueCB, QSpinBox *curveValueCB, CurveReference & curve, unsigned int flags)
|
||||
|
||||
md->swtch = RawSwitch(ui->switchesCB->itemData(ui->switchesCB->currentIndex()).toInt());
|
||||
md->mixWarn = ui->warningCB->currentIndex();
|
||||
md->mltpx = (MltpxValue)ui->mltpxCB->currentIndex();
|
||||
@@ -331,16 +279,7 @@ void MixerDialog::valuesChanged()
|
||||
md->delayUp = round(ui->delayUpSB->value()*scale);
|
||||
md->speedDown = round(ui->slowDownSB->value()*scale);
|
||||
md->speedUp = round(ui->slowUpSB->value()*scale);
|
||||
if (ui->differentialGV->isChecked()) {
|
||||
md->differential = ui->differentialCB->itemData(ui->differentialCB->currentIndex()).toInt();
|
||||
} else {
|
||||
md->differential = ui->differentialSB->value();
|
||||
}
|
||||
if (GetEepromInterface()->getCapability(MixFmTrim) && md->enableFmTrim==1) {
|
||||
ui->label_4->setText(tr("FM Trim Value"));
|
||||
} else {
|
||||
ui->label_4->setText(tr("Offset"));
|
||||
}
|
||||
|
||||
int i=0;
|
||||
for (i=0; i<ui->mixerName->text().toAscii().length(); i++) {
|
||||
md->name[i]=ui->mixerName->text().toAscii().at(i);
|
||||
|
||||
Reference in New Issue
Block a user