diff options
Diffstat (limited to 'qt-ui')
-rw-r--r-- | qt-ui/graphicsview-common.cpp | 1 | ||||
-rw-r--r-- | qt-ui/graphicsview-common.h | 1 | ||||
-rw-r--r-- | qt-ui/profile/divecartesianaxis.cpp | 4 | ||||
-rw-r--r-- | qt-ui/profile/divecartesianaxis.h | 3 | ||||
-rw-r--r-- | qt-ui/profile/profilewidget2.cpp | 2 |
5 files changed, 7 insertions, 4 deletions
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); |