Merge 22cd533a07
into 16754b4f9d
This commit is contained in:
commit
0bc20eaf10
|
@ -102,7 +102,11 @@ namespace
|
|||
{
|
||||
double minorStepSize( double intervalSize, int maxSteps )
|
||||
{
|
||||
const double minStep = divideInterval( intervalSize, maxSteps );
|
||||
int steps = maxSteps;
|
||||
|
||||
while( steps > 0 )
|
||||
{
|
||||
const double minStep = divideInterval( intervalSize, steps );
|
||||
|
||||
if ( minStep != 0.0 )
|
||||
{
|
||||
|
@ -111,14 +115,16 @@ namespace
|
|||
|
||||
// Do the minor steps fit into the interval?
|
||||
if ( fuzzyCompare( ( numTicks + 1 ) * qAbs( minStep ),
|
||||
qAbs( intervalSize ), intervalSize ) > 0 )
|
||||
qAbs( intervalSize ), intervalSize ) <= 0 )
|
||||
{
|
||||
// The minor steps doesn't fit into the interval
|
||||
return 0.5 * intervalSize;
|
||||
return minStep;
|
||||
}
|
||||
}
|
||||
|
||||
return minStep;
|
||||
steps--;
|
||||
}
|
||||
|
||||
return 0.5 * intervalSize;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue