@ -210,20 +210,20 @@ void UBGraphicsAxes::paintGraduations(QPainter *painter)
QFontMetricsF fontMetrics ( painter - > font ( ) ) ;
QFontMetricsF fontMetrics ( painter - > font ( ) ) ;
// Update the width of one "centimeter" to correspond to the width of the background grid (whether it is displayed or not)
// Update the width of one "centimeter" to correspond to the width of the background grid (whether it is displayed or not)
s PixelsPerCentimeter = UBApplication : : boardController - > activeScene ( ) - > backgroundGridSize ( ) ;
m PixelsPerCentimeter = UBApplication : : boardController - > activeScene ( ) - > backgroundGridSize ( ) ;
// When a "centimeter" is too narrow, we only display every 5th number
// When a "centimeter" is too narrow, we only display every 5th number
double numbersWidth = fontMetrics . boundingRect ( " -00 " ) . width ( ) ;
double numbersWidth = fontMetrics . boundingRect ( " -00 " ) . width ( ) ;
bool shouldDisplayAllNumbers = ( numbersWidth < = ( s PixelsPerCentimeter - 5 ) ) ;
bool shouldDisplayAllNumbers = ( numbersWidth < = ( m PixelsPerCentimeter - 5 ) ) ;
// draw numbers on x axis
// draw numbers on x axis
int fromX = ( xAxis ( ) . x1 ( ) + sMargin ) / s PixelsPerCentimeter;
int fromX = ( xAxis ( ) . x1 ( ) + sMargin ) / m PixelsPerCentimeter;
int toX = ( xAxis ( ) . x2 ( ) - sMargin ) / s PixelsPerCentimeter;
int toX = ( xAxis ( ) . x2 ( ) - sMargin ) / m PixelsPerCentimeter;
for ( int centimeters ( fromX ) ; centimeters < = toX ; centimeters + + )
for ( int centimeters ( fromX ) ; centimeters < = toX ; centimeters + + )
{
{
bool isImportant = abs ( centimeters ) = = 1 | | abs ( centimeters ) % 5 = = 0 ;
bool isImportant = abs ( centimeters ) = = 1 | | abs ( centimeters ) % 5 = = 0 ;
double graduationX = s PixelsPerCentimeter * centimeters ;
double graduationX = m PixelsPerCentimeter * centimeters ;
double graduationHeight = UBGeometryUtils : : millimeterGraduationHeight ;
double graduationHeight = UBGeometryUtils : : millimeterGraduationHeight ;
painter - > drawLine ( QLineF ( graduationX , graduationHeight , graduationX , - graduationHeight ) ) ;
painter - > drawLine ( QLineF ( graduationX , graduationHeight , graduationX , - graduationHeight ) ) ;
@ -244,13 +244,13 @@ void UBGraphicsAxes::paintGraduations(QPainter *painter)
}
}
// draw numbers on y axis
// draw numbers on y axis
int fromY = ( - yAxis ( ) . y1 ( ) + sMargin ) / s PixelsPerCentimeter;
int fromY = ( - yAxis ( ) . y1 ( ) + sMargin ) / m PixelsPerCentimeter;
int toY = ( - yAxis ( ) . y2 ( ) - sMargin ) / s PixelsPerCentimeter;
int toY = ( - yAxis ( ) . y2 ( ) - sMargin ) / m PixelsPerCentimeter;
for ( int centimeters ( fromY ) ; centimeters < = toY ; centimeters + + )
for ( int centimeters ( fromY ) ; centimeters < = toY ; centimeters + + )
{
{
bool isImportant = abs ( centimeters ) = = 1 | | abs ( centimeters ) % 5 = = 0 ;
bool isImportant = abs ( centimeters ) = = 1 | | abs ( centimeters ) % 5 = = 0 ;
double graduationY = - s PixelsPerCentimeter * centimeters ;
double graduationY = - m PixelsPerCentimeter * centimeters ;
double graduationHeight = UBGeometryUtils : : millimeterGraduationHeight ;
double graduationHeight = UBGeometryUtils : : millimeterGraduationHeight ;
painter - > drawLine ( QLineF ( graduationHeight , graduationY , - graduationHeight , graduationY ) ) ;
painter - > drawLine ( QLineF ( graduationHeight , graduationY , - graduationHeight , graduationY ) ) ;