From 579d1cb91503ff3b51e94869a0234eaf2796f435 Mon Sep 17 00:00:00 2001 From: Anton Lundin Date: Mon, 14 Oct 2013 23:48:44 +0200 Subject: Show SAC in the mouseover. This is really nice to have when looking at specific parts of a dive. Signed-off-by: Anton Lundin Signed-off-by: Dirk Hohndel --- pref.h | 1 + profile.c | 4 ++++ qt-ui/mainwindow.cpp | 1 + qt-ui/preferences.cpp | 3 +++ qt-ui/preferences.ui | 11 +++++++++++ subsurfacestartup.c | 1 + 6 files changed, 21 insertions(+) diff --git a/pref.h b/pref.h index 8d181f20a..e59ad1c6a 100644 --- a/pref.h +++ b/pref.h @@ -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 }; diff --git a/profile.c b/profile.c index 80b0dbc97..426f97383 100644 --- a/profile.c +++ b/profile.c @@ -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)); diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index 3b56134c1..d9019fa00 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -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"); diff --git a/qt-ui/preferences.cpp b/qt-ui/preferences.cpp index e5ddc558d..4ba8739a3 100644 --- a/qt-ui/preferences.cpp +++ b/qt-ui/preferences.cpp @@ -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 diff --git a/qt-ui/preferences.ui b/qt-ui/preferences.ui index 18767a790..df7333837 100644 --- a/qt-ui/preferences.ui +++ b/qt-ui/preferences.ui @@ -724,6 +724,17 @@ + + + + + + Show SAC + + + + + diff --git a/subsurfacestartup.c b/subsurfacestartup.c index ff0e8405b..b22bdd83b 100644 --- a/subsurfacestartup.c +++ b/subsurfacestartup.c @@ -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() -- cgit v1.2.3-70-g09d2