piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Companion modification propagation fixes (Fix #4155 and #3254)

Browse Source
This commit is contained in:
Andre Bernet
2016-12-24 11:31:57 +01:00
parent 8f74388ae1
commit 625babc55e
4 changed files with 18 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/modeledit/inputs.cpp
-3
View File
@@ -207,8 +207,6 @@ void InputsPanel::gm_openExpo(int index)
if(index<0 || index>=CPN_MAX_EXPOS) return;
ExpoData mixd(model->expoData[index]);
emit modified();
update();
QString inputName;
if (firmware->getCapability(VirtualInputs))
@@ -227,7 +225,6 @@ void InputsPanel::gm_openExpo(int index)
gm_deleteExpo(index);
}
expoInserted=false;
emit modified();
update();
}
}
companion/src/modeledit/mixes.cpp
-8
View File
@@ -199,8 +199,6 @@ void MixesPanel::gm_openMix(int index)
if(index < 0 || index>=firmware->getCapability(Mixes)) return;
MixData mixd(model->mixData[index]);
emit modified();
update();
MixerDialog *g = new MixerDialog(this, *model, &mixd, generalSettings, firmware);
if(g->exec()) {
@@ -213,7 +211,6 @@ void MixesPanel::gm_openMix(int index)
gm_deleteMix(index);
}
mixInserted = false;
emit modified();
update();
}
}
@@ -462,11 +459,6 @@ void MixesPanel::mimeMixerDropped(int index, const QMimeData *data, Qt::DropActi
}
}
void MixesPanel::mixesEdited()
{
emit modified();
}
void MixesPanel::mixerlistWidget_KeyPress(QKeyEvent *event)
{
if(event->matches(QKeySequence::SelectAll)) mixerAdd(); //Ctrl A
companion/src/modeledit/mixes.h
-2
View File
@@ -58,8 +58,6 @@ class MixesPanel : public ModelPanel
void mimeMixerDropped(int index, const QMimeData *data, Qt::DropAction action);
void pasteMixerMimeData(const QMimeData * mimeData, int destIdx);
void mixesEdited();
private:
MixersList *MixerlistWidget;
bool mixInserted;
companion/src/modeledit/telemetry.cpp
+18 -18
View File
@@ -515,29 +515,29 @@ TelemetrySensorPanel::TelemetrySensorPanel(QWidget *parent, SensorData & sensor,
lock(false)
{
ui->setupUi(this);
ui->id->setField(sensor.id);
ui->instance->setField(sensor.instance);
ui->ratio->setField(sensor.ratio);
ui->offset->setField(sensor.offset);
ui->autoOffset->setField(sensor.autoOffset);
ui->filter->setField(sensor.filter);
ui->logs->setField(sensor.logs);
ui->persistent->setField(sensor.persistent);
ui->onlyPositive->setField(sensor.onlyPositive);
ui->gpsSensor->setField(sensor.gps);
ui->altSensor->setField(sensor.alt);
ui->ampsSensor->setField(sensor.amps);
ui->cellsSensor->setField(sensor.source);
ui->id->setField(sensor.id, this);
ui->instance->setField(sensor.instance, this);
ui->ratio->setField(sensor.ratio, this);
ui->offset->setField(sensor.offset, this);
ui->autoOffset->setField(sensor.autoOffset, this);
ui->filter->setField(sensor.filter, this);
ui->logs->setField(sensor.logs, this);
ui->persistent->setField(sensor.persistent, this);
ui->onlyPositive->setField(sensor.onlyPositive, this);
ui->gpsSensor->setField(sensor.gps, this);
ui->altSensor->setField(sensor.alt, this);
ui->ampsSensor->setField(sensor.amps, this);
ui->cellsSensor->setField(sensor.source, this);
ui->cellsIndex->addItem(tr("Lowest"), SensorData::TELEM_CELL_INDEX_LOWEST);
for (int i=1; i<=6; i++)
ui->cellsIndex->addItem(tr("Cell %1").arg(i), i);
ui->cellsIndex->addItem(tr("Highest"), SensorData::TELEM_CELL_INDEX_HIGHEST);
ui->cellsIndex->addItem(tr("Delta"), SensorData::TELEM_CELL_INDEX_DELTA);
ui->cellsIndex->setField(sensor.index);
ui->source1->setField(sensor.sources[0]);
ui->source2->setField(sensor.sources[1]);
ui->source3->setField(sensor.sources[2]);
ui->source4->setField(sensor.sources[3]);
ui->source1->setField(sensor.sources[0], this);
ui->source2->setField(sensor.sources[1], this);
ui->source3->setField(sensor.sources[2], this);
ui->source4->setField(sensor.sources[3], this);
update();
}
@@ -825,7 +825,7 @@ void TelemetryPanel::setup()
ui->telemetryProtocol->addItem(tr("FrSky D (cable)"), 2);
}
ui->telemetryProtocol->setCurrentIndex(model->telemetryProtocol);
ui->ignoreSensorIds->setField(model->frsky.ignoreSensorIds);
ui->ignoreSensorIds->setField(model->frsky.ignoreSensorIds, this);
}
else {
ui->telemetryProtocolLabel->hide();