Fix drawing of account balance graph when balance < 0.0

4 files changed, 26 insertions, 9 deletions

diff --git a/noncore/apps/checkbook/graph.cpp b/noncore/apps/checkbook/graph.cpp
index 389972e..72da738 100644
--- a/noncore/apps/checkbook/graph.cpp
+++ b/noncore/apps/checkbook/graph.cpp
@@ -84,3 +84,3 @@ void Graph::initGraph()
                 {
-                        drawBarChart( width(), height(), data->maxValue() );
+                        drawBarChart( width(), height(), data->maxValue(), data->minValue() );
                 }
@@ -94,3 +94,3 @@ void Graph::initGraph()
 
-void Graph::drawBarChart( int width, int height, float max )
+void Graph::drawBarChart( int width, int height, float max, float min )
 {
@@ -113,11 +113,14 @@ void Graph::drawBarChart( int width, int height, float max )
 
+    if ( min > 0 )
+        min = 0.0;
+
+        int bw = ( width - width / 4 ) / n;
+    int hoffset =  int( ( height - height / 4 - 1 ) * ( min * -1 ) / ( max - min ) );
         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 );
+        int bh = int( ( height - height / 4 - 1 ) * dp->value() / ( max - min ) );
+                p.drawRect( width / 8 + x, height - height / 8 - 1 - hoffset - bh, bw, bh );
                 fw = fm.width( dp->label() );
-                p.drawText( width / 8 + x - fw / 2 + bw / 2, height - height / 8, fw,
+                p.drawText( width / 8 + x - fw / 2 + bw / 2, height - height / 8 - hoffset, fw,
                                         fh + height / 8, AlignTop | AlignHCenter, dp->label() );
-        //                              WordBreak | AlignTop | AlignHCenter, dp->label() );
                 i++;
diff --git a/noncore/apps/checkbook/graph.h b/noncore/apps/checkbook/graph.h
index 340e910..616cbb6 100644
--- a/noncore/apps/checkbook/graph.h
+++ b/noncore/apps/checkbook/graph.h
@@ -58,3 +58,3 @@ class Graph : public QWidget
                 void initGraph();
-                void drawBarChart( int, int, float );
+                void drawBarChart( int, int, float, float );
                 void drawPieChart( int, int, float );
diff --git a/noncore/apps/checkbook/graphinfo.cpp b/noncore/apps/checkbook/graphinfo.cpp
index fec6896..5b72c80 100644
--- a/noncore/apps/checkbook/graphinfo.cpp
+++ b/noncore/apps/checkbook/graphinfo.cpp
@@ -99,2 +99,15 @@ float GraphInfo::maxValue()
 
+float GraphInfo::minValue()
+{
+        float min = 0.0;
+        for ( DataPointInfo *data = d->first(); data; data = d->next() )
+        {
+                if ( data->value() < min )
+                {
+                        min = data->value();
+                }
+        }
+        return min;
+}
+
 float GraphInfo::totalValue()
diff --git a/noncore/apps/checkbook/graphinfo.h b/noncore/apps/checkbook/graphinfo.h
index 41927b4..f7842c6 100644
--- a/noncore/apps/checkbook/graphinfo.h
+++ b/noncore/apps/checkbook/graphinfo.h
@@ -44,3 +44,3 @@ class DataPointInfo
                 float          value() { return v; }
-                
+
                 void addToValue( float value ) { v += value; }
@@ -73,2 +73,3 @@ class GraphInfo
                 float maxValue();
+                float minValue();
                 float totalValue();