diff options
| -rw-r--r-- | core/profile.c | 8 | ||||
| -rw-r--r-- | core/profile.h | 2 | ||||
| -rw-r--r-- | profile-widget/divetooltipitem.cpp | 4 | ||||
| -rw-r--r-- | profile-widget/divetooltipitem.h | 2 | ||||
| -rw-r--r-- | profile-widget/profilewidget2.cpp | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/core/profile.c b/core/profile.c index 3ddd2300b..2cd34f2a0 100644 --- a/core/profile.c +++ b/core/profile.c @@ -1414,7 +1414,7 @@ struct divecomputer *select_dc(struct dive *dive) return get_dive_dc(dive, i); } -static void plot_string(const struct plot_info *pi, int idx, struct membuffer *b) +static void plot_string(const struct dive *d, const struct plot_info *pi, int idx, struct membuffer *b) { int pressurevalue, mod, ead, end, eadd; const char *depth_unit, *pressure_unit, *temp_unit, *vertical_speed_unit; @@ -1429,7 +1429,7 @@ static void plot_string(const struct plot_info *pi, int idx, struct membuffer *b int mbar = get_plot_pressure(pi, idx, cyl); if (!mbar) continue; - struct gasmix mix = get_cylinder(&displayed_dive, cyl)->gasmix; + struct gasmix mix = get_cylinder(d, cyl)->gasmix; pressurevalue = get_pressure_units(mbar, &pressure_unit); put_format_loc(b, translate("gettextFromC", "P: %d%s (%s)\n"), pressurevalue, pressure_unit, gasname(mix)); } @@ -1569,7 +1569,7 @@ static void plot_string(const struct plot_info *pi, int idx, struct membuffer *b strip_mb(b); } -int get_plot_details_new(const struct plot_info *pi, int time, struct membuffer *mb) +int get_plot_details_new(const struct dive *d, const struct plot_info *pi, int time, struct membuffer *mb) { int i; @@ -1580,7 +1580,7 @@ int get_plot_details_new(const struct plot_info *pi, int time, struct membuffer if (pi->entry[i].sec >= time) break; } - plot_string(pi, i, mb); + plot_string(d, pi, i, mb); return i; } diff --git a/core/profile.h b/core/profile.h index 6aa71e714..725bbae18 100644 --- a/core/profile.h +++ b/core/profile.h @@ -84,7 +84,7 @@ extern void compare_samples(struct plot_info *p1, int idx1, int idx2, char *buf, extern void init_plot_info(struct plot_info *pi); /* when planner_dc is non-null, this is called in planner mode. */ extern void create_plot_info_new(struct dive *dive, struct divecomputer *dc, struct plot_info *pi, bool fast, const struct deco_state *planner_ds); -extern int get_plot_details_new(const struct plot_info *pi, int time, struct membuffer *); +extern int get_plot_details_new(const struct dive *d, const struct plot_info *pi, int time, struct membuffer *); extern void free_plot_info_data(struct plot_info *pi); /* diff --git a/profile-widget/divetooltipitem.cpp b/profile-widget/divetooltipitem.cpp index f61471be5..2f4be8925 100644 --- a/profile-widget/divetooltipitem.cpp +++ b/profile-widget/divetooltipitem.cpp @@ -222,7 +222,7 @@ void ToolTipItem::setTimeAxis(DiveCartesianAxis *axis) timeAxis = axis; } -void ToolTipItem::refresh(const QPointF &pos) +void ToolTipItem::refresh(const dive *d, const QPointF &pos) { static QPixmap tissues(16,60); static QPainter painter(&tissues); @@ -238,7 +238,7 @@ void ToolTipItem::refresh(const QPointF &pos) clear(); mb.len = 0; - int idx = get_plot_details_new(&pInfo, time, &mb); + int idx = get_plot_details_new(d, &pInfo, time, &mb); tissues.fill(); painter.setPen(QColor(0, 0, 0, 0)); diff --git a/profile-widget/divetooltipitem.h b/profile-widget/divetooltipitem.h index c9e61b6d4..cb18b34df 100644 --- a/profile-widget/divetooltipitem.h +++ b/profile-widget/divetooltipitem.h @@ -36,7 +36,7 @@ public: void expand(); void clear(); void addToolTip(const QString &toolTip, const QIcon &icon = QIcon(), const QPixmap &pixmap = QPixmap()); - void refresh(const QPointF &pos); + void refresh(const dive *d, const QPointF &pos); bool isExpanded() const; void persistPos(); void readPos(); diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp index 7397d1648..49f99d20c 100644 --- a/profile-widget/profilewidget2.cpp +++ b/profile-widget/profilewidget2.cpp @@ -809,7 +809,7 @@ void ProfileWidget2::plotDive(const struct dive *d, bool force, bool doClearPict else plotPicturesInternal(d, instant); - toolTipItem->refresh(mapToScene(mapFromGlobal(QCursor::pos()))); + toolTipItem->refresh(&displayed_dive, mapToScene(mapFromGlobal(QCursor::pos()))); #endif // OK, how long did this take us? Anything above the second is way too long, @@ -1025,7 +1025,7 @@ void ProfileWidget2::scrollViewTo(const QPoint &pos) void ProfileWidget2::mouseMoveEvent(QMouseEvent *event) { QPointF pos = mapToScene(event->pos()); - toolTipItem->refresh(mapToScene(mapFromGlobal(QCursor::pos()))); + toolTipItem->refresh(&displayed_dive, mapToScene(mapFromGlobal(QCursor::pos()))); if (zoomLevel == 0) { QGraphicsView::mouseMoveEvent(event); |