Code cleanup: HeartRate item was doing insane things

This simplifies so much of the code that we were using to control
the visibility of the HeartRate. now things are much saner.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

3 files changed, 9 insertions, 30 deletions

diff --git a/qt-ui/profile/diveprofileitem.cpp b/qt-ui/profile/diveprofileitem.cpp
index cb5cec58b..c5321d770 100644
--- a/qt-ui/profile/diveprofileitem.cpp
+++ b/qt-ui/profile/diveprofileitem.cpp
@@ -254,7 +254,7 @@ DiveHeartrateItem::DiveHeartrateItem()
 	pen.setCosmetic(true);
 	pen.setWidth(1);
 	setPen(pen);
-	visible = true;
+	settingsChanged();
 }
 
 void DiveHeartrateItem::modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight)
@@ -335,20 +335,7 @@ void DiveHeartrateItem::paint(QPainter *painter, const QStyleOptionGraphicsItem
 
 void DiveHeartrateItem::settingsChanged()
 {
-	QSettings s;
-	s.beginGroup("TecDetails");
-	visible = s.value(visibilityKey).toBool();
-	setVisible(visible);
-}
-
-void DiveHeartrateItem::setVisibilitySettingsKey(const QString &key)
-{
-	visibilityKey = key;
-}
-
-bool DiveHeartrateItem::isVisible()
-{
-	return visible == true;
+	setVisible(prefs.hrgraph);
 }
 
 DiveTemperatureItem::DiveTemperatureItem()
diff --git a/qt-ui/profile/diveprofileitem.h b/qt-ui/profile/diveprofileitem.h
index ddf8f5154..f98af5184 100644
--- a/qt-ui/profile/diveprofileitem.h
+++ b/qt-ui/profile/diveprofileitem.h
@@ -102,13 +102,9 @@ public:
 	virtual void modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
 	virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
 	virtual void settingsChanged();
-	void setVisibilitySettingsKey(const QString &setVisibilitySettingsKey);
-	bool isVisible();
-
 private:
 	void createTextItem(int seconds, int hr);
 	QString visibilityKey;
-	bool visible;
 };
 
 class DiveGasPressureItem : public AbstractProfilePolygonItem {
diff --git a/qt-ui/profile/profilewidget2.cpp b/qt-ui/profile/profilewidget2.cpp
index a6b3564f8..e683b67f6 100644
--- a/qt-ui/profile/profilewidget2.cpp
+++ b/qt-ui/profile/profilewidget2.cpp
@@ -222,8 +222,6 @@ void ProfileWidget2::setupItemOnScene()
 	setupItem(gasPressureItem, timeAxis, cylinderPressureAxis, dataModel, DivePlotDataModel::TEMPERATURE, DivePlotDataModel::TIME, 1);
 	setupItem(temperatureItem, timeAxis, temperatureAxis, dataModel, DivePlotDataModel::TEMPERATURE, DivePlotDataModel::TIME, 1);
 	setupItem(heartBeatItem, timeAxis, heartBeatAxis, dataModel, DivePlotDataModel::HEARTBEAT, DivePlotDataModel::TIME, 1);
-	heartBeatItem->setVisibilitySettingsKey("hrgraph");
-	heartBeatItem->settingsChanged();
 	setupItem(diveProfileItem, timeAxis, profileYAxis, dataModel, DivePlotDataModel::DEPTH, DivePlotDataModel::TIME, 0);
 
 #define CREATE_PP_GAS(ITEM, VERTICAL_COLUMN, COLOR, COLOR_ALERT, THRESHOULD_SETTINGS, VISIBILITY_SETTINGS)              \
@@ -452,18 +450,16 @@ void ProfileWidget2::plotDive(struct dive *d, bool force)
 	temperatureAxis->setMinimum(pInfo.mintemp);
 	temperatureAxis->setMaximum(pInfo.maxtemp);
 
-	if (heartBeatItem->isVisible()) {
-		if (pInfo.maxhr) {
-			heartBeatAxis->setMinimum(pInfo.minhr);
-			heartBeatAxis->setMaximum(pInfo.maxhr);
-			heartBeatAxis->updateTicks(HR_AXIS); // this shows the ticks
-			heartBeatAxis->setVisible(true);
-		} else {
-			heartBeatAxis->setVisible(false);
-		}
+
+	if (pInfo.maxhr) {
+		heartBeatAxis->setMinimum(pInfo.minhr);
+		heartBeatAxis->setMaximum(pInfo.maxhr);
+		heartBeatAxis->updateTicks(HR_AXIS); // this shows the ticks
+		heartBeatAxis->setVisible(true);
 	} else {
 		heartBeatAxis->setVisible(false);
 	}
+
 	timeAxis->setMaximum(maxtime);
 	int i, incr;
 	static int increments[8] = { 10, 20, 30, 60, 5 * 60, 10 * 60, 15 * 60, 30 * 60 };