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

Be more consistent in partial pressure naming

Browse source 
Lets just use pO₂ instead of PO2, ppO2, ppO₂, PO₂.
They all mean the same, but it's better to be
consistent

Signed-off-by: Henrik Brautaset Aronsen <subsurface@henrik.synth.no>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Henrik Brautaset Aronsen 2014-06-22 16:41:44 +02:00 • committed by Dirk Hohndel
parent 21916d67de
commit 630ec88dd4
19 changed files with 59 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

8
qt-ui/diveplanner.cpp
View file

@ -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;
}

6
qt-ui/models.cpp
View file

@ -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;

4
qt-ui/plannerSettings.ui
View file

@ -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>

6
qt-ui/preferences.cpp
View file

@ -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);

4
qt-ui/preferences.ui
View file

@ -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>

2
qt-ui/profile/diveeventitem.cpp
View file

@ -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!") :

8
qt-ui/profile/diveplotdatamodel.cpp
View file

@ -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);