From fc0f7bf8efd9f6141651761be64636f6fa015a3f Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Sat, 24 Oct 2009 11:08:05 +0000
Subject: [PATCH] bug fix with server history graph x axis (rounding problem)

---
 src/serverlogging.cpp | 10 +++++-----
 src/serverlogging.h   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/serverlogging.cpp b/src/serverlogging.cpp
index 11db639a..6dc3225b 100755
--- a/src/serverlogging.cpp
+++ b/src/serverlogging.cpp
@@ -114,11 +114,11 @@ void CHistoryGraph::DrawFrame ( const int iNewNumTicksX )
     const int iXAxisTickStep = iNumTicksX / 5 + 1;
 
     // grid (ticks) for x-axis
-    iXSpace = PlotGridFrame.width() / ( iNumTicksX + 1 );
+    dXSpace = static_cast<double> ( PlotGridFrame.width() ) / ( iNumTicksX + 1 );
     for ( i = 0; i < iNumTicksX; i++ )
     {
         int         iBottomExtraTickLen = 0;
-        const int   iCurX = PlotGridFrame.x() + iXSpace * ( i + 1 );
+        const int   iCurX = PlotGridFrame.x() + static_cast<int> ( dXSpace * ( i + 1 ) );
         const QDate curXAxisDate = curDate.addDays ( i - iNumTicksX + 1 );
 
         // text (print only every "iXAxisTickStep" tick)
@@ -140,8 +140,8 @@ void CHistoryGraph::DrawFrame ( const int iNewNumTicksX )
             iCurX, PlotGridFrame.bottom() + iBottomExtraTickLen );
 
         // different grid width for weekends (overwrite regular grid)
-        if ( ( curXAxisDate.dayOfWeek() == 6 ) ||
-             ( curXAxisDate.dayOfWeek() == 7 ) )
+        if ( ( curXAxisDate.dayOfWeek() == 6 ) || // check for Saturday
+             ( curXAxisDate.dayOfWeek() == 7 ) )  // check for Sunday
         {
             const int iGridWidthWeekendHalf = iGridWidthWeekend / 2;
 
@@ -197,7 +197,7 @@ void CHistoryGraph::AddMarker ( const SHistoryData& curHistoryData )
 
     // calculate the actual point in the graph (in pixels)
     const QPoint curPoint (
-        PlotGridFrame.x() + iXSpace * ( iNumTicksX + iXAxisOffs ),
+        PlotGridFrame.x() + static_cast<int> ( dXSpace * ( iNumTicksX + iXAxisOffs ) ),
         PlotGridFrame.y() + static_cast<int> ( static_cast<double> (
         PlotGridFrame.height() ) / ( iYAxisEnd - iYAxisStart ) * dYAxisOffs ) );
 
diff --git a/src/serverlogging.h b/src/serverlogging.h
index 45d7189b..50ca611b 100755
--- a/src/serverlogging.h
+++ b/src/serverlogging.h
@@ -82,7 +82,7 @@ protected:
     int     iXAxisTextHeight;
     int     iMarkerSizeNewCon;
     int     iMarkerSizeServSt;
-    int     iXSpace;
+    double  dXSpace;
     int     iYSpace;
     QFont   AxisFont;
     QColor  PlotBackgroundColor;