From 2d24779b6226f6f9757abe565307d2956b375c0d Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Mon, 28 Apr 2014 12:45:42 -0700
Subject: Make heartrate grid less confusing

Having all the grid lines in the same color made things visually
confusing. To clean this up a little make the heartrate lines a light gray
color.

Fixes #484

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 color.h                             | 1 +
 qt-ui/graphicsview-common.cpp       | 1 +
 qt-ui/graphicsview-common.h         | 1 +
 qt-ui/profile/divecartesianaxis.cpp | 4 ++--
 qt-ui/profile/divecartesianaxis.h   | 3 ++-
 qt-ui/profile/profilewidget2.cpp    | 2 +-
 6 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/color.h b/color.h
index fea8bab84..d4870e14b 100644
--- a/color.h
+++ b/color.h
@@ -38,6 +38,7 @@
 #define BLACK1_LOW_TRANS QColor::fromRgbF(0.0, 0.0, 0.0, 0.75)
 #define BLACK1_HIGH_TRANS QColor::fromRgbF(0.0, 0.0, 0.0, 0.25)
 #define TUNDORA1_MED_TRANS QColor::fromRgbF(0.3, 0.3, 0.3, 0.5)
+#define MED_GRAY_HIGH_TRANS QColor::fromRgbF(0.5, 0.5, 0.5, 0.25)
 #define MERCURY1_MED_TRANS QColor::fromRgbF(0.9, 0.9, 0.9, 0.5)
 #define CONCRETE1_LOWER_TRANS QColor::fromRgbF(0.95, 0.95, 0.95, 0.9)
 #define WHITE1_MED_TRANS QColor::fromRgbF(1.0, 1.0, 1.0, 0.5)
diff --git a/qt-ui/graphicsview-common.cpp b/qt-ui/graphicsview-common.cpp
index f794c3323..35c7b2e03 100644
--- a/qt-ui/graphicsview-common.cpp
+++ b/qt-ui/graphicsview-common.cpp
@@ -43,6 +43,7 @@ void fill_profile_color()
 	profile_color[MEAN_DEPTH] = COLOR(REDORANGE1_MED_TRANS, BLACK1_LOW_TRANS, REDORANGE1_MED_TRANS);
 	profile_color[HR_PLOT] = COLOR(REDORANGE1_MED_TRANS, BLACK1_LOW_TRANS, REDORANGE1_MED_TRANS);
 	profile_color[HR_TEXT] = COLOR(REDORANGE1_MED_TRANS, BLACK1_LOW_TRANS, REDORANGE1_MED_TRANS);
+	profile_color[HR_AXIS] = COLOR(MED_GRAY_HIGH_TRANS, MED_GRAY_HIGH_TRANS, MED_GRAY_HIGH_TRANS);
 	profile_color[DEPTH_BOTTOM] = COLOR(GOVERNORBAY1_MED_TRANS, BLACK1_HIGH_TRANS, GOVERNORBAY1_MED_TRANS);
 	profile_color[DEPTH_TOP] = COLOR(MERCURY1_MED_TRANS, WHITE1_MED_TRANS, MERCURY1_MED_TRANS);
 	profile_color[TEMP_TEXT] = COLOR(GOVERNORBAY2, BLACK1_LOW_TRANS, GOVERNORBAY2);
diff --git a/qt-ui/graphicsview-common.h b/qt-ui/graphicsview-common.h
index 2dc56188a..f79f635f0 100644
--- a/qt-ui/graphicsview-common.h
+++ b/qt-ui/graphicsview-common.h
@@ -54,6 +54,7 @@ typedef enum {
 	MEAN_DEPTH,
 	HR_TEXT,
 	HR_PLOT,
+	HR_AXIS,
 	DEPTH_TOP,
 	DEPTH_BOTTOM,
 	TEMP_TEXT,
diff --git a/qt-ui/profile/divecartesianaxis.cpp b/qt-ui/profile/divecartesianaxis.cpp
index 2729647f3..c1e93faa7 100644
--- a/qt-ui/profile/divecartesianaxis.cpp
+++ b/qt-ui/profile/divecartesianaxis.cpp
@@ -124,7 +124,7 @@ void emptyList(QList<T *> &list, double steps)
 	}
 }
 
-void DiveCartesianAxis::updateTicks()
+void DiveCartesianAxis::updateTicks(color_indice_t color)
 {
 	if (!scene())
 		return;
@@ -220,7 +220,7 @@ void DiveCartesianAxis::updateTicks()
 		}
 		DiveLineItem *line = new DiveLineItem(this);
 		QPen pen;
-		pen.setBrush(getColor(TIME_GRID));
+		pen.setBrush(getColor(color));
 		pen.setCosmetic(true);
 		pen.setWidthF(2);
 		line->setPen(pen);
diff --git a/qt-ui/profile/divecartesianaxis.h b/qt-ui/profile/divecartesianaxis.h
index c430d4704..e5b9b7b0e 100644
--- a/qt-ui/profile/divecartesianaxis.h
+++ b/qt-ui/profile/divecartesianaxis.h
@@ -3,6 +3,7 @@
 
 #include <QObject>
 #include <QGraphicsLineItem>
+#include <graphicsview-common.h>
 
 class QPropertyAnimation;
 class DiveTextItem;
@@ -47,7 +48,7 @@ public:
 	int unitSystem;
 public
 slots:
-	virtual void updateTicks();
+	virtual void updateTicks(color_indice_t color = TIME_GRID);
 
 signals:
 	void sizeChanged();
diff --git a/qt-ui/profile/profilewidget2.cpp b/qt-ui/profile/profilewidget2.cpp
index 17af08bd4..0f397d2ff 100644
--- a/qt-ui/profile/profilewidget2.cpp
+++ b/qt-ui/profile/profilewidget2.cpp
@@ -406,7 +406,7 @@ void ProfileWidget2::plotDives(QList<dive *> dives)
 		if (pInfo.maxhr) {
 			heartBeatAxis->setMinimum(pInfo.minhr);
 			heartBeatAxis->setMaximum(pInfo.maxhr);
-			heartBeatAxis->updateTicks(); // this shows the ticks
+			heartBeatAxis->updateTicks(HR_AXIS); // this shows the ticks
 			heartBeatAxis->setVisible(true);
 		} else {
 			heartBeatAxis->setVisible(false);
-- 
cgit v1.2.3-70-g09d2