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

core: read and write the user-specified salinity

Browse source 
Both XML and git storage are added.

Signed-off-by: willemferguson <willemferguson@zoology.up.ac.za>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
willemferguson 2019-11-19 19:16:45 +02:00 • committed by Dirk Hohndel
parent ebabbfb457
commit d2cf58e07e
10 changed files with 62 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
commands/command.cpp
View file

@ -218,6 +218,11 @@ int editAtmPress(int newValue, bool currentDiveOnly)
return execute_edit(new EditAtmPress(newValue, currentDiveOnly));
}
int editWaterTypeUser(int newValue, bool currentDiveOnly)
{
return execute_edit(new EditWaterTypeUser(newValue, currentDiveOnly));
}
int editDepth(int newValue, bool currentDiveOnly)
{
return execute_edit(new EditDepth(newValue, currentDiveOnly));

1
commands/command.h
View file

@ -71,6 +71,7 @@ int editChill(int newValue, bool currentDiveOnly);
int editAirTemp(int newValue, bool currentDiveOnly);
int editWaterTemp(int newValue, bool currentDiveOnly);
int editAtmPress(int newValue, bool currentDiveOnly);
int editWaterTypeUser(int newValue, bool currentDiveOnly);
int editDepth(int newValue, bool currentDiveOnly);
int editDuration(int newValue, bool currentDiveOnly);
int editDiveSite(struct dive_site *newValue, bool currentDiveOnly);

21
commands/command_edit.cpp
View file

@ -355,6 +355,27 @@ DiveField EditWaterTemp::fieldId() const
return DiveField::WATER_TEMP;
}
// ***** Water Type *****
void EditWaterTypeUser::set(struct dive *d, int value) const
{
d->user_salinity = value > 0 ? value : 0;
}
int EditWaterTypeUser::data(struct dive *d) const
{
return d->user_salinity;
}
QString EditWaterTypeUser::fieldName() const
{
return tr("salinity");
}
DiveField EditWaterTypeUser::fieldId() const
{
return DiveField::SALINITY;
}
// ***** Atmospheric pressure *****
void EditAtmPress::set(struct dive *d, int value) const
{

9
commands/command_edit.h
View file

@ -161,6 +161,15 @@ public:
DiveField fieldId() const override;
};
class EditWaterTypeUser : public EditBase<int> {
public:
using EditBase<int>::EditBase; // Use constructor of base class.
void set(struct dive *d, int value) const override;
int data(struct dive *d) const override;
QString fieldName() const override;
DiveField fieldId() const override;
};
class EditDuration : public EditBase<int> {
public:
using EditBase<int>::EditBase; // Use constructor of base class.