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

Show SAC in the mouseover.

Browse source 
This is really nice to have when looking at specific parts of a dive.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Anton Lundin 2013-10-14 23:48:44 +02:00 • committed by Dirk Hohndel
parent 437246d3ed
commit 579d1cb915
6 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pref.h
View file

@ -36,6 +36,7 @@ struct preferences {
short unit_system;
struct units units;
short show_time;
short show_sac;
};
enum unit_system_values { METRIC, IMPERIAL, PERSONALIZE };

4
profile.c
View file

@ -1250,6 +1250,10 @@ static void plot_string(struct plot_data *entry, char *buf, int bufsize,
else
snprintf(buf, bufsize, translate("gettextFromC","%s\nNDL:%umin"), buf2, DIV_UP(entry->ndl, 60));
}
if (entry->sac && prefs.show_sac) {
memcpy(buf2, buf, bufsize);
snprintf(buf, bufsize, translate("gettextFromC","%s\nSAC:%2.1fl/min"), buf2, entry->sac / 1000.0);
}
if (entry->tts) {
memcpy(buf2, buf, bufsize);
snprintf(buf, bufsize, translate("gettextFromC","%s\nTTS:%umin"), buf2, DIV_UP(entry->tts, 60));

1
qt-ui/mainwindow.cpp
View file

@ -587,6 +587,7 @@ void MainWindow::readSettings()
GET_INT("gfhigh", gfhigh);
set_gf(prefs.gflow, prefs.gfhigh);
GET_BOOL("show_time", show_time);
GET_BOOL("show_sac", show_sac);
s.endGroup();
s.beginGroup("Display");

3
qt-ui/preferences.cpp
View file

@ -74,6 +74,7 @@ void PreferencesDialog::setUiFromPrefs()
ui.defaultfilename->setText(prefs.default_filename);
ui.displayinvalid->setChecked(prefs.show_invalid);
ui.show_time->setChecked(prefs.show_time);
ui.show_sac->setChecked(prefs.show_sac);
ui.vertical_speed_minutes->setChecked(prefs.units.vertical_speed_time == units::MINUTES);
ui.vertical_speed_seconds->setChecked(prefs.units.vertical_speed_time == units::SECONDS);
}
@ -118,6 +119,7 @@ void PreferencesDialog::setPrefsFromUi()
prefs.default_filename = strdup(ui.defaultfilename->text().toUtf8().data());
prefs.display_invalid_dives = ui.displayinvalid->isChecked();
SP(show_time, ui.show_time);
SP(show_sac, ui.show_sac);
}
#define SB(V, B) s.setValue(V, (int)(B->isChecked() ? 1 : 0))
@ -144,6 +146,7 @@ void PreferencesDialog::syncSettings()
s.setValue("gflow", ui.gflow->value());
s.setValue("gfhigh", ui.gfhigh->value());
SB("show_time", ui.show_time);
SB("show_sac", ui.show_sac);
s.endGroup();
// Units

11
qt-ui/preferences.ui
View file

@ -724,6 +724,17 @@
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_11b">
<item>
<widget class="QCheckBox" name="show_sac">
<property name="text">
<string>Show SAC</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>

1
subsurfacestartup.c
View file

@ -27,6 +27,7 @@ struct preferences default_prefs = {
.font_size = 14.0,
.show_invalid = FALSE,
.show_time = FALSE,
.show_sac = FALSE,
};
struct units *get_units()