diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/color.cpp | 2 | ||||
| -rw-r--r-- | core/color.h | 2 | ||||
| -rw-r--r-- | core/pref.h | 1 | ||||
| -rw-r--r-- | core/profile.c | 2 | ||||
| -rw-r--r-- | core/profile.h | 1 | ||||
| -rw-r--r-- | core/subsurface-qt/SettingsObjectWrapper.cpp | 18 | ||||
| -rw-r--r-- | core/subsurface-qt/SettingsObjectWrapper.h | 4 | ||||
| -rw-r--r-- | core/subsurfacestartup.c | 1 |
8 files changed, 31 insertions, 0 deletions
diff --git a/core/color.cpp b/core/color.cpp index b5bbc3269..6ac7fc761 100644 --- a/core/color.cpp +++ b/core/color.cpp @@ -32,6 +32,8 @@ void fill_profile_color() profile_color[CCRSENSOR1] = COLOR(TUNDORA1_MED_TRANS, BLACK1_LOW_TRANS, TUNDORA1_MED_TRANS); profile_color[CCRSENSOR2] = COLOR(ROYALBLUE2_LOW_TRANS, BLACK1_LOW_TRANS, ROYALBLUE2_LOW_TRANS); profile_color[CCRSENSOR3] = COLOR(PEANUT, BLACK1_LOW_TRANS, PEANUT); + profile_color[SCR_OCPO2] = COLOR(PIRATEGOLD1_MED_TRANS, BLACK1_LOW_TRANS, PIRATEGOLD1_MED_TRANS); + profile_color[PP_LINES] = COLOR(BLACK1_HIGH_TRANS, BLACK1_LOW_TRANS, BLACK1_HIGH_TRANS); profile_color[TEXT_BACKGROUND] = COLOR(CONCRETE1_LOWER_TRANS, WHITE1, CONCRETE1_LOWER_TRANS); diff --git a/core/color.h b/core/color.h index 9e2496c8b..bf2f1ddcb 100644 --- a/core/color.h +++ b/core/color.h @@ -29,6 +29,7 @@ #define PERSIANRED1 QColor::fromRgbF(0.8, 0.2, 0.2, 1) #define TUSCANY1 QColor::fromRgbF(0.8, 0.4, 0.2, 1) #define PIRATEGOLD1 QColor::fromRgbF(0.8, 0.5, 0.0, 1) +#define PIRATEGOLD1_MED_TRANS QColor::fromRgbF(0.8, 0.5, 0.0, 0.75) #define HOKEYPOKEY1 QColor::fromRgbF(0.8, 0.6, 0.2, 1) #define CINNABAR1 QColor::fromRgbF(0.9, 0.3, 0.2, 1) #define REDORANGE1 QColor::fromRgbF(1.0, 0.2, 0.2, 1) @@ -102,6 +103,7 @@ typedef enum { CCRSENSOR1, CCRSENSOR2, CCRSENSOR3, + SCR_OCPO2, PP_LINES, /* Other colors */ diff --git a/core/pref.h b/core/pref.h index 3ba7c26d3..2628c3677 100644 --- a/core/pref.h +++ b/core/pref.h @@ -87,6 +87,7 @@ struct preferences { bool gf_low_at_maxdepth; bool show_ccr_setpoint; bool show_ccr_sensors; + bool show_scr_ocpo2; bool display_invalid_dives; short unit_system; struct units units; diff --git a/core/profile.c b/core/profile.c index 835e68dcc..c5105c4f5 100644 --- a/core/profile.c +++ b/core/profile.c @@ -1214,6 +1214,8 @@ static void calculate_gas_information_new(struct dive *dive, struct divecomputer fill_pressures(&entry->pressures, amb_pressure, gasmix, entry->o2pressure.mbar / 1000.0, dive->dc.divemode); fn2 = (int)(1000.0 * entry->pressures.n2 / amb_pressure); fhe = (int)(1000.0 * entry->pressures.he / amb_pressure); + if (dc->divemode == PSCR) // OC pO2 is calulated for PSCR with or without external PO2 monitoring. + entry->scr_OC_pO2.mbar = (int) depth_to_mbar(entry->depth, dive) * get_o2(get_gasmix(dive, dc, entry->sec, &ev, gasmix)) / 1000; /* Calculate MOD, EAD, END and EADD based on partial pressures calculated before * so there is no difference in calculating between OC and CC diff --git a/core/profile.h b/core/profile.h index 0a215d47e..58c44d955 100644 --- a/core/profile.h +++ b/core/profile.h @@ -46,6 +46,7 @@ struct plot_data { pressure_t o2pressure; // for rebreathers, this is consensus measured po2, or setpoint otherwise. 0 for OC. pressure_t o2sensor[3]; //for rebreathers with up to 3 PO2 sensors pressure_t o2setpoint; + pressure_t scr_OC_pO2; double mod, ead, end, eadd; velocity_t velocity; int speed; diff --git a/core/subsurface-qt/SettingsObjectWrapper.cpp b/core/subsurface-qt/SettingsObjectWrapper.cpp index cd1054b97..aaa907759 100644 --- a/core/subsurface-qt/SettingsObjectWrapper.cpp +++ b/core/subsurface-qt/SettingsObjectWrapper.cpp @@ -392,6 +392,11 @@ bool TechnicalDetailsSettings::rulerGraph() const return prefs.rulergraph; } +bool TechnicalDetailsSettings::showSCROCpO2() const +{ + return prefs.show_scr_ocpo2; +} + bool TechnicalDetailsSettings::showCCRSetpoint() const { return prefs.show_ccr_setpoint; @@ -667,6 +672,18 @@ void TechnicalDetailsSettings::setShowCCRSetpoint(bool value) emit showCCRSetpointChanged(value); } +void TechnicalDetailsSettings::setShowSCROCpO2(bool value) +{ + if (value == prefs.show_scr_ocpo2) + return; + + QSettings s; + s.beginGroup(group); + s.setValue("show_scr_ocpo2", value); + prefs.show_scr_ocpo2 = value; + emit showSCROCpO2Changed(value); +} + void TechnicalDetailsSettings::setShowCCRSensors(bool value) { if (value == prefs.show_ccr_sensors) @@ -2222,6 +2239,7 @@ void SettingsObjectWrapper::load() GET_BOOL("gf_low_at_maxdepth", gf_low_at_maxdepth); GET_BOOL("show_ccr_setpoint",show_ccr_setpoint); GET_BOOL("show_ccr_sensors",show_ccr_sensors); + GET_BOOL("show_scr_ocpo2",show_scr_ocpo2); GET_BOOL("zoomed_plot", zoomed_plot); set_gf(prefs.gflow, prefs.gfhigh); set_vpmb_conservatism(prefs.vpmb_conservatism); diff --git a/core/subsurface-qt/SettingsObjectWrapper.h b/core/subsurface-qt/SettingsObjectWrapper.h index 94bbcf5fc..f2c6745d8 100644 --- a/core/subsurface-qt/SettingsObjectWrapper.h +++ b/core/subsurface-qt/SettingsObjectWrapper.h @@ -135,6 +135,7 @@ class TechnicalDetailsSettings : public QObject { Q_PROPERTY(bool rulergraph READ rulerGraph WRITE setRulerGraph NOTIFY rulerGraphChanged) Q_PROPERTY(bool show_ccr_setpoint READ showCCRSetpoint WRITE setShowCCRSetpoint NOTIFY showCCRSetpointChanged) Q_PROPERTY(bool show_ccr_sensors READ showCCRSensors WRITE setShowCCRSensors NOTIFY showCCRSensorsChanged) + Q_PROPERTY(bool show_scr_ocpo2 READ showSCROCpO2 WRITE setShowSCROCpO2 NOTIFY showSCROCpO2Changed) Q_PROPERTY(bool zoomed_plot READ zoomedPlot WRITE setZoomedPlot NOTIFY zoomedPlotChanged) Q_PROPERTY(bool show_sac READ showSac WRITE setShowSac NOTIFY showSacChanged) Q_PROPERTY(bool display_unused_tanks READ displayUnusedTanks WRITE setDisplayUnusedTanks NOTIFY displayUnusedTanksChanged) @@ -165,6 +166,7 @@ public: bool rulerGraph() const; bool showCCRSetpoint() const; bool showCCRSensors() const; + bool showSCROCpO2() const; bool zoomedPlot() const; bool showSac() const; bool displayUnusedTanks() const; @@ -193,6 +195,7 @@ public slots: void setRulerGraph(bool value); void setShowCCRSetpoint(bool value); void setShowCCRSensors(bool value); + void setShowSCROCpO2(bool value); void setZoomedPlot(bool value); void setShowSac(bool value); void setDisplayUnusedTanks(bool value); @@ -221,6 +224,7 @@ signals: void rulerGraphChanged(bool value); void showCCRSetpointChanged(bool value); void showCCRSensorsChanged(bool value); + void showSCROCpO2Changed(bool value); void zoomedPlotChanged(bool value); void showSacChanged(bool value); void displayUnusedTanksChanged(bool value); diff --git a/core/subsurfacestartup.c b/core/subsurfacestartup.c index 1f71d2117..9d7d9494b 100644 --- a/core/subsurfacestartup.c +++ b/core/subsurfacestartup.c @@ -42,6 +42,7 @@ struct preferences default_prefs = { .gf_low_at_maxdepth = false, .show_ccr_setpoint = false, .show_ccr_sensors = false, + .show_scr_ocpo2 = false, .font_size = -1, .display_invalid_dives = false, .show_sac = false, |