From 0741fa3a060cf3a469270f6bea344b435240561a Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Tue, 13 Sep 2011 12:51:50 +1000
Subject: [PATCH] XTicker summary chart improvement

---
 Graphs/gBarChart.cpp |  4 +++-
 Graphs/gGraphView.h  |  2 +-
 Graphs/gXAxis.cpp    | 31 ++++++++++++++++++++++++-------
 Graphs/gXAxis.h      |  1 +
 4 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/Graphs/gBarChart.cpp b/Graphs/gBarChart.cpp
index 4422df3a..21673b33 100644
--- a/Graphs/gBarChart.cpp
+++ b/Graphs/gBarChart.cpp
@@ -235,7 +235,9 @@ void SummaryChart::paint(gGraph & w,int left, int top, int width, int height)
         if (d!=m_values.end()) {
             day=m_days[zd];
 
-            int x1=px,x2=px+barw;
+            float x1=px;
+            //x1-=(barw/2.0);
+            float x2=px+barw;
 
             if (x1<left) x1=left;
             if (x2>left+width) x2=left+width;
diff --git a/Graphs/gGraphView.h b/Graphs/gGraphView.h
index f73a9bc3..18d30a64 100644
--- a/Graphs/gGraphView.h
+++ b/Graphs/gGraphView.h
@@ -16,7 +16,7 @@
 #define MAX(a,b) (((a)<(b)) ? (b) : (a));
 enum FlagType { FT_Bar, FT_Dot, FT_Span };
 
-const int default_height=170;
+const int default_height=160;
 
 void InitGraphs();
 void DoneGraphs();
diff --git a/Graphs/gXAxis.cpp b/Graphs/gXAxis.cpp
index 1550e1a1..a99e23b3 100644
--- a/Graphs/gXAxis.cpp
+++ b/Graphs/gXAxis.cpp
@@ -139,15 +139,29 @@ void gXAxis::paint(gGraph & w,int left,int top, int width, int height)
     QColor linecol=Qt::black;
     GLBuffer *lines=w.backlines();
 
-    double xmult=double(width)/double(xx);
-    double step_pixels=double(step/10.0)*xmult;
-    py=left+double(aligned_start-minx)*xmult;
-    for (int i=0;i<10;i++) {
+
+    int utcoff=m_utcfix ? QDateTime(QDate(1970,1,1),QTime(0,0,0)).secsTo(QDateTime(QDate(1970,1,1),QTime(0,0,0),Qt::UTC))/3600 : 0;
+
+    int num_minor_ticks;
+
+    if (step>=86400000) {
+        qint64 i=step/86400000L; // number of days
+        if (i>14) i/=2;
+        if (i<0) i=1;
+        num_minor_ticks=i;
+    } else num_minor_ticks=10;
+
+    float xmult=double(width)/double(xx);
+    float step_pixels=double(step/float(num_minor_ticks))*xmult;
+
+    py=left+float(aligned_start-minx)*xmult;
+
+
+    for (int i=0;i<num_minor_ticks;i++) {
         py-=step_pixels;
         if (py<start_px) continue;
         lines->add(py,top,py,top+4,linecol);
     }
-    int utcoff=m_utcfix ? QDateTime(QDate(1970,1,1),QTime(0,0,0)).secsTo(QDateTime(QDate(1970,1,1),QTime(0,0,0),Qt::UTC))/3600 : 0;
 
     for (qint64 i=aligned_start;i<maxx;i+=step) {
         px=double(i-minx)*xmult;
@@ -175,9 +189,12 @@ void gXAxis::paint(gGraph & w,int left,int top, int width, int height)
             tmpstr=QString("%1:%2:%3:%4").arg(h,2,10,QChar('0')).arg(m,2,10,QChar('0')).arg(s,2,10,QChar('0')).arg(ms,3,10,QChar('0'));
         }
 
-        w.renderText(tmpstr,px-(x/2),top+18);
+        int tx=px;
+        GetTextExtent(tmpstr,x,y); // this only really needs running once :(
+        if (m_utcfix) tx+=step_pixels/2.0-x/2.0;
+        w.renderText(tmpstr,tx,top+18);
         py=px;
-        for (int j=1;j<10;j++) {
+        for (int j=1;j<num_minor_ticks;j++) {
             py+=step_pixels;
             if (py>=left+width) break;
             lines->add(py,top,py,top+4,linecol);
diff --git a/Graphs/gXAxis.h b/Graphs/gXAxis.h
index aab1f21e..d44ccef3 100644
--- a/Graphs/gXAxis.h
+++ b/Graphs/gXAxis.h
@@ -24,6 +24,7 @@ class gXAxis:public Layer
         bool ShowMinorTicks() { return m_show_minor_ticks; }
         bool ShowMajorTicks() { return m_show_major_ticks; }
         void setUtcFix(bool b) { m_utcfix=b; }
+
     protected:
 //        virtual const wxString & Format(double v) { static wxString t; wxDateTime d; d.Set(v); t=d.Format(wxT("%H:%M")); return t; };
         bool m_show_major_lines;