diff options
| author |  Monty Taylor <mordred@inaugust.com> | 2020-05-04 18:07:56 -0500 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-05-05 08:25:21 -0700 |
| commit | 7a9214575e4b8124995fb6e8edf2895a19f4170d (patch) | |
| tree | 04b6af6d471f7435764369d8210a1814787912ac /core | |
| parent | 95e6792c4fe353441fd1cad8bad8b459b1a37d65 (diff) | |
| download | subsurface-7a9214575e4b8124995fb6e8edf2895a19f4170d.tar.gz | |
cleanup: Change Salty to Brackish
In the code, the difference between SALTYWATER and SALTWATER is hard
to see. More importantly, in the UI - Brackish is the word for water
that has more salt that freshwater but less salt that seawater. The
docs already use the word to clarify what is meant.
Diffstat (limited to 'core')
| -rw-r--r-- | core/qthelper.cpp | 4 | ||||
| -rw-r--r-- | core/qthelper.h | 2 | ||||
| -rw-r--r-- | core/units.h | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/core/qthelper.cpp b/core/qthelper.cpp index 2e4f35431..f59b804dd 100644 --- a/core/qthelper.cpp +++ b/core/qthelper.cpp @@ -631,7 +631,7 @@ QString get_water_type_string(int salinity) if (salinity < 10050) return waterTypes[FRESHWATER]; else if (salinity < 10190) - return waterTypes[SALTYWATER]; + return waterTypes[BRACKISHWATER]; else if (salinity < 10210) return waterTypes[EN13319WATER]; else @@ -1162,7 +1162,7 @@ QString localFilePath(const QString &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") + gettextFromC::tr("Fresh"), gettextFromC::tr("Brackish"), gettextFromC::tr("EN13319"), gettextFromC::tr("Salt"), gettextFromC::tr("use dc") }; // TODO: Apparently Qt has no simple way of listing the supported video diff --git a/core/qthelper.h b/core/qthelper.h index 26e9ef262..4a7d8ec52 100644 --- a/core/qthelper.h +++ b/core/qthelper.h @@ -11,7 +11,7 @@ struct picture; // 1) Types enum inertgas {N2, HE}; -enum watertypes {FRESHWATER, SALTYWATER, EN13319WATER, SALTWATER, DC_WATERTYPE}; +enum watertypes {FRESHWATER, BRACKISHWATER, EN13319WATER, SALTWATER, DC_WATERTYPE}; // 2) Functions visible only to C++ parts diff --git a/core/units.h b/core/units.h index 4232e24a3..1b042513b 100644 --- a/core/units.h +++ b/core/units.h @@ -32,6 +32,7 @@ extern "C" { /* Salinity is expressed in weight in grams per 10l */ #define SEAWATER_SALINITY 10300 #define EN13319_SALINITY 10200 +#define BRACKISH_SALINITY 10100 #define FRESHWATER_SALINITY 10000 #include <stdint.h> |