Skip to content

scale engine: Try harder to find a proper step size for minor ticks #327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
peter-ha wants to merge 1 commit into
base: master
Choose a base branch
from
Open

scale engine: Try harder to find a proper step size for minor ticks #327

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions src/common/QskScaleEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,23 +102,29 @@ namespace
{
double minorStepSize( double intervalSize, int maxSteps )
{
const double minStep = divideInterval( intervalSize, maxSteps );
int steps = maxSteps;

if ( minStep != 0.0 )
while( steps > 0 )
{
// # ticks per interval
const int numTicks = qCeil( qAbs( intervalSize / minStep ) ) - 1;
const double minStep = divideInterval( intervalSize, steps );

// Do the minor steps fit into the interval?
if ( fuzzyCompare( ( numTicks + 1 ) * qAbs( minStep ),
qAbs( intervalSize ), intervalSize ) > 0 )
if ( minStep != 0.0 )
{
// The minor steps doesn't fit into the interval
return 0.5 * intervalSize;
// # ticks per interval
const int numTicks = qCeil( qAbs( intervalSize / minStep ) ) - 1;

// Do the minor steps fit into the interval?
if ( fuzzyCompare( ( numTicks + 1 ) * qAbs( minStep ),
qAbs( intervalSize ), intervalSize ) <= 0 )
{
return minStep;
}
}

steps--;
}

return minStep;
return 0.5 * intervalSize;
}
}

Expand Down