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: simplify get_maxtime()

Browse source 
This function has accumulated quite some cruft. It seems to add
additional space to make place for certain chart features
(e.g. the average depth text item).

However, it makes no sense to solve this here, as only the
profile knows how much place is needed to display these
features.

Therefore, basically revert this to the original version,
which simply returns the maximum time for long dives
and a threshhold for short dives that depends on the
zoomed_plot setting.

The result looks more reasonable to me, as there is no
(varying!) empty space to the right of the profile.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2021-08-29 09:23:38 +02:00 • committed by Dirk Hohndel
parent 179df1bf80
commit 24cf6709e3
1 changed files with 2 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
core/profile.c
View file

@ -67,36 +67,12 @@ static void dump_pi(struct plot_info *pi)
* current dive. However, we don't scale past less than
* 30 minutes or 90 ft, just so that small dives show
* up as such unless zoom is enabled.
* We also need to add 180 seconds at the end so the min/max
* plots correctly
*/
int get_maxtime(const struct plot_info *pi)
{
int seconds = pi->maxtime;
int DURATION_THR = (pi->dive_type == FREEDIVING ? 60 : 600);
int CEILING = (pi->dive_type == FREEDIVING ? 30 : 60);
if (prefs.zoomed_plot) {
/* Rounded up to one minute, with at least 2.5 minutes to
* spare.
* For dive times shorter than 10 minutes, we use seconds/4 to
* calculate the space dynamically.
* This is seamless since 600/4 = 150.
*/
if (seconds < DURATION_THR)
return ROUND_UP(seconds + seconds / 4, CEILING);
else
return ROUND_UP(seconds + DURATION_THR/4, CEILING);
} else {
#ifndef SUBSURFACE_MOBILE
/* min 30 minutes, rounded up to 5 minutes, with at least 2.5 minutes to spare */
return MAX(30 * 60, ROUND_UP(seconds + DURATION_THR/4, CEILING * 5));
#else
/* just add 2.5 minutes so we have a consistant right margin */
return seconds + DURATION_THR / 4;
#endif
}
int min = prefs.zoomed_plot ? 30 : 30 * 60;
return MAX(min, seconds);
}
/* get the maximum depth to which we want to plot