From 1e607ae98d2f57ebb8dab27ada29187d9bd2dffb Mon Sep 17 00:00:00 2001 From: Rick Walsh Date: Sat, 21 May 2016 20:14:23 +1000 Subject: fixup: Don't confuse EAD and END The previous patch (Planner: add best mix EAD preference) used the term EAD (equivalent air depth) in variable names and strings, when it should have been END (equivalent narcotic depth). They're not the same thing and shouldn't be confused. Signed-off-by: Rick Walsh Signed-off-by: Dirk Hohndel --- desktop-widgets/diveplanner.cpp | 16 ++++++++-------- desktop-widgets/diveplanner.h | 2 +- desktop-widgets/plannerSettings.ui | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'desktop-widgets') diff --git a/desktop-widgets/diveplanner.cpp b/desktop-widgets/diveplanner.cpp index ac322d200..0455573e4 100644 --- a/desktop-widgets/diveplanner.cpp +++ b/desktop-widgets/diveplanner.cpp @@ -288,7 +288,7 @@ PlannerSettingsWidget::PlannerSettingsWidget(QWidget *parent, Qt::WindowFlags f) prefs.descrate = s.value("descrate", prefs.descrate).toInt(); prefs.bottompo2 = s.value("bottompo2", prefs.bottompo2).toInt(); prefs.decopo2 = s.value("decopo2", prefs.decopo2).toInt(); - prefs.bestmixead = s.value("bestmixead", prefs.bestmixead).toInt(); + prefs.bestmixend = s.value("bestmixend", prefs.bestmixend).toInt(); prefs.doo2breaks = s.value("doo2breaks", prefs.doo2breaks).toBool(); prefs.switch_at_req_stop = s.value("switch_at_req_stop", prefs.switch_at_req_stop).toBool(); prefs.min_switch_duration = s.value("min_switch_duration", prefs.min_switch_duration).toInt(); @@ -352,7 +352,7 @@ PlannerSettingsWidget::PlannerSettingsWidget(QWidget *parent, Qt::WindowFlags f) connect(ui.descRate, SIGNAL(valueChanged(int)), plannerModel, SLOT(emitDataChanged())); connect(ui.bottompo2, SIGNAL(valueChanged(double)), this, SLOT(setBottomPo2(double))); connect(ui.decopo2, SIGNAL(valueChanged(double)), this, SLOT(setDecoPo2(double))); - connect(ui.bestmixEAD, SIGNAL(valueChanged(int)), this, SLOT(setBestmixEAD(int))); + connect(ui.bestmixEND, SIGNAL(valueChanged(int)), this, SLOT(setBestmixEND(int))); connect(ui.drop_stone_mode, SIGNAL(toggled(bool)), plannerModel, SLOT(setDropStoneMode(bool))); connect(ui.bottomSAC, SIGNAL(valueChanged(double)), this, SLOT(bottomSacChanged(double))); connect(ui.decoStopSAC, SIGNAL(valueChanged(double)), this, SLOT(decoSacChanged(double))); @@ -382,7 +382,7 @@ void PlannerSettingsWidget::updateUnitsUI() ui.ascRateStops->setValue(rint(prefs.ascratestops / UNIT_FACTOR)); ui.ascRateLast6m->setValue(rint(prefs.ascratelast6m / UNIT_FACTOR)); ui.descRate->setValue(rint(prefs.descrate / UNIT_FACTOR)); - ui.bestmixEAD->setValue(rint(get_depth_units(prefs.bestmixead, NULL, NULL))); + ui.bestmixEND->setValue(rint(get_depth_units(prefs.bestmixend, NULL, NULL))); } PlannerSettingsWidget::~PlannerSettingsWidget() @@ -403,7 +403,7 @@ PlannerSettingsWidget::~PlannerSettingsWidget() s.setValue("descrate", prefs.descrate); s.setValue("bottompo2", prefs.bottompo2); s.setValue("decopo2", prefs.decopo2); - s.setValue("bestmixead", prefs.bestmixead); + s.setValue("bestmixend", prefs.bestmixend); s.setValue("doo2breaks", prefs.doo2breaks); s.setValue("drop_stone_mode", prefs.drop_stone_mode); s.setValue("switch_at_req_stop", prefs.switch_at_req_stop); @@ -426,13 +426,13 @@ void PlannerSettingsWidget::settingsChanged() ui.lastStop->setText(tr("Last stop at 20ft")); ui.asc50to6->setText(tr("50% avg. depth to 20ft")); ui.asc6toSurf->setText(tr("20ft to surface")); - ui.bestmixEAD->setSuffix(tr("ft")); + ui.bestmixEND->setSuffix(tr("ft")); } else { vs.append(tr("m/min")); ui.lastStop->setText(tr("Last stop at 6m")); ui.asc50to6->setText(tr("50% avg. depth to 6m")); ui.asc6toSurf->setText(tr("6m to surface")); - ui.bestmixEAD->setSuffix(tr("m")); + ui.bestmixEND->setSuffix(tr("m")); } if(get_units()->volume == units::CUFT) { ui.bottomSAC->setSuffix(tr("cuft/min")); @@ -514,9 +514,9 @@ void PlannerSettingsWidget::setDecoPo2(double po2) prefs.decopo2 = (int) (po2 * 1000.0); } -void PlannerSettingsWidget::setBestmixEAD(int depth) +void PlannerSettingsWidget::setBestmixEND(int depth) { - prefs.bestmixead = units_to_depth(depth); + prefs.bestmixend = units_to_depth(depth); } void PlannerSettingsWidget::setBackgasBreaks(bool dobreaks) diff --git a/desktop-widgets/diveplanner.h b/desktop-widgets/diveplanner.h index 69f993824..cf3a172c9 100644 --- a/desktop-widgets/diveplanner.h +++ b/desktop-widgets/diveplanner.h @@ -78,7 +78,7 @@ slots: void setDescRate(int rate); void setBottomPo2(double po2); void setDecoPo2(double po2); - void setBestmixEAD(int depth); + void setBestmixEND(int depth); void setBackgasBreaks(bool dobreaks); void disableDecoElements(int mode); diff --git a/desktop-widgets/plannerSettings.ui b/desktop-widgets/plannerSettings.ui index 2ec8d4ab3..81783cf80 100644 --- a/desktop-widgets/plannerSettings.ui +++ b/desktop-widgets/plannerSettings.ui @@ -589,7 +589,7 @@ - + m @@ -622,9 +622,9 @@ - + - Best mix EAD + Best mix END @@ -765,7 +765,7 @@ decoStopSAC bottompo2 decopo2 - bestmixEAD + bestmixEND display_runtime display_duration display_transitions -- cgit v1.2.3-70-g09d2