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

prefs: add option to display only actually used tanks

Browse source 
A user complained about the default cylinders list. Provide
a preferences option to turn this off.

When changing the preferences, the tank-info model will be
completely rebuilt. Currently, this is a bit crude as this
will be done for any preferences change.

Suggested-by: Adolph Weidanz <weidanz.adolph@gmail.com>
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-12-11 23:55:18 +01:00 • committed by Dirk Hohndel
parent 11e576ffbf
commit 296a391faa
8 changed files with 47 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
core/equipment.c
View file

@ -246,11 +246,8 @@ int find_best_gasmix_match(struct gasmix mix, const struct cylinder_table *cylin
* we should pick up any other names from the dive
* logs directly.
*/
struct tank_info_table tank_info_table;
void reset_tank_info_table(struct tank_info_table *table)
static void add_default_tank_infos(struct tank_info_table *table)
{
clear_tank_info_table(table);
/* Size-only metric cylinders */
add_tank_info_metric(table, "10.0ℓ", 10000, 0);
add_tank_info_metric(table, "11.1ℓ", 11100, 0);
@ -301,6 +298,23 @@ void reset_tank_info_table(struct tank_info_table *table)
add_tank_info_metric(table, "D20 232 bar", 40000, 232);
}
struct tank_info_table tank_info_table;
void reset_tank_info_table(struct tank_info_table *table)
{
clear_tank_info_table(table);
if (prefs.display_default_tank_infos)
add_default_tank_infos(table);
/* Add cylinders from dive list */
for (int i = 0; i < dive_table.nr; ++i) {
const struct dive *dive = dive_table.dives[i];
for (int j = 0; j < dive->cylinders.nr; j++) {
const cylinder_t *cyl = get_cylinder(dive, j);
add_cylinder_description(&cyl->type);
}
}
}
/*
* We hardcode the most common weight system types
* This is a bit odd as the weight system types don't usually encode weight

1
core/pref.h
View file

@ -109,6 +109,7 @@ struct preferences {
// ********** Equipment tab *******
const char *default_cylinder;
bool display_unused_tanks;
bool display_default_tank_infos;
// ********** General **********
bool auto_recalculate_thumbnails;

3
core/settings/qPrefEquipment.cpp
View file

@ -14,8 +14,9 @@ void qPrefEquipment::loadSync(bool doSync)
{
disk_default_cylinder(doSync);
disk_display_unused_tanks(doSync);
disk_display_default_tank_infos(doSync);
}
HANDLE_PREFERENCE_TXT(Equipment, "default_cylinder", default_cylinder);
HANDLE_PREFERENCE_BOOL(Equipment, "display_unused_tanks", display_unused_tanks);
HANDLE_PREFERENCE_BOOL(Equipment, "display_default_tank_infos", display_default_tank_infos);

5
core/settings/qPrefEquipment.h
View file

@ -9,6 +9,7 @@ class qPrefEquipment : public QObject {
Q_OBJECT
Q_PROPERTY(QString default_cylinder READ default_cylinder WRITE set_default_cylinder NOTIFY default_cylinderChanged)
Q_PROPERTY(bool display_unused_tanks READ display_unused_tanks WRITE set_display_unused_tanks NOTIFY display_unused_tanksChanged)
Q_PROPERTY(bool display_default_tank_infos READ display_default_tank_infos WRITE set_display_default_tank_infos NOTIFY display_default_tank_infosChanged)
public:
static qPrefEquipment *instance();
@ -21,19 +22,23 @@ public:
public:
static QString default_cylinder() { return prefs.default_cylinder; }
static bool display_unused_tanks() { return prefs.display_unused_tanks; }
static bool display_default_tank_infos() { return prefs.display_default_tank_infos; }
public slots:
static void set_default_cylinder(const QString& value);
static void set_display_unused_tanks(bool value);
static void set_display_default_tank_infos(bool value);
signals:
void default_cylinderChanged(const QString& value);
void display_unused_tanksChanged(bool value);
void display_default_tank_infosChanged(bool value);
private:
qPrefEquipment() {}
static void disk_default_cylinder(bool doSync);
static void disk_display_unused_tanks(bool doSync);
static void disk_display_default_tank_infos(bool doSync);
};
#endif

1
core/subsurfacestartup.c
View file

@ -50,6 +50,7 @@ struct preferences default_prefs = {
.display_invalid_dives = false,
.show_sac = false,
.display_unused_tanks = false,
.display_default_tank_infos = true,
.show_average_depth = true,
.show_icd = false,
.ascrate75 = 9000 / 60,