mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-29 21:50:26 +00:00
Code Issues Projects Releases Packages Wiki Activity
subsurface/desktop-widgets/preferences/preferences_graph.cpp

104 lines
3.8 KiB
C++
Raw Normal View History

Add SPDX header to desktop widgets Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-04-27 18:26:05 +00:00
// SPDX-License-Identifier: GPL-2.0
Preferences: move graph preferences to the new dialog Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-10-01 21:59:53 +00:00
#include "preferences_graph.h"
#include "ui_preferences_graph.h"
desktop-widgets/preferences: reemove SettingsObjectWrapper remove use of SettingsObjectWrapper:: remove include of SettingsObjectWrapper.h use qPrefFoo:: for setters and getters replace prefs.foo with qPrefXYZ::foo() where feasible (this expands to the same code, but gives us more control over the variable). Signed-off-by: Jan Iversen <jani@apache.org>
2018-08-15 09:50:53 +00:00
#include "core/settings/qPrefGeneral.h"
#include "core/settings/qPrefTechnicalDetails.h"
#include "core/settings/qPrefPartialPressureGas.h"
Preferences: move graph preferences to the new dialog Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-10-01 21:59:53 +00:00
#include <QMessageBox>
#include "qt-models/models.h"
Cleanup: move deco function declarations to deco.h Another tiny step in making dive.h smaller: move function declarations to deco.h if these functions are defined in deco.c and don't directly concern dives. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-07-15 21:36:14 +00:00
#include "core/deco.h"
Preferences: move graph preferences to the new dialog Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-10-01 21:59:53 +00:00
Use better aliases for icons. Icon aliases were complete mess. Some icons had alias some didn't. Named with underscores vs. hyphens vs. camelCase. Lower vs. upper case. "ICON" prefix vs. suffix vs. nothing. With vs. without filename suffix. Some didn't make sence. Eg. mapwidget-marker-gray (I can see, it's grey, but what does it represent?) Some were duplicated, eg warning vs. warning-icon. Some were name after widget, which is wrong. Do not reinvent wheel. Use widely used naming scheme close to Freedesktop Icon Naming Specification. This will enable usage of common icons from current set in the future. Thus Subsurface will fit nicely to GUI. This changes icon aliases to one, easy grep-able style. Signed-off-by: Martin Měřinský <mermar@centrum.cz>
2017-11-29 09:57:08 +00:00
PreferencesGraph::PreferencesGraph() : AbstractPreferencesWidget(tr("Profile"), QIcon(":graph-icon"), 5)
Preferences: move graph preferences to the new dialog Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-10-01 21:59:53 +00:00
{
ui = new Ui::PreferencesGraph();
ui->setupUi(this);
}
PreferencesGraph::~PreferencesGraph()
{
delete ui;
}
void PreferencesGraph::refreshSettings()
{
ui->pheThreshold->setValue(prefs.pp_graphs.phe_threshold);
minimal pO2 threshold: split max threshold into min and max Nothing really special here. Just a split of the only p02 max threshold into a min threshold and max threshold, and the adaptation of the UI. Change of translatable strings included. ref: https://github.com/Subsurface-divelog/subsurface/issues/259 Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2017-03-24 18:11:31 +00:00
ui->po2ThresholdMax->setValue(prefs.pp_graphs.po2_threshold_max);
ui->po2ThresholdMin->setValue(prefs.pp_graphs.po2_threshold_min);
Preferences: move graph preferences to the new dialog Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-10-01 21:59:53 +00:00
ui->pn2Threshold->setValue(prefs.pp_graphs.pn2_threshold);
ui->maxpo2->setValue(prefs.modpO2);
ui->red_ceiling->setChecked(prefs.redceiling);
Deco mode for plannining is not deco mode for showing We had (in the wrong place, imo) a new feature that should differentiate the different deco_modes, you could plan your dive in buelhman and see it in vpm-b, for instance but both of them accessed the same pref. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-11-01 16:00:06 +00:00
if (prefs.display_deco_mode == BUEHLMANN) {
Add preference to change deco model Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-10-03 14:25:48 +00:00
ui->buehlmann->setChecked(true);
ui->vpmb->setChecked(false);
Preferences: set deco parameters correctly enabled And fix another bug in this area of the code. It appeared that the gflow/gfhigh and conservatism deco parameters where not enabled at startup, but after toggling the VPM vs BUEHLMANN setting they were. So, fix this as well. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-10-16 17:50:32 +00:00
on_buehlmann_toggled(true);
Add preference to change deco model Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-10-03 14:25:48 +00:00
} else {
ui->buehlmann->setChecked(false);
Actually turn on the vpmb radio button in VPM-B mode this fixes a typo. Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-11-02 08:54:09 +00:00
ui->vpmb->setChecked(true);
Preferences: set deco parameters correctly enabled And fix another bug in this area of the code. It appeared that the gflow/gfhigh and conservatism deco parameters where not enabled at startup, but after toggling the VPM vs BUEHLMANN setting they were. So, fix this as well. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-10-16 17:50:32 +00:00
on_buehlmann_toggled(false);
Add preference to change deco model Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-10-03 14:25:48 +00:00
}
Deco mode for plannining is not deco mode for showing We had (in the wrong place, imo) a new feature that should differentiate the different deco_modes, you could plan your dive in buelhman and see it in vpm-b, for instance but both of them accessed the same pref. Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-11-01 16:00:06 +00:00
Preferences: move graph preferences to the new dialog Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-10-01 21:59:53 +00:00
ui->gflow->setValue(prefs.gflow);
ui->gfhigh->setValue(prefs.gfhigh);
Separate VPM-B conservatism preference for planner and profile Separate the VPM-B conservatism preference into diveplan.vpmb_conservatism for planning dives and prefs.vpmb_conservatism for profile ceiling display of saved dives. Signed-off-by: Rick Walsh <rickmwalsh@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-09-24 08:02:08 +00:00
ui->vpmb_conservatism->setValue(prefs.vpmb_conservatism);
Preferences: move graph preferences to the new dialog Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-10-01 21:59:53 +00:00
ui->show_ccr_setpoint->setChecked(prefs.show_ccr_setpoint);
ui->show_ccr_sensors->setChecked(prefs.show_ccr_sensors);
Plot OC-pO2 graph for SCR dives This commit allows plotting the OC-equivalent pO2 graph for PSCR dives. This happens in both the cases where there is no external O2-monitoring AND when there is external pO2 monitoring. The calculations are only done for PSCR dives and is achieved as follows: 1) Within plot-info create a pressure-t called OC_pO2 in profile.h and populate this variable with the open-circuit pO2 values in profile.c. 2) Create a new partialPressureGasItem ocpo2GasItem in profilewidget2.h and, in profilewidget2.cpp, initialise it to read the plot-info OC_pO2 values and enable its display by using the setVisible method. The diveplotdatamodel was also touched in order to achieve this. 3) Create a pref button that controls the display of OC-pO2 for SCR dives 4) Change the colour of the OC-pO2 grpah to orange 5) Change the connection of the crr_OC_pO2 signal to be appropriate 6) rename the OC_pO2 attribute to scr_OC-pO2 Signed-off-by: Willem Ferguson <willemferguson@zoology.up.ac.za>
2018-03-14 15:13:37 +00:00
ui->show_scr_ocpo2->setChecked(prefs.show_scr_ocpo2);
Preferences: move graph preferences to the new dialog Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-10-01 21:59:53 +00:00
ui->defaultSetpoint->setValue((double)prefs.defaultsetpoint / 1000.0);
ui->psro2rate->setValue(prefs.o2consumption / 1000.0);
Change calls to rint into lrint avoiding conversion warnings Using gcc option "-Wfloat-conversion" is useful to catch potential conversion errors (where lrint should be used). rint returns double and still raises the same warning, this is why this change updates all rint calls to lrint. In few places, where input type is a float, corresponding lrinf is used. Signed-off-by: Jeremie Guichard <djebrest@gmail.com>
2017-03-08 06:41:41 +00:00
ui->pscrfactor->setValue(lrint(1000.0 / prefs.pscr_ratio));
Preferences: move graph preferences to the new dialog Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-10-01 21:59:53 +00:00
ui->show_average_depth->setChecked(prefs.show_average_depth);
Add a preference to turn on ICD warnings Signed-off-by: Robert C. Helling <helling@atdotde.de>
2018-02-05 14:58:25 +00:00
ui->show_icd->setChecked(prefs.show_icd);
Preferences: move graph preferences to the new dialog Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-10-01 21:59:53 +00:00
}
void PreferencesGraph::syncSettings()
{
desktop-widgets/preferences: reemove SettingsObjectWrapper remove use of SettingsObjectWrapper:: remove include of SettingsObjectWrapper.h use qPrefFoo:: for setters and getters replace prefs.foo with qPrefXYZ::foo() where feasible (this expands to the same code, but gives us more control over the variable). Signed-off-by: Jan Iversen <jani@apache.org>
2018-08-15 09:50:53 +00:00
qPrefGeneral::set_defaultsetpoint(lrint(ui->defaultSetpoint->value() * 1000.0));
qPrefGeneral::set_o2consumption(lrint(ui->psro2rate->value() *1000.0));
qPrefGeneral::set_pscr_ratio(lrint(1000.0 / ui->pscrfactor->value()));
Preferences: move graph preferences to the new dialog Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-10-01 21:59:53 +00:00
desktop-widgets/preferences: reemove SettingsObjectWrapper remove use of SettingsObjectWrapper:: remove include of SettingsObjectWrapper.h use qPrefFoo:: for setters and getters replace prefs.foo with qPrefXYZ::foo() where feasible (this expands to the same code, but gives us more control over the variable). Signed-off-by: Jan Iversen <jani@apache.org>
2018-08-15 09:50:53 +00:00
qPrefPartialPressureGas::set_phe_threshold(ui->pheThreshold->value());
qPrefPartialPressureGas::set_po2_threshold_max(ui->po2ThresholdMax->value());
qPrefPartialPressureGas::set_po2_threshold_min(ui->po2ThresholdMin->value());
qPrefPartialPressureGas::set_pn2_threshold(ui->pn2Threshold->value());
Preferences: move graph preferences to the new dialog Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-10-01 21:59:53 +00:00
desktop-widgets/preferences: reemove SettingsObjectWrapper remove use of SettingsObjectWrapper:: remove include of SettingsObjectWrapper.h use qPrefFoo:: for setters and getters replace prefs.foo with qPrefXYZ::foo() where feasible (this expands to the same code, but gives us more control over the variable). Signed-off-by: Jan Iversen <jani@apache.org>
2018-08-15 09:50:53 +00:00
qPrefTechnicalDetails::set_modpO2(ui->maxpo2->value());
qPrefTechnicalDetails::set_redceiling(ui->red_ceiling->isChecked());
desktop_widget: preferences_graph, replace setBuehlmann setBuehlmann is really planner_deco_mode = BUEHLMANN, change to ensure consistency. Signed-off-by: Jan Iversen <jani@apache.org>
2018-08-04 17:26:51 +00:00
prefs.planner_deco_mode = ui->buehlmann->isChecked() ? BUEHLMANN : VPMB;
desktop-widgets/preferences: reemove SettingsObjectWrapper remove use of SettingsObjectWrapper:: remove include of SettingsObjectWrapper.h use qPrefFoo:: for setters and getters replace prefs.foo with qPrefXYZ::foo() where feasible (this expands to the same code, but gives us more control over the variable). Signed-off-by: Jan Iversen <jani@apache.org>
2018-08-15 09:50:53 +00:00
qPrefTechnicalDetails::set_gflow(ui->gflow->value());
qPrefTechnicalDetails::set_gfhigh(ui->gfhigh->value());
Preferences: wire-up the deco parameters The deco parameters need special treatment to wire them up to the underlying deco model code. And with the new preferences setup this is a lot of boilerplate. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-10-16 17:35:01 +00:00
set_gf(ui->gflow->value(), ui->gfhigh->value());
desktop-widgets/preferences: reemove SettingsObjectWrapper remove use of SettingsObjectWrapper:: remove include of SettingsObjectWrapper.h use qPrefFoo:: for setters and getters replace prefs.foo with qPrefXYZ::foo() where feasible (this expands to the same code, but gives us more control over the variable). Signed-off-by: Jan Iversen <jani@apache.org>
2018-08-15 09:50:53 +00:00
qPrefTechnicalDetails::set_vpmb_conservatism(ui->vpmb_conservatism->value());
Preferences: wire-up the deco parameters The deco parameters need special treatment to wire them up to the underlying deco model code. And with the new preferences setup this is a lot of boilerplate. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
2018-10-16 17:35:01 +00:00
set_vpmb_conservatism(ui->vpmb_conservatism->value());
desktop-widgets/preferences: reemove SettingsObjectWrapper remove use of SettingsObjectWrapper:: remove include of SettingsObjectWrapper.h use qPrefFoo:: for setters and getters replace prefs.foo with qPrefXYZ::foo() where feasible (this expands to the same code, but gives us more control over the variable). Signed-off-by: Jan Iversen <jani@apache.org>
2018-08-15 09:50:53 +00:00
qPrefTechnicalDetails::set_show_ccr_setpoint(ui->show_ccr_setpoint->isChecked());
qPrefTechnicalDetails::set_show_ccr_sensors(ui->show_ccr_sensors->isChecked());
qPrefTechnicalDetails::set_show_scr_ocpo2(ui->show_scr_ocpo2->isChecked());
qPrefTechnicalDetails::set_show_average_depth(ui->show_average_depth->isChecked());
qPrefTechnicalDetails::set_show_icd(ui->show_icd->isChecked());
qPrefTechnicalDetails::set_display_deco_mode(ui->vpmb->isChecked() ? VPMB : BUEHLMANN);
Preferences: move graph preferences to the new dialog Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-10-01 21:59:53 +00:00
}
#define DANGER_GF (gf > 100) ? "* { color: red; }" : ""
void PreferencesGraph::on_gflow_valueChanged(int gf)
{
ui->gflow->setStyleSheet(DANGER_GF);
}
void PreferencesGraph::on_gfhigh_valueChanged(int gf)
{
ui->gfhigh->setStyleSheet(DANGER_GF);
}
Add preference to change deco model Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-10-03 14:25:48 +00:00
void PreferencesGraph::on_buehlmann_toggled(bool buehlmann)
{
ui->gfhigh->setEnabled(buehlmann);
ui->gflow->setEnabled(buehlmann);
Also grey out labels when not relevant for current deco mode Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-11-02 09:00:51 +00:00
ui->label_GFhigh->setEnabled(buehlmann);
ui->label_GFlow->setEnabled(buehlmann);
Add preference to change deco model Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-10-03 14:25:48 +00:00
ui->vpmb_conservatism->setEnabled(!buehlmann);
Also grey out labels when not relevant for current deco mode Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-11-02 09:00:51 +00:00
ui->label_VPMB->setEnabled(!buehlmann);
Add preference to change deco model Signed-off-by: Robert C. Helling <helling@atdotde.de> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-10-03 14:25:48 +00:00
}
Move subsurface-core to core and qt-mobile to mobile-widgets Having subsurface-core as a directory name really messes with autocomplete and is obviously redundant. Simmilarly, qt-mobile caused an autocomplete conflict and also was inconsistent with the desktop-widget name for the directory containing the "other" UI. And while cleaning up the resulting change in the path name for include files, I decided to clean up those even more to make them consistent overall. This could have been handled in more commits, but since this requires a make clean before the build, it seemed more sensible to do it all in one. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2016-04-05 05:02:03 +00:00
#undef DANGER_GF
Reference in a new issue Copy permalink