mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Profile: Improve Display of Bailout / Loop Events.

Browse source 
For dives in CCR mode, show 'bailout' and 'on loop' events whenever a
gas switch from a diluent gas to a bailout gas and vice versa happens.

Signed-off-by: Michael Keller <github@ike.ch>
This commit is contained in:
Michael Keller 2024-09-22 23:24:25 +12:00
parent 55b72d40e3
commit 0ac70a0feb
16 changed files with 183 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

24
profile-widget/profilescene.cpp
View file

@ -551,8 +551,17 @@ void ProfileScene::plotDive(const struct dive *dIn, int dcIn, DivePlannerPointsM
// while all other items are up there on the constructor.
qDeleteAll(eventItems);
eventItems.clear();
struct gasmix lastgasmix = d->get_gasmix_at_time(*currentdc, 1_sec);
const struct gasmix *lastgasmix;
divemode_t lastdivemode;
int cylinder_index = gasmix_loop(*d, *currentdc).next_cylinder_index().first;
if (cylinder_index == -1) {
lastgasmix = &gasmix_air;
lastdivemode = OC;
} else {
const cylinder_t *cylinder = d->get_cylinder(cylinder_index);
lastgasmix = &cylinder->gasmix;
lastdivemode = get_effective_divemode(*currentdc, *cylinder);
}
for (auto [idx, event]: enumerated_range(currentdc->events)) {
// if print mode is selected only draw headings, SP change, gas events or bookmark event
if (printMode) {
@ -560,18 +569,23 @@ void ProfileScene::plotDive(const struct dive *dIn, int dcIn, DivePlannerPointsM
!(event.name == "heading" ||
(event.name == "SP change" && event.time.seconds == 0) ||
event.is_gaschange() ||
event.is_divemodechange() ||
event.type == SAMPLE_EVENT_BOOKMARK))
continue;
}
if (DiveEventItem::isInteresting(d, currentdc, event, plotInfo, firstSecond, lastSecond)) {
auto item = new DiveEventItem(d, idx, event, lastgasmix, plotInfo,
auto item = new DiveEventItem(d, currentdc, idx, event, *lastgasmix, lastdivemode, plotInfo,
timeAxis, profileYAxis, animSpeed, *pixmaps);
item->setZValue(2);
addItem(item);
eventItems.push_back(item);
}
if (event.is_gaschange())
lastgasmix = d->get_gasmix_from_event(event);
if (event.is_gaschange()) {
auto [gasmix, divemode] = d->get_gasmix_from_event(event, *currentdc);
lastgasmix = &gasmix;
lastdivemode = divemode;
} else if (event.is_divemodechange())
lastdivemode = event.value ? CCR : OC;
}
QString dcText = QString::fromStdString(get_dc_nickname(currentdc));