HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r94:6732dc48e5e9

added stacked bar chart

sauimone -

r94:6732dc48e5e9

parent child

Context file:

r94:6732dc48e5e9

Collapse all files

src/barchart/barchartseries.cpp +7 -19

                  // TODO: make min and max members and update them when data changes.
                  // This is slower since they are checked every time, even if data is same since previous call.
-                 QModelIndex modelIndex = mModel->index(0,0);
-                 int min = mModel->data(modelIndex).toInt();
+                 int min = INT_MAX;
                  for (int i=0; i <mModel->rowCount(); i++) {
                      for(int j=0; j<mModel->columnCount(); j++) {
-                         modelIndex = mModel->index(i,j);
-                         int temp = mModel->data(modelIndex).toInt();
+                         int temp = mModel->data(mModel->index(i,j)).toInt();
                          if (temp < min) {
                              min = temp;
                          }
                  // TODO: make min and max members and update them when data changes.
                  // This is slower since they are checked every time, even if data is same since previous call.
-                 QModelIndex modelIndex = mModel->index(0,0);
-                 int max = mModel->data(modelIndex).toInt();
+                 int max = INT_MIN;
                  for (int i=0; i <mModel->rowCount(); i++) {
                      for(int j=0; j<mModel->columnCount(); j++) {
-                         modelIndex = mModel->index(i,j);
-                         int temp = mModel->data(modelIndex).toInt();
+                         int temp = mModel->data(mModel->index(i,j)).toInt();
                          if (temp > max) {
                              max = temp;
                          }
                  return mModel->rowCount();
              }
-             int BarChartSeries::countItemsInSeries()
+             int BarChartSeries::countColumns()
              {
                  return mModel->columnCount();
              }
                  return mModel->rowCount() * mModel->columnCount();
              }
-             int BarChartSeries::valueAt(int series, int item)
+             int BarChartSeries::valueAt(int row, int column)
              {
-                 QModelIndex index = mModel->index(series,item);
-                 return mModel->data(index).toInt();
+                 return mModel->data(mModel->index(row,column)).toInt();
              }
-             /*
-             void BarChartSeries::chartSizeChanged(QRectF rect)
+             {
-                 qDebug() << "barchart size changed:" << rect;
-             //    mBarGroup->resize(rect.toRect().width(), rect.toRect().height());
+             }
-             */
              #include "moc_barchartseries.cpp"
              QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/barchartseries.h +3 -3

              #define BARCHARTSERIES_H
              #include <QList>
-             #include <QRectF>
+             //#include <QRectF>
              #include <QAbstractItemModel>
              #include "qchartseries.h"
              #include "qchartglobal.h"
                  int min();
                  int max();
                  int countSeries();
-                 int countItemsInSeries();     // Count items in one series.
+                 int countColumns();     // Count items in one series.
                  int countTotalItems();
-                 int valueAt(int series, int item);
+                 int valueAt(int row, int column);
              public Q_SLOTS:

src/barchart/bargroup.cpp +2 -8

              QTCOMMERCIALCHART_BEGIN_NAMESPACE
-             // TODO: singleton?
-             //BarGroup* BarGroup::mBarGroupInstance = NULL;
-             //BarGroup::BarGroup(QGraphicsItem *parent) :
-             //    QGraphicsItem(parent)
-             //    ,mSeries(series)
              BarGroup::BarGroup(BarChartSeries& series, QGraphicsItem *parent) :
                ChartItem(parent)
                ,mSeries(series)
                  }
                  // TODO: better way to auto-layout
-                 int count = mSeries.countItemsInSeries();
+                 int count = mSeries.countColumns();
                  int posStep = (mWidth / (count+1));
                  int startPos = (mWidth / (count+1)) - mSeries.countSeries() * mBarDefaultWidth /2;
                  qDebug() << "startpos" << startPos;
                  // Scaling.
                  int itemIndex(0);
                  for (int series = 0; series < mSeries.countSeries(); series++) {
-                     for (int item=0; item < mSeries.countItemsInSeries(); item++) {
+                     for (int item=0; item < mSeries.countColumns(); item++) {
                          qDebug() << itemIndex;
                          int barHeight = mSeries.valueAt(series, item) * mHeight / mMax;
                          Bar* bar = reinterpret_cast<Bar*> (childItems().at(itemIndex));

src/barchart/bargroup.h +3 -20

-             #ifndef QBARCHART_H
-             #define QBARCHART_H
+             #ifndef QBARGROUP_H
+             #define QBARGROUP_H
              #include "chartitem_p.h"
              #include "bar.h"
              QTCOMMERCIALCHART_BEGIN_NAMESPACE
-             // TODO: Better name for this? The function of this class is to know where each bar in series is laid out.
-             //class BarGroup : public QGraphicsItemGroup
              class BarGroup : public ChartItem
              {
-             /* // TODO: implement as singleton?
-             private:
-                 static BarGroup* mBarGroupInstance;
-             public:
-                 static BarGroup* instance()
+                 {
-                     if (mBarGroupInstance == NULL) {
-                         mBarGroupInstance = new BarGroup();
+                     }
-                     return mBarGroupInstance;
+                 }
-             private:
-             */
              public:
                  explicit BarGroup(BarChartSeries& series, QGraphicsItem *parent = 0);
              QTCOMMERCIALCHART_END_NAMESPACE
-             #endif // QBARCHART_H
+             #endif // QBARGROUP_H

src/qchartseries.h +1 0

                      SeriesTypeLine = 0,
              //        SeriesTypeArea,
                      SeriesTypeBar,
+                     SeriesTypeStackedBar,
                      SeriesTypePie,
                      SeriesTypeScatter
              //        SeriesTypeSpline

src/src.pro +6 -2

                  pieslice.cpp \
                  qchartview.cpp \
                  qchartseries.cpp \
-                 qchartaxis.cpp
+                 qchartaxis.cpp \
+                 barchart/stackedbarchartseries.cpp \
+                 barchart/stackedbargroup.cpp
              PRIVATE_HEADERS += \
                  xylinechart/xylinechartitem_p.h \
                  qchartview.h \
                  qchartaxis.h
-             HEADERS += $$PUBLIC_HEADERS
+             HEADERS += $$PUBLIC_HEADERS \
+                 barchart/stackedbarchartseries.h \
+                 barchart/stackedbargroup.h
              HEADERS += $$PRIVATE_HEADERS
              INCLUDEPATH += xylinechart \

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