mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
core: pass depth_t to get_depth_units()
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:
parent
1d14b03935
commit
992e258524
21 changed files with 82 additions and 84 deletions
|
@ -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);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue