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

Grantlee: Add salinity and water type to grantlee variables

Browse source 
These can be useful in a printed divelog, especially if the
log entry is also showing weight and exposure suit.

Signed-off-by: Monty Taylor <mordred@inaugust.com>
This commit is contained in:
Monty Taylor 2020-05-04 08:54:58 -05:00 • committed by Lubomir I. Ivanov
parent b3270222fd
commit 95e6792c4f
9 changed files with 56 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

22
core/qthelper.cpp
View file

@ -621,6 +621,23 @@ QString get_pressure_string(pressure_t pressure, bool showunit)
}
}
QString get_salinity_string(int salinity)
{
return QStringLiteral("%L1%2").arg(salinity / 10.0).arg(gettextFromC::tr("g/ℓ"));
}
QString get_water_type_string(int salinity)
{
if (salinity < 10050)
return waterTypes[FRESHWATER];
else if (salinity < 10190)
return waterTypes[SALTYWATER];
else if (salinity < 10210)
return waterTypes[EN13319WATER];
else
return waterTypes[SALTWATER];
}
QString getSubsurfaceDataPath(QString folderToFind)
{
QString execdir;
@ -1143,6 +1160,11 @@ QString localFilePath(const QString &originalFilename)
return localFilenameOf.value(originalFilename, originalFilename);
}
// the water types need to match the watertypes enum
const QStringList waterTypes = {
gettextFromC::tr("Fresh"), gettextFromC::tr("Salty"), gettextFromC::tr("EN13319"), gettextFromC::tr("Salt"), gettextFromC::tr("use dc")
};
// TODO: Apparently Qt has no simple way of listing the supported video
// codecs? Do we have to query them by hand using QMediaPlayer::hasSupport()?
const QStringList videoExtensionsList = {