summaryrefslogtreecommitdiffstats
path: root/qt-ui
diff options
context:
space:
mode:
Diffstat (limited to 'qt-ui')
-rw-r--r--qt-ui/diveplanner.cpp8
-rw-r--r--qt-ui/models.cpp6
-rw-r--r--qt-ui/plannerSettings.ui4
-rw-r--r--qt-ui/preferences.cpp6
-rw-r--r--qt-ui/preferences.ui4
-rw-r--r--qt-ui/profile/diveeventitem.cpp2
-rw-r--r--qt-ui/profile/diveplotdatamodel.cpp8
7 files changed, 19 insertions, 19 deletions
diff --git a/qt-ui/diveplanner.cpp b/qt-ui/diveplanner.cpp
index 654a58031..e8542da74 100644
--- a/qt-ui/diveplanner.cpp
+++ b/qt-ui/diveplanner.cpp
@@ -600,11 +600,11 @@ bool DivePlannerPointsModel::addGas(struct gasmix mix)
if (cylinder_nodata(cyl)) {
fill_default_cylinder(cyl);
cyl->gasmix = mix;
- /* The depth to change to that gas is given by the depth where its pO2 is 1.6 bar.
+ /* The depth to change to that gas is given by the depth where its pO₂ is 1.6 bar.
* The user should be able to change this depth manually. */
- pressure_t modppO2;
- modppO2.mbar = 1600;
- cyl->depth = gas_mod(&mix, modppO2);
+ pressure_t modpO2;
+ modpO2.mbar = 1600;
+ cyl->depth = gas_mod(&mix, modpO2);
CylindersModel::instance()->setDive(stagingDive);
return true;
}
diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp
index 09b737179..167f54813 100644
--- a/qt-ui/models.cpp
+++ b/qt-ui/models.cpp
@@ -249,9 +249,9 @@ bool CylindersModel::setData(const QModelIndex &index, const QVariant &value, in
case O2:
if (CHANGED()) {
cyl->gasmix.o2 = string_to_fraction(vString.toUtf8().data());
- pressure_t modppO2;
- modppO2.mbar = 1600;
- cyl->depth = gas_mod(&cyl->gasmix, modppO2);
+ pressure_t modpO2;
+ modpO2.mbar = 1600;
+ cyl->depth = gas_mod(&cyl->gasmix, modpO2);
changed = true;
}
break;
diff --git a/qt-ui/plannerSettings.ui b/qt-ui/plannerSettings.ui
index 7cb0c3572..547bd8124 100644
--- a/qt-ui/plannerSettings.ui
+++ b/qt-ui/plannerSettings.ui
@@ -65,14 +65,14 @@
<item row="1" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
- <string> bottom ppO2</string>
+ <string> bottom pO₂</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
- <string>deco ppO2</string>
+ <string>deco pO₂</string>
</property>
</widget>
</item>
diff --git a/qt-ui/preferences.cpp b/qt-ui/preferences.cpp
index 768275d26..034d1be6f 100644
--- a/qt-ui/preferences.cpp
+++ b/qt-ui/preferences.cpp
@@ -54,7 +54,7 @@ void PreferencesDialog::setUiFromPrefs()
ui.pheThreshold->setValue(prefs.pp_graphs.phe_threshold);
ui.po2Threshold->setValue(prefs.pp_graphs.po2_threshold);
ui.pn2Threshold->setValue(prefs.pp_graphs.pn2_threshold);
- ui.maxppo2->setValue(prefs.modppO2);
+ ui.maxpo2->setValue(prefs.modpO2);
ui.red_ceiling->setChecked(prefs.redceiling);
ui.units_group->setEnabled(ui.personalize->isChecked());
@@ -187,7 +187,7 @@ void PreferencesDialog::syncSettings()
s.setValue("phethreshold", ui.pheThreshold->value());
s.setValue("po2threshold", ui.po2Threshold->value());
s.setValue("pn2threshold", ui.pn2Threshold->value());
- s.setValue("modppO2", ui.maxppo2->value());
+ s.setValue("modpO2", ui.maxpo2->value());
SB("redceiling", ui.red_ceiling);
s.setValue("gflow", ui.gflow->value());
s.setValue("gfhigh", ui.gfhigh->value());
@@ -280,7 +280,7 @@ void PreferencesDialog::loadSettings()
GET_DOUBLE("pn2threshold", pp_graphs.pn2_threshold);
GET_DOUBLE("phethreshold", pp_graphs.phe_threshold);
GET_BOOL("mod", mod);
- GET_DOUBLE("modppO2", modppO2);
+ GET_DOUBLE("modpO2", modpO2);
GET_BOOL("ead", ead);
GET_BOOL("redceiling", redceiling);
GET_BOOL("dcceiling", dcceiling);
diff --git a/qt-ui/preferences.ui b/qt-ui/preferences.ui
index 485577d33..db99ff1fc 100644
--- a/qt-ui/preferences.ui
+++ b/qt-ui/preferences.ui
@@ -633,12 +633,12 @@
<bool>true</bool>
</property>
<property name="text">
- <string>max ppO₂ when showing MOD</string>
+ <string>max pO₂ when showing MOD</string>
</property>
</widget>
</item>
<item>
- <widget class="QDoubleSpinBox" name="maxppo2">
+ <widget class="QDoubleSpinBox" name="maxpo2">
<property name="enabled">
<bool>true</bool>
</property>
diff --git a/qt-ui/profile/diveeventitem.cpp b/qt-ui/profile/diveeventitem.cpp
index 0a468d084..fc65f8e79 100644
--- a/qt-ui/profile/diveeventitem.cpp
+++ b/qt-ui/profile/diveeventitem.cpp
@@ -92,7 +92,7 @@ void DiveEventItem::setupToolTipString()
}
} else if (type == SAMPLE_EVENT_PO2 && name == "SP change") {
// this is a bad idea - we are abusing an existing event type that is supposed to
- // warn of high or low PO2 and are turning it into a set point change event
+ // warn of high or low pO₂ and are turning it into a set point change event
name += "\n" + tr("Bailing out to OC");
} else {
name += internalEvent->flags == SAMPLE_FLAGS_BEGIN ? tr(" begin", "Starts with space!") :
diff --git a/qt-ui/profile/diveplotdatamodel.cpp b/qt-ui/profile/diveplotdatamodel.cpp
index 2fe636a4b..08bcf11bd 100644
--- a/qt-ui/profile/diveplotdatamodel.cpp
+++ b/qt-ui/profile/diveplotdatamodel.cpp
@@ -104,7 +104,7 @@ QVariant DivePlotDataModel::headerData(int section, Qt::Orientation orientation,
case CYLINDERINDEX:
return tr("Cylinder Index");
case SENSOR_PRESSURE:
- return tr("Pressure S");
+ return tr("Pressure S");
case INTERPOLATED_PRESSURE:
return tr("Pressure I");
case CEILING:
@@ -112,11 +112,11 @@ QVariant DivePlotDataModel::headerData(int section, Qt::Orientation orientation,
case SAC:
return tr("SAC");
case PN2:
- return tr("PN2");
+ return tr("pN₂");
case PHE:
- return tr("PHE");
+ return tr("pHe");
case PO2:
- return tr("PO2");
+ return tr("pO₂");
}
if (role == Qt::DisplayRole && section >= TISSUE_1 && section <= TISSUE_16) {
return QString("Ceiling: %1").arg(section - TISSUE_1);