Fix input scale decimals, add sensor unit, add scale to inputs list and model print

This commit is contained in:
elecpower
2021-09-19 22:29:40 +10:00
committed by Peter Feerick
parent e6cdb7623b
commit 5596211be8
3 changed files with 243 additions and 209 deletions
+15 -10
View File
@@ -133,7 +133,7 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, G
connect(ui->lineName, SIGNAL(editingFinished()), this, SLOT(valuesChanged()));
connect(ui->sourceCB, SIGNAL(currentIndexChanged(int)), this, SLOT(valuesChanged()));
connect(ui->scale, SIGNAL(editingFinished()), this, SLOT(valuesChanged()));
connect(ui->dsbScale, SIGNAL(editingFinished()), this, SLOT(valuesChanged()));
connect(ui->trimCB, SIGNAL(currentIndexChanged(int)), this, SLOT(valuesChanged()));
connect(ui->switchesCB, SIGNAL(currentIndexChanged(int)), this, SLOT(valuesChanged()));
connect(ui->sideCB, SIGNAL(currentIndexChanged(int)), this, SLOT(valuesChanged()));
@@ -159,16 +159,20 @@ void ExpoDialog::updateScale()
{
if (firmware->getCapability(VirtualInputs) && ed->srcRaw.type == SOURCE_TYPE_TELEMETRY) {
RawSourceRange range = ed->srcRaw.getRange(&model, generalSettings);
ui->scaleLabel->show();
ui->scale->show();
ui->scale->setDecimals(range.decimals);
ui->scale->setMinimum(range.min);
ui->scale->setMaximum(range.max);
ui->scale->setValue(round(range.step * ed->scale));
ui->lblScale->show();
ui->dsbScale->show();
ui->lblScaleUnit->show();
ui->dsbScale->setDecimals(range.decimals);
ui->dsbScale->setMinimum(range.min);
ui->dsbScale->setMaximum(range.max);
ui->dsbScale->setSingleStep(range.step);
ui->dsbScale->setValue(range.step * ed->scale);
ui->lblScaleUnit->setText(range.unit);
}
else {
ui->scaleLabel->hide();
ui->scale->hide();
ui->lblScale->hide();
ui->dsbScale->hide();
ui->lblScaleUnit->hide();
}
}
@@ -179,11 +183,12 @@ void ExpoDialog::valuesChanged()
RawSource srcRaw = RawSource(ui->sourceCB->itemData(ui->sourceCB->currentIndex()).toInt());
if (ed->srcRaw != srcRaw) {
ed->srcRaw = srcRaw;
ed->scale= 0;
updateScale();
}
RawSourceRange range = srcRaw.getRange(&model, generalSettings);
ed->scale = round(float(ui->scale->value()) / range.step);
ed->scale = round(float(ui->dsbScale->value()) / range.step);
ed->carryTrim = 1 - ui->trimCB->currentIndex();
ed->swtch = RawSwitch(ui->switchesCB->itemData(ui->switchesCB->currentIndex()).toInt());
ed->mode = ui->sideCB->currentIndex() + 1;