From 7e9b59bbf65c28f3b3da4122c50f5d17caf63752 Mon Sep 17 00:00:00 2001 From: Seeker4 Date: Wed, 1 May 2019 09:05:01 -0700 Subject: [PATCH] Change measurement units from metric/arhiac to Metric/English --- oscar/Graphs/gYAxis.h | 2 +- oscar/SleepLib/common.cpp | 2 +- oscar/SleepLib/common.h | 2 +- oscar/daily.cpp | 10 +++++----- oscar/newprofile.cpp | 6 +++--- oscar/newprofile.ui | 6 +++--- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/oscar/Graphs/gYAxis.h b/oscar/Graphs/gYAxis.h index 666d61b0..263fa810 100644 --- a/oscar/Graphs/gYAxis.h +++ b/oscar/Graphs/gYAxis.h @@ -169,7 +169,7 @@ class gYAxisWeight: public gYAxis gYAxisWeight(UnitSystem us = US_Metric, QColor col = Qt::black) : gYAxis(col), m_unitsystem(us) {} virtual ~gYAxisWeight() {} - //! \brief Returns the current UnitSystem displayed (eg, US_Metric (the rest of the world), US_Archiac (American) ) + //! \brief Returns the current UnitSystem displayed (eg, US_Metric (the rest of the world), US_English (American) ) UnitSystem unitSystem() { return m_unitsystem; } //! \brief Set the unit system displayed by this YTicker diff --git a/oscar/SleepLib/common.cpp b/oscar/SleepLib/common.cpp index cc3b6b36..66c4f0fc 100644 --- a/oscar/SleepLib/common.cpp +++ b/oscar/SleepLib/common.cpp @@ -220,7 +220,7 @@ QString weightString(float kg, UnitSystem us) if (us == US_Metric) { return QString("%1kg").arg(kg, 0, 'f', 2); - } else if (us == US_Archiac) { + } else if (us == US_English) { int oz = (kg * 1000.0) / (float)ounce_convert; int lb = oz / 16.0; oz = oz % 16; diff --git a/oscar/SleepLib/common.h b/oscar/SleepLib/common.h index 9b957926..5d2d0304 100644 --- a/oscar/SleepLib/common.h +++ b/oscar/SleepLib/common.h @@ -53,7 +53,7 @@ const quint16 filetype_summary = 0; const quint16 filetype_data = 1; const quint16 filetype_sessenabled = 5; -enum UnitSystem { US_Undefined, US_Metric, US_Archiac }; +enum UnitSystem { US_Undefined, US_Metric, US_English }; typedef float EventDataType; diff --git a/oscar/daily.cpp b/oscar/daily.cpp index 6ca4b501..480a1a10 100644 --- a/oscar/daily.cpp +++ b/oscar/daily.cpp @@ -409,7 +409,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared) ui->splitter->setVisible(false); - if (p_profile->general->unitSystem()==US_Archiac) { + if (p_profile->general->unitSystem()==US_English) { ui->weightSpinBox->setSuffix(STR_UNIT_POUND); ui->weightSpinBox->setDecimals(0); ui->ouncesSpinBox->setVisible(true); @@ -798,7 +798,7 @@ void Daily::on_ReloadDay() ui->calButton->setText(ui->calendar->selectedDate().toString(Qt::TextDate)); ui->calendar->setFocus(Qt::ActiveWindowFocusReason); - if (p_profile->general->unitSystem()==US_Archiac) { + if (p_profile->general->unitSystem()==US_English) { ui->weightSpinBox->setSuffix(STR_UNIT_POUND); ui->weightSpinBox->setDecimals(0); ui->ouncesSpinBox->setVisible(true); @@ -1692,7 +1692,7 @@ void Daily::Load(QDate date) void Daily::UnitsChanged() { double kg; - if (p_profile->general->unitSystem()==US_Archiac) { + if (p_profile->general->unitSystem()==US_English) { kg=ui->weightSpinBox->value(); float ounces=(kg*1000.0)/ounce_convert; int pounds=ounces/16; @@ -2194,7 +2194,7 @@ void Daily::on_weightSpinBox_valueChanged(double arg1) { // Update the BMI display double kg; - if (p_profile->general->unitSystem()==US_Archiac) { + if (p_profile->general->unitSystem()==US_English) { kg=((arg1*pound_convert) + (ui->ouncesSpinBox->value()*ounce_convert)) / 1000.0; } else kg=arg1; double height=p_profile->user->height()/100.0; @@ -2216,7 +2216,7 @@ void Daily::on_weightSpinBox_editingFinished() } double kg; - if (p_profile->general->unitSystem()==US_Archiac) { + if (p_profile->general->unitSystem()==US_English) { kg=((arg1*pound_convert) + (ui->ouncesSpinBox->value()*ounce_convert)) / 1000.0; } else { kg=arg1; diff --git a/oscar/newprofile.cpp b/oscar/newprofile.cpp index b5a5fa10..fa3e7d77 100644 --- a/oscar/newprofile.cpp +++ b/oscar/newprofile.cpp @@ -238,7 +238,7 @@ void NewProfile::on_nextButton_clicked() UnitSystem us; if (ui->heightCombo->currentIndex() == 0) { us = US_Metric; } - else if (ui->heightCombo->currentIndex() == 1) { us = US_Archiac; } + else if (ui->heightCombo->currentIndex() == 1) { us = US_English; } else { us = US_Metric; } if (profile->general->unitSystem() != us) { @@ -249,7 +249,7 @@ void NewProfile::on_nextButton_clicked() double v = 0; - if (us == US_Archiac) { + if (us == US_English) { // convert to metric v = (ui->heightEdit->value() * 30.48); v += ui->heightEdit2->value() * 2.54; @@ -383,7 +383,7 @@ void NewProfile::edit(const QString name) double v = profile->user->height(); - if (us == US_Archiac) { // evil non-metric + if (us == US_English) { // evil non-metric int ti = v / 2.54; int feet = ti / 12; int inches = ti % 12; diff --git a/oscar/newprofile.ui b/oscar/newprofile.ui index 10474133..bcb3990a 100644 --- a/oscar/newprofile.ui +++ b/oscar/newprofile.ui @@ -40,7 +40,7 @@ - 3 + 2 @@ -456,12 +456,12 @@ - metric + Metric - archiac + English