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

core: pass depth_t to get_depth_units()

Browse source 
Commit is longer than expected, because a few of the callers
were converted to use depth_t instead of int.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-12-14 22:09:23 +01:00 • committed by Michael Keller
parent 1d14b03935
commit 992e258524
21 changed files with 82 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

3
profile-widget/diveeventitem.cpp
View file

@ -142,7 +142,8 @@ void DiveEventItem::setupToolTipString(struct gasmix lastgasmix)
name += QString(": %1bar").arg((double)value / 1000, 0, 'f', 1);
} else if (type == SAMPLE_EVENT_CEILING && ev.name == "planned waypoint above ceiling") {
const char *depth_unit;
double depth_value = get_depth_units(value*1000, NULL, &depth_unit);
depth_t depth { .mm = value * 1000 };
double depth_value = get_depth_units(depth, NULL, &depth_unit);
name += QString(": %1%2").arg((int) round(depth_value)).arg(depth_unit);
} else {
name += QString(": %1").arg(value);

8
profile-widget/diveprofileitem.cpp
View file

@ -450,9 +450,9 @@ std::pair<double,double> DiveMeanDepthItem::getMeanDepth(int i) const
{
for ( ; i >= 0; --i) {
const plot_data &entry = pInfo.entry[i];
if (entry.running_sum > 0)
if (entry.running_sum.mm > 0)
return { static_cast<double>(entry.sec),
static_cast<double>(entry.running_sum) / entry.sec };
static_cast<double>(entry.running_sum.mm) / entry.sec };
}
return { 0.0, 0.0 };
}
@ -462,9 +462,9 @@ std::pair<double,double> DiveMeanDepthItem::getNextMeanDepth(int first) const
int last = pInfo.nr;
for (int i = first + 1; i < last; ++i) {
const plot_data &entry = pInfo.entry[i];
if (entry.running_sum > 0)
if (entry.running_sum.mm > 0)
return { static_cast<double>(entry.sec),
static_cast<double>(entry.running_sum) / entry.sec };
static_cast<double>(entry.running_sum.mm) / entry.sec };
}
return getMeanDepth(first);
}

2
profile-widget/profilescene.cpp
View file

@ -117,7 +117,7 @@ ProfileScene::ProfileScene(double dpr, bool printMode, bool isGrayscale) :
[](const plot_data &item) { return (double)item.temperature; },
1, dpr)),
meanDepthItem(createItem<DiveMeanDepthItem>(*profileYAxis,
[](const plot_data &item) { return (double)item.running_sum; },
[](const plot_data &item) { return (double)item.running_sum.mm; },
1, dpr)),
gasPressureItem(createItem<DiveGasPressureItem>(*cylinderPressureAxis,
[](const plot_data &item) { return 0.0; }, // unused