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

cleanup: Change Salty to Brackish

Browse source 
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.
This commit is contained in:
Monty Taylor 2020-05-04 18:07:56 -05:00 • committed by Dirk Hohndel
parent 95e6792c4f
commit 7a9214575e
5 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Documentation/user-manual.txt
View file

@ -1018,9 +1018,10 @@ without dive computer information, select the desired water type
using the dropdown box. The following water types are available: using the dropdown box. The following water types are available:
1. Fresh water, usually at inland dive sites or in caves. 1. Fresh water, usually at inland dive sites or in caves.
2. Salty water, i.e. water that contains a little salt (called brackish water). 2. Brackish water, water that contains a little salt.
3. EN13319, an average value that represents neither fresh water or sea water. This value is available 3. EN13319, an value defined in the European CE standard for dive computers that represents neither
on some dive computers and is regarded by some as a safe value for both fresh water and sea water. fresh water or sea water. This value is available on some dive computers and is regarded by some
as a safe value for both fresh water and sea water.
4. Salt water encountered in the sea. 4. Salt water encountered in the sea.
The topic of water salinity is complex because it differs sonewhat between different oceans. A warning icon The topic of water salinity is complex because it differs sonewhat between different oceans. A warning icon

4
core/qthelper.cpp
View file

@ -631,7 +631,7 @@ QString get_water_type_string(int salinity)
if (salinity < 10050) if (salinity < 10050)
return waterTypes[FRESHWATER]; return waterTypes[FRESHWATER];
else if (salinity < 10190) else if (salinity < 10190)
return waterTypes[SALTYWATER]; return waterTypes[BRACKISHWATER];
else if (salinity < 10210) else if (salinity < 10210)
return waterTypes[EN13319WATER]; return waterTypes[EN13319WATER];
else else
@ -1162,7 +1162,7 @@ QString localFilePath(const QString &originalFilename)
// the water types need to match the watertypes enum // the water types need to match the watertypes enum
const QStringList waterTypes = { 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 // TODO: Apparently Qt has no simple way of listing the supported video

2
core/qthelper.h
View file

@ -11,7 +11,7 @@ struct picture;
// 1) Types // 1) Types
enum inertgas {N2, HE}; 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 // 2) Functions visible only to C++ parts

1
core/units.h
View file

@ -32,6 +32,7 @@ extern "C" {
/* Salinity is expressed in weight in grams per 10l */ /* Salinity is expressed in weight in grams per 10l */
#define SEAWATER_SALINITY 10300 #define SEAWATER_SALINITY 10300
#define EN13319_SALINITY 10200 #define EN13319_SALINITY 10200
#define BRACKISH_SALINITY 10100
#define FRESHWATER_SALINITY 10000 #define FRESHWATER_SALINITY 10000
#include <stdint.h> #include <stdint.h>

6
desktop-widgets/tab-widgets/TabDiveInformation.cpp
View file

@ -179,7 +179,7 @@ int TabDiveInformation::updateSalinityComboIndex(int salinity)
else if (salinity < 10050) else if (salinity < 10050)
return FRESHWATER; return FRESHWATER;
else if (salinity < 10190) else if (salinity < 10190)
return SALTYWATER; return BRACKISHWATER;
else if (salinity < 10210) else if (salinity < 10210)
return EN13319WATER; return EN13319WATER;
else else
@ -261,8 +261,8 @@ void TabDiveInformation::on_waterTypeCombo_activated(int index) {
case FRESHWATER: case FRESHWATER:
combobox_salinity = FRESHWATER_SALINITY; combobox_salinity = FRESHWATER_SALINITY;
break; break;
case SALTYWATER: case BRACKISHWATER:
combobox_salinity = 10100; combobox_salinity = BRACKISH_SALINITY;
break; break;
case EN13319WATER: case EN13319WATER:
combobox_salinity = EN13319_SALINITY; combobox_salinity = EN13319_SALINITY;