mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

ConfigureDiveComputer::saveXMLBackup(): factor out writing gas details

Browse source 
Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
This commit is contained in:
Rolf Eike Beer 2019-03-24 11:31:44 +01:00 • committed by Dirk Hohndel
parent c3fe5fffb4
commit ac0650865c
1 changed files with 20 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
core/configuredivecomputer.cpp
View file

@ -53,6 +53,16 @@ void ConfigureDiveComputer::saveDeviceDetails(DeviceDetails *details, device_dat
writeThread->start(); writeThread->start();
} }
static QString writeGasDetails(gas g)
{
return QStringList({
QString::number(g.oxygen),
QString::number(g.helium),
QString::number(g.type),
QString::number(g.depth)
}).join(QLatin1Char(','));
}
bool ConfigureDiveComputer::saveXMLBackup(QString fileName, DeviceDetails *details, device_data_t *data) bool ConfigureDiveComputer::saveXMLBackup(QString fileName, DeviceDetails *details, device_data_t *data)
{ {
QString xml = ""; QString xml = "";
@ -70,68 +80,18 @@ bool ConfigureDiveComputer::saveXMLBackup(QString fileName, DeviceDetails *detai
writer.writeStartElement("Settings"); writer.writeStartElement("Settings");
writer.writeTextElement("CustomText", details->customText); writer.writeTextElement("CustomText", details->customText);
//Add gasses //Add gasses
QString gas1 = QString("%1,%2,%3,%4") writer.writeTextElement("Gas1", writeGasDetails(details->gas1));
.arg(QString::number(details->gas1.oxygen), writer.writeTextElement("Gas2", writeGasDetails(details->gas2));
QString::number(details->gas1.helium), writer.writeTextElement("Gas3", writeGasDetails(details->gas3));
QString::number(details->gas1.type), writer.writeTextElement("Gas4", writeGasDetails(details->gas4));
QString::number(details->gas1.depth)); writer.writeTextElement("Gas5", writeGasDetails(details->gas5));
QString gas2 = QString("%1,%2,%3,%4")
.arg(QString::number(details->gas2.oxygen),
QString::number(details->gas2.helium),
QString::number(details->gas2.type),
QString::number(details->gas2.depth));
QString gas3 = QString("%1,%2,%3,%4")
.arg(QString::number(details->gas3.oxygen),
QString::number(details->gas3.helium),
QString::number(details->gas3.type),
QString::number(details->gas3.depth));
QString gas4 = QString("%1,%2,%3,%4")
.arg(QString::number(details->gas4.oxygen),
QString::number(details->gas4.helium),
QString::number(details->gas4.type),
QString::number(details->gas4.depth));
QString gas5 = QString("%1,%2,%3,%4")
.arg(QString::number(details->gas5.oxygen),
QString::number(details->gas5.helium),
QString::number(details->gas5.type),
QString::number(details->gas5.depth));
writer.writeTextElement("Gas1", gas1);
writer.writeTextElement("Gas2", gas2);
writer.writeTextElement("Gas3", gas3);
writer.writeTextElement("Gas4", gas4);
writer.writeTextElement("Gas5", gas5);
// //
//Add dil values //Add dil values
QString dil1 = QString("%1,%2,%3,%4") writer.writeTextElement("Dil1", writeGasDetails(details->dil1));
.arg(QString::number(details->dil1.oxygen), writer.writeTextElement("Dil2", writeGasDetails(details->dil2));
QString::number(details->dil1.helium), writer.writeTextElement("Dil3", writeGasDetails(details->dil3));
QString::number(details->dil1.type), writer.writeTextElement("Dil4", writeGasDetails(details->dil4));
QString::number(details->dil1.depth)); writer.writeTextElement("Dil5", writeGasDetails(details->dil5));
QString dil2 = QString("%1,%2,%3,%4")
.arg(QString::number(details->dil2.oxygen),
QString::number(details->dil2.helium),
QString::number(details->dil2.type),
QString::number(details->dil2.depth));
QString dil3 = QString("%1,%2,%3,%4")
.arg(QString::number(details->dil3.oxygen),
QString::number(details->dil3.helium),
QString::number(details->dil3.type),
QString::number(details->dil3.depth));
QString dil4 = QString("%1,%2,%3,%4")
.arg(QString::number(details->dil4.oxygen),
QString::number(details->dil4.helium),
QString::number(details->dil4.type),
QString::number(details->dil4.depth));
QString dil5 = QString("%1,%2,%3,%4")
.arg(QString::number(details->dil5.oxygen),
QString::number(details->dil5.helium),
QString::number(details->dil5.type),
QString::number(details->dil5.depth));
writer.writeTextElement("Dil1", dil1);
writer.writeTextElement("Dil2", dil2);
writer.writeTextElement("Dil3", dil3);
writer.writeTextElement("Dil4", dil4);
writer.writeTextElement("Dil5", dil5);
//Add setpoint values //Add setpoint values
QString sp1 = QString("%1,%2") QString sp1 = QString("%1,%2")