Fix model input trims and cosmetic for scale fields
This commit is contained in:
@@ -111,10 +111,16 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, G
|
||||
ui->trimCB->hide();
|
||||
}
|
||||
|
||||
for(int i = 0; i < getBoardCapability(getCurrentBoard(), Board::NumTrims); i++) {
|
||||
ui->trimCB->addItem(RawSource(SOURCE_TYPE_TRIM, i).toString(), i + 1);
|
||||
}
|
||||
ui->trimCB->setCurrentIndex(1 - ed->carryTrim);
|
||||
dialogFilteredItemModels->registerItemModel(new FilteredItemModel(ExpoData::carryTrimItemModel()), AIM_EXPO_CARRYTRIM);
|
||||
ui->trimCB->setModel(dialogFilteredItemModels->getItemModel(AIM_EXPO_CARRYTRIM));
|
||||
|
||||
if (ed->srcRaw.isStick())
|
||||
carryTrimFilterFlags = CarryTrimSticksGroup;
|
||||
else
|
||||
carryTrimFilterFlags = CarryTrimNotSticksGroup;
|
||||
|
||||
dialogFilteredItemModels->getItemModel(AIM_EXPO_CARRYTRIM)->setFilterFlags(carryTrimFilterFlags);
|
||||
ui->trimCB->setCurrentIndex(ui->trimCB->findData(ed->carryTrim));
|
||||
|
||||
int expolength = firmware->getCapability(HasExpoNames);
|
||||
if (!expolength) {
|
||||
@@ -159,9 +165,8 @@ void ExpoDialog::updateScale()
|
||||
{
|
||||
if (firmware->getCapability(VirtualInputs) && ed->srcRaw.type == SOURCE_TYPE_TELEMETRY) {
|
||||
RawSourceRange range = ed->srcRaw.getRange(&model, generalSettings);
|
||||
ui->lblScale->show();
|
||||
ui->dsbScale->show();
|
||||
ui->lblScaleUnit->show();
|
||||
ui->dsbScale->setEnabled(true);
|
||||
ui->lblScaleUnit->setEnabled(true);
|
||||
ui->dsbScale->setDecimals(range.decimals);
|
||||
ui->dsbScale->setMinimum(range.min);
|
||||
ui->dsbScale->setMaximum(range.max);
|
||||
@@ -170,9 +175,8 @@ void ExpoDialog::updateScale()
|
||||
ui->lblScaleUnit->setText(range.unit);
|
||||
}
|
||||
else {
|
||||
ui->lblScale->hide();
|
||||
ui->dsbScale->hide();
|
||||
ui->lblScaleUnit->hide();
|
||||
ui->dsbScale->setEnabled(false);
|
||||
ui->lblScaleUnit->setEnabled(false);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -183,13 +187,20 @@ void ExpoDialog::valuesChanged()
|
||||
RawSource srcRaw = RawSource(ui->sourceCB->itemData(ui->sourceCB->currentIndex()).toInt());
|
||||
if (ed->srcRaw != srcRaw) {
|
||||
ed->srcRaw = srcRaw;
|
||||
if (ed->srcRaw.isStick())
|
||||
carryTrimFilterFlags = CarryTrimSticksGroup;
|
||||
else
|
||||
carryTrimFilterFlags = CarryTrimNotSticksGroup;
|
||||
ed->carryTrim = CARRYTRIM_DEFAULT;
|
||||
dialogFilteredItemModels->getItemModel(AIM_EXPO_CARRYTRIM)->setFilterFlags(carryTrimFilterFlags);
|
||||
ui->trimCB->setCurrentIndex(ui->trimCB->findData(-ed->carryTrim));
|
||||
ed->scale= 0;
|
||||
updateScale();
|
||||
}
|
||||
|
||||
RawSourceRange range = srcRaw.getRange(&model, generalSettings);
|
||||
ed->scale = round(float(ui->dsbScale->value()) / range.step);
|
||||
ed->carryTrim = 1 - ui->trimCB->currentIndex();
|
||||
ed->carryTrim = ui->trimCB->itemData(ui->trimCB->currentIndex()).toInt();
|
||||
ed->swtch = RawSwitch(ui->switchesCB->itemData(ui->switchesCB->currentIndex()).toInt());
|
||||
ed->mode = ui->sideCB->currentIndex() + 1;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user