HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r97:f3d03f051601

Some fixes to bar charts. Now bars draw almost correctly

sauimone -

r97:f3d03f051601

parent child

Context file:

r97:f3d03f051601

Collapse all files

src/barchart/bar.cpp +6 -12

             void Bar::setSize(const QSize& size)
             {
-                //mSize = size;
                 mWidth = size.width();
                 mHeight = size.height();
             }
             void Bar::resize( int w, int h )
             {
-                qDebug() << "bar::resize" << w << h;
+            //    qDebug() << "bar::resize" << w << h;
                 mWidth = w;
                 mHeight = h;
             }
             }
             void Bar::setPos(qreal x, qreal y)
             {
-                qDebug() << "Bar::setpos" << x << y;
+             //   qDebug() << "Bar::setpos" << x << y;
                 mXpos = x;
                 mYpos = y;
             }
                 if (0 == mHeight) {
                     return;
                 }
-                // Set color for bar. TODO: gradients, textures etc
+                // TODO: accept brush instead of color
-                QPen pen = painter->pen();
+                QBrush brush(mColor);
-                pen.setColor( mColor );
+                painter->setBrush(brush);
-                pen.setWidth( mWidth );
+                painter->drawRect(mXpos-mWidth, mYpos-mHeight ,mWidth ,mHeight); // Evil inverse rect, because we want bars to grow from bottom to top :)
-                painter->setPen(pen);
-                // Draw bar
-                painter->drawLine(mXpos, mYpos,
-                                  mXpos, mYpos - mHeight);
             }
             QRectF Bar::boundingRect() const

src/barchart/stackedbarchartseries.cpp +4 -1

             #include <limits.h>
+            #include <QDebug>
             #include "stackedbarchartseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 int max = INT_MIN;
-                for (int col=0; col <mModel->rowCount(); col++) {
+                for (int col=0; col <mModel->columnCount(); col++) {
                     int sum = columnSum(col);
                     if (sum > max) {
                         max = sum;
                     }
                 }
+                qDebug() << "maxColumnSum" << max;
                 return max;
             }
                 for (int row = 0; row < count; row++) {
                     sum += mModel->data(mModel->index(row,column)).toInt();
                 }
+                qDebug() << "sum for column" << column << "=" << sum;
                 return sum;
             }

src/barchart/stackedbargroup.cpp +4 -4

               ,mSeries(series)
               ,mLayoutSet(false)
               ,mLayoutDirty(true)
-              ,mBarDefaultWidth(10) // TODO: remove hard coding, when we have layout code ready
+              ,mBarDefaultWidth(20) // TODO: remove hard coding, when we have layout code ready
             {
                 dataChanged();
             }
                 int posStepX = (mWidth / (count+1));
                 int itemIndex(0);
-                int xPos = (mWidth / (count+1)) - mSeries.countColumns() * mBarDefaultWidth /2;
+                int xPos = (mWidth / (count+1)) - mSeries.countRows() * mBarDefaultWidth /2;
                 for (int column = 0; column < mSeries.countColumns(); column++) {
                     int yPos = mHeight;
                     for (int row=0; row < mSeries.countRows(); row++) {
-                        qDebug() << itemIndex;
                         int barHeight = mSeries.valueAt(row, column) * scale;
                         Bar* bar = reinterpret_cast<Bar*> (childItems().at(itemIndex));
                         bar->resize(mBarDefaultWidth, barHeight);
                         bar->setColor(mColors.at(row));
                         bar->setPos(xPos, yPos);
+                        qDebug() << itemIndex << "pos" << xPos << yPos;
                         itemIndex++;
-                        yPos += barHeight;
+                        yPos -= barHeight;
                     }
                     xPos += posStepX;
                 }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages