1 files changed, 76 insertions, 9 deletions

diff --git a/noncore/apps/checkbook/graph.cpp b/noncore/apps/checkbook/graph.cpp
index bae92da..a0d8b78 100644
--- a/noncore/apps/checkbook/graph.cpp
+++ b/noncore/apps/checkbook/graph.cpp
@@ -29,13 +29,13 @@
 #include "graph.h"
 #include "graphinfo.h"
 
+#include <qcolor.h>
+#include <qfontmetrics.h>
 #include <qpainter.h>
 
 Graph::Graph( QWidget *parent, GraphInfo *d, const QString &name, int flags )
         : QWidget( parent, name, flags )
 {
-        setBackgroundMode( QWidget::PaletteBase );
-
         data = d;
 
         graph.setOptimization( QPixmap::BestOptim );
@@ -82,31 +82,98 @@ void Graph::initGraph()
         {
                 case GraphInfo::BarChart :
                 {
-                        drawBarChart();
+                        drawBarChart( width(), height(), data->maxValue() );
                 }
                 break;
                 case GraphInfo::LineChart :
                 {
-                        drawLineChart();
+                        //drawLineChart( p, s, min, max );
                 }
                 break;
                 case GraphInfo::PieChart :
                 {
-                        drawPieChart();
+                        drawPieChart( width(), height(), data->totalValue() );
                 }
         };
 }
 
-void Graph::drawBarChart()
+void Graph::drawBarChart( int width, int height, float max )
 {
-        //Find max value in GraphInfo->dataPoints() - make function in GraphInfo!!!
+        QPainter p( &graph );
+
+        // Try to set the font size smaller for text
+        QFont f = font();
+        f.setPointSize( 8 );
+        p.setFont( f );
+
+        int x = 0;
+        int i = 0;
+        int n = data->numberDataPoints();
+        QFontMetrics fm=fontMetrics();
+        int fh = fm.height();
+        int fw;
+
+        QColor c( 0, 0, 255);
+        p.setBrush( c );
+
+        for (DataPointInfo *dp = data->firstDataPoint(); dp; dp = data->nextDataPoint() )
+        {
+                int bw = ( width - width / 4 - x ) / ( n - i );
+                int bh = int( ( height - height / 4 - 1 ) * dp->value() / max );
+                p.drawRect( width / 8 + x, height - height / 8 - 1 - bh, bw, bh );
+                fw = fm.width( dp->label() );
+                p.drawText( width / 8 + x - fw / 2 + bw / 2, height - height / 8, fw,
+                                        fh + height / 8, AlignTop | AlignHCenter, dp->label() );
+        //                              WordBreak | AlignTop | AlignHCenter, dp->label() );
+                i++;
+                x += bw;
+        }
 }
 
-void Graph::drawLineChart()
+void Graph::drawLineChart( int width, int height, float max )
 {
 }
 
-void Graph::drawPieChart()
+void Graph::drawPieChart( int width, int height, float sum )
 {
+        QPainter p( &graph );
+
+        // Try to set the font size smaller for text
+        QFont f = font();
+        f.setPointSize( 8 );
+        p.setFont( f );
+
+        int n = data->numberDataPoints();
+
+        int apos = -90 * 16;
+
+        int xd = width - width / 5;
+        int yd = height - height / 5;
+
+        int i = 0;
+
+        QColor c;
+
+        for (DataPointInfo *dp = data->firstDataPoint(); dp; dp = data->nextDataPoint() )
+        {
+                c.setHsv( ( i *255) / n, 255, 255 );
+                p.setBrush( c );
+
+                int a = int( ( dp->value() * 360.0 ) / sum * 16.0 + 0.5 );
+                p.drawPie( width/10, height/10, xd, yd, -apos, -a );
+                apos += a;
+                i++;
+        }
+
+        double apos2 = -90 * 3.14159 / 180;
+        for (DataPointInfo *dp = data->firstDataPoint(); dp; dp = data->nextDataPoint() )
+        {
+                double a = dp->value() *360 / sum * 3.14159 / 180;
+                int x = int( cos( apos2 + a/2 ) * width * 5/16 + width/2 + 0.5 );
+                int y = int( sin( apos2 + a/2 ) * height * 5/16 + height/2 + 0.5 );
+                p.drawText( x - width/8, y - height/8, width/4, height/4, WordBreak | AlignCenter,
+                                        dp->label() );
+                apos2 += a;
+        }
 }