aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Martin Měřinský <mermar@centrum.cz>2017-02-20 09:29:20 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2017-03-04 12:08:17 -0800
commitb14301a84c28cb65abfbc970f20b67d41bcda26a (patch)
tree8912d2dbe661a904c5883aed219da309fe98dcae
parent869a7fcfcc6691f81a77ed56d7a437d34b623865 (diff)
downloadsubsurface-b14301a84c28cb65abfbc970f20b67d41bcda26a.tar.gz
heartrate, heartbeat > heart rate
-rw-r--r--core/profile.c2
-rw-r--r--profile-widget/diveprofileitem.cpp8
-rw-r--r--profile-widget/profilewidget2.cpp2
3 files changed, 6 insertions, 6 deletions
diff --git a/core/profile.c b/core/profile.c
index 01c1c0235..502952bc7 100644
--- a/core/profile.c
+++ b/core/profile.c
@@ -1407,7 +1407,7 @@ static void plot_string(struct plot_info *pi, struct plot_data *entry, struct me
}
}
if (entry->heartbeat && prefs.hrgraph)
- put_format(b, translate("gettextFromC", "heartbeat: %d\n"), entry->heartbeat);
+ put_format(b, translate("gettextFromC", "heart rate: %d\n"), entry->heartbeat);
if (entry->bearing)
put_format(b, translate("gettextFromC", "bearing: %d\n"), entry->bearing);
if (entry->running_sum) {
diff --git a/profile-widget/diveprofileitem.cpp b/profile-widget/diveprofileitem.cpp
index 83857abf8..7caa8ce39 100644
--- a/profile-widget/diveprofileitem.cpp
+++ b/profile-widget/diveprofileitem.cpp
@@ -292,7 +292,7 @@ void DiveHeartrateItem::modelDataChanged(const QModelIndex &topLeft, const QMode
qDeleteAll(texts);
texts.clear();
- // Ignore empty values. a heartrate of 0 would be a bad sign.
+ // Ignore empty values. a heart rate of 0 would be a bad sign.
QPolygonF poly;
for (int i = 0, modelDataCount = dataModel->rowCount(); i < modelDataCount; i++) {
int hr = dataModel->index(i, vDataColumn).data().toInt();
@@ -371,7 +371,7 @@ void DivePercentageItem::modelDataChanged(const QModelIndex &topLeft, const QMod
if (!shouldCalculateStuff(topLeft, bottomRight))
return;
- // Ignore empty values. a heartrate of 0 would be a bad sign.
+ // Ignore empty values. a heart rate of 0 would be a bad sign.
QPolygonF poly;
for (int i = 0, modelDataCount = dataModel->rowCount(); i < modelDataCount; i++) {
sec = dataModel->index(i, hDataColumn).data().toInt();
@@ -451,7 +451,7 @@ void DiveAmbPressureItem::modelDataChanged(const QModelIndex &topLeft, const QMo
if (!shouldCalculateStuff(topLeft, bottomRight))
return;
- // Ignore empty values. a heartrate of 0 would be a bad sign.
+ // Ignore empty values. a heart rate of 0 would be a bad sign.
QPolygonF poly;
for (int i = 0, modelDataCount = dataModel->rowCount(); i < modelDataCount; i++) {
int hr = dataModel->index(i, vDataColumn).data().toInt();
@@ -499,7 +499,7 @@ void DiveGFLineItem::modelDataChanged(const QModelIndex &topLeft, const QModelIn
if (!shouldCalculateStuff(topLeft, bottomRight))
return;
- // Ignore empty values. a heartrate of 0 would be a bad sign.
+ // Ignore empty values. a heart rate of 0 would be a bad sign.
QPolygonF poly;
for (int i = 0, modelDataCount = dataModel->rowCount(); i < modelDataCount; i++) {
int hr = dataModel->index(i, vDataColumn).data().toInt();
diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp
index 56cfae57f..a197580b1 100644
--- a/profile-widget/profilewidget2.cpp
+++ b/profile-widget/profilewidget2.cpp
@@ -482,7 +482,7 @@ void ProfileWidget2::setupItemSizes()
itemPos.temperature.intermediate.setP2(QPointF(0, 12));
#endif
- // Heartbeat axis config
+ // Heart rate axis config
itemPos.heartBeat.pos.on.setX(3);
itemPos.heartBeat.pos.on.setY(82);
itemPos.heartBeat.expanded.setP1(QPointF(0, 0));