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: use sensible tick-intervals

Browse source 
The integers were simply rounded to integers, which might give
ugly intervals (e.g. multiples of 3). Use the code of the
statistics tab, with one modification: take care not to
use intervals below the given precision. The statistics work
differently: there, the precision is adjusted according to
the interval size, not the other way around.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2021-09-28 13:21:12 +02:00 • committed by Dirk Hohndel
parent 99c4741508
commit 3e11c13100
1 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
profile-widget/divecartesianaxis.cpp
View file

@ -131,6 +131,30 @@ double DiveCartesianAxis::height() const
return labelHeight + labelSpaceVertical * dpr; return labelHeight + labelSpaceVertical * dpr;
} }
static double sensibleInterval(double inc, int decimals)
{
// Use full decimal increments
double digits = floor(log10(inc));
int digits_int = lrint(digits);
// Don't do increments smaller than the displayed decimals.
if (digits_int < -decimals) {
digits_int = -decimals;
digits = static_cast<double>(digits_int);
}
double digits_factor = pow(10.0, digits);
int inc_int = std::max((int)ceil(inc / digits_factor), 1);
// Do "nice" increments of the leading digit: 1, 2, 4, 5.
if (inc_int > 5)
inc_int = 10;
if (inc_int == 3)
inc_int = 4;
inc = inc_int * digits_factor;
return inc;
}
void DiveCartesianAxis::updateTicks(int animSpeed) void DiveCartesianAxis::updateTicks(int animSpeed)
{ {
if (!changed && !printMode) if (!changed && !printMode)
@ -152,7 +176,7 @@ void DiveCartesianAxis::updateTicks(int animSpeed)
// Round the interval to a sensible size in display units // Round the interval to a sensible size in display units
double intervalDisplay = interval * transform.a; double intervalDisplay = interval * transform.a;
intervalDisplay = ceil(intervalDisplay); // Currently, round to full integers, might want to improve. intervalDisplay = sensibleInterval(intervalDisplay, fractionalDigits);
// Choose full multiples of the interval as minumum and maximum values // Choose full multiples of the interval as minumum and maximum values
double minDisplay = transform.to(dataMin); double minDisplay = transform.to(dataMin);