Fix telem refresh

This commit is contained in:
elecpower
2020-10-25 08:12:52 +11:00
parent 44c001916a
commit 7c974286cc
2 changed files with 13 additions and 9 deletions
+12 -9
View File
@@ -519,7 +519,6 @@ void TelemetrySensorPanel::on_name_editingFinished()
if (!lock) { if (!lock) {
strcpy(sensor.label, ui->name->text().toLatin1()); strcpy(sensor.label, ui->name->text().toLatin1());
emit dataModified(); emit dataModified();
emit modified();
} }
} }
@@ -549,7 +548,6 @@ void TelemetrySensorPanel::on_formula_currentIndexChanged(int index)
sensor.unit = SensorData::UNIT_METERS; sensor.unit = SensorData::UNIT_METERS;
} }
emit dataModified(); emit dataModified();
emit modified();
} }
} }
@@ -645,7 +643,6 @@ void TelemetrySensorPanel::cmPaste()
if (hasClipboardData(&data)) { if (hasClipboardData(&data)) {
memcpy(&sensor, data.constData(), sizeof(SensorData)); memcpy(&sensor, data.constData(), sizeof(SensorData));
emit dataModified(); emit dataModified();
emit modified();
} }
} }
@@ -659,7 +656,6 @@ void TelemetrySensorPanel::cmClear(bool prompt)
sensor.clear(); sensor.clear();
model->updateAllReferences(ModelData::REF_UPD_TYPE_SENSOR, ModelData::REF_UPD_ACT_CLEAR, selectedIndex); model->updateAllReferences(ModelData::REF_UPD_TYPE_SENSOR, ModelData::REF_UPD_ACT_CLEAR, selectedIndex);
emit dataModified(); emit dataModified();
emit modified();
} }
void TelemetrySensorPanel::cmClearAll() void TelemetrySensorPanel::cmClearAll()
@@ -717,7 +713,7 @@ TelemetryPanel::TelemetryPanel(QWidget *parent, ModelData & model, GeneralSettin
TelemetrySensorPanel * panel = new TelemetrySensorPanel(this, model.sensorData[i], i, sensorCapability, model, generalSettings, firmware); TelemetrySensorPanel * panel = new TelemetrySensorPanel(this, model.sensorData[i], i, sensorCapability, model, generalSettings, firmware);
ui->sensorsLayout->addWidget(panel); ui->sensorsLayout->addWidget(panel);
sensorPanels[i] = panel; sensorPanels[i] = panel;
connect(panel, SIGNAL(dataModified()), this, SLOT(update())); connect(panel, SIGNAL(dataModified()), this, SLOT(on_dataModifiedSensor()));
connect(panel, SIGNAL(modified()), this, SLOT(onModified())); connect(panel, SIGNAL(modified()), this, SLOT(onModified()));
connect(panel, SIGNAL(clearAllSensors()), this, SLOT(on_clearAllSensors())); connect(panel, SIGNAL(clearAllSensors()), this, SLOT(on_clearAllSensors()));
connect(panel, SIGNAL(insertSensor(int)), this, SLOT(on_insertSensor(int))); connect(panel, SIGNAL(insertSensor(int)), this, SLOT(on_insertSensor(int)));
@@ -984,8 +980,8 @@ void TelemetryPanel::on_clearAllSensors()
model->updateAllReferences(ModelData::REF_UPD_TYPE_SENSOR, ModelData::REF_UPD_ACT_CLEAR, i); model->updateAllReferences(ModelData::REF_UPD_TYPE_SENSOR, ModelData::REF_UPD_ACT_CLEAR, i);
} }
update();
updateItemModels(); updateItemModels();
update();
emit modified(); emit modified();
} }
@@ -995,8 +991,8 @@ void TelemetryPanel::on_insertSensor(int selectedIndex)
model->sensorData[selectedIndex].clear(); model->sensorData[selectedIndex].clear();
model->updateAllReferences(ModelData::REF_UPD_TYPE_SENSOR, ModelData::REF_UPD_ACT_SHIFT, selectedIndex, 0, 1); model->updateAllReferences(ModelData::REF_UPD_TYPE_SENSOR, ModelData::REF_UPD_ACT_SHIFT, selectedIndex, 0, 1);
update();
updateItemModels(); updateItemModels();
update();
emit modified(); emit modified();
} }
@@ -1009,8 +1005,8 @@ void TelemetryPanel::on_deleteSensor(int selectedIndex)
model->sensorData[CPN_MAX_SENSORS - 1].clear(); model->sensorData[CPN_MAX_SENSORS - 1].clear();
model->updateAllReferences(ModelData::REF_UPD_TYPE_SENSOR, ModelData::REF_UPD_ACT_SHIFT, selectedIndex, 0, -1); model->updateAllReferences(ModelData::REF_UPD_TYPE_SENSOR, ModelData::REF_UPD_ACT_SHIFT, selectedIndex, 0, -1);
update();
updateItemModels(); updateItemModels();
update();
emit modified(); emit modified();
} }
@@ -1033,12 +1029,19 @@ void TelemetryPanel::swapData(int idx1, int idx2)
memcpy(sd2, sd1, sizeof(SensorData)); memcpy(sd2, sd1, sizeof(SensorData));
memcpy(sd1, &sdtmp, sizeof(SensorData)); memcpy(sd1, &sdtmp, sizeof(SensorData));
model->updateAllReferences(ModelData::REF_UPD_TYPE_SENSOR, ModelData::REF_UPD_ACT_SWAP, idx1, idx2); model->updateAllReferences(ModelData::REF_UPD_TYPE_SENSOR, ModelData::REF_UPD_ACT_SWAP, idx1, idx2);
update();
updateItemModels(); updateItemModels();
update();
emit modified(); emit modified();
} }
} }
void TelemetryPanel::on_dataModifiedSensor()
{
updateItemModels();
update();
emit modified();
}
void TelemetryPanel::updateItemModels() void TelemetryPanel::updateItemModels()
{ {
commonItemModels->update(CommonItemModels::RMO_TELEMETRY_SENSORS); commonItemModels->update(CommonItemModels::RMO_TELEMETRY_SENSORS);
+1
View File
@@ -151,6 +151,7 @@ class TelemetryPanel : public ModelPanel
void on_deleteSensor(int index); void on_deleteSensor(int index);
void on_moveUpSensor(int index); void on_moveUpSensor(int index);
void on_moveDownSensor(int index); void on_moveDownSensor(int index);
void on_dataModifiedSensor();
private: private:
Ui::Telemetry *ui; Ui::Telemetry *ui;