HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r167:023d2c8150a8

added labels to series, intergrated with test app. minor hack to test app

sauimone -

r167:023d2c8150a8

parent child

Context file:

r167:023d2c8150a8

Collapse all files

src/barchart/barchartmodel.cpp +8 -6

                 DataContainer* c = new DataContainer(data,mRunningId);
                 mDataModel.append(c);
                 mRunningId++;
+                emit modelUpdated();
                 return mRunningId-1;
             }
                         delete c;
                     }
                 }
+                emit modelUpdated();
             }
             int BarChartModel::countRows()
                 return total;
             }
-            int BarChartModel::min()
+            qreal BarChartModel::min()
             {
              //   qDebug() << "BarChartModel::min";
                 Q_ASSERT(mDataModel.count() > 0);
                 // 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.
-                int min = INT_MAX;
+                qreal min = INT_MAX;
                 for (int i=0; i <mDataModel.count(); i++) {
                     int itemCount = mDataModel.at(i)->countColumns();
                     for (int j=0; j<itemCount; j++) {
-                        int temp = mDataModel.at(i)->valueAt(j);
+                        qreal temp = mDataModel.at(i)->valueAt(j);
                         if (temp < min) {
                             min = temp;
                         }
                 return min;
             }
-            int BarChartModel::max()
+            qreal BarChartModel::max()
             {
             //    qDebug() << "BarChartModel::max";
                 Q_ASSERT(mDataModel.count() > 0);
                 // 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.
-                int max = INT_MIN;
+                qreal max = INT_MIN;
                 for (int i=0; i <mDataModel.count(); i++) {
                     int itemCount = mDataModel.at(i)->countColumns();
                     for (int j=0; j<itemCount; j++) {
-                        int temp = mDataModel.at(i)->valueAt(j);
+                        qreal temp = mDataModel.at(i)->valueAt(j);
                         if (temp > max) {
                             max = temp;
                         }

src/barchart/barchartmodel_p.h +2 -3

                 int countColumns();         // Maximum number of items in series
                 int countTotalItems();      // Total items in all series. Includes empty items.
-                // TODO: qreal these
+                qreal max();  // Maximum value of all series
-                int max();  // Maximum value of all series
+                qreal min();  // Minimum value of all series
-                int min();  // Minimum value of all series
                 qreal valueAt(int series, int item);
                 qreal columnSum(int column);

src/barchart/barchartseriesbase.cpp +25 -11

             BarChartSeriesBase::BarChartSeriesBase(QObject *parent)
                 : QChartSeries(parent)
-                ,mModel(*(new BarChartModel(this))) // TODO: is this ok?
+                ,mModel(new BarChartModel(this))
             {
             }
             int BarChartSeriesBase::addData(QList<qreal> data)
             {
-                return mModel.addData(data);
+                return mModel->addData(data);
             }
             void BarChartSeriesBase::removeData(int id)
             {
-                mModel.removeData(id);
+                mModel->removeData(id);
+            }
+            void BarChartSeriesBase::setLabels(QList<QString> labels)
+            {
+                mLabels = labels;
             }
             qreal BarChartSeriesBase::min()
             {
-                return mModel.min();
+                return mModel->min();
             }
             qreal BarChartSeriesBase::max()
             {
-                return mModel.max();
+                return mModel->max();
             }
             int BarChartSeriesBase::countColumns()
             {
-                return mModel.countColumns();
+                return mModel->countColumns();
             }
             qreal BarChartSeriesBase::valueAt(int series, int item)
             {
-                qDebug() << "BarChartSeriesBase::valueAt" << series << item;
+            //    qDebug() << "BarChartSeriesBase::valueAt" << series << item;
-                return mModel.valueAt(series,item);
+                return mModel->valueAt(series,item);
             }
             qreal BarChartSeriesBase::maxColumnSum()
             {
-                qDebug() << "BarChartSeriesBase::maxColumnSum" << mModel.maxColumnSum();
+            //    qDebug() << "BarChartSeriesBase::maxColumnSum" << mModel->maxColumnSum();
-                return mModel.maxColumnSum();
+                return mModel->maxColumnSum();
             }
             BarChartModel& BarChartSeriesBase::model()
             {
-                return mModel;
+                return *mModel;
+            }
+            QString BarChartSeriesBase::label(int item)
+            {
+                if ((item>=0) && (item < mLabels.count()))  {
+                    return mLabels.at(item);
+                }
+                return QString("");
             }
             #include "moc_barchartseriesbase.cpp"

src/barchart/barchartseriesbase.h +5 -2

                 // Returns id for vector.
                 int addData(QList<qreal> data);
                 void removeData(int id);
+                void setLabels(QList<QString> labels);
+                // These shouldn't be visible to chart series user. However, ChartDataSet needs to access them, and friends are evil.
                 qreal min();
                 qreal max();
                 int countColumns();     // Count items in one series.
                 qreal maxColumnSum();
                 BarChartModel& model();
+                QString label(int item);
             signals:
                 void changed(int index);
             private:
-                BarChartModel& mModel;
+                BarChartModel* mModel;
-                BarGroupBase* mBarGroup;
+                QList<QString> mLabels;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/bargroup.cpp +1 -2

                 qreal tW = mWidth;
                 qreal tH = mHeight;
-                qreal tM = mMax;
+                qreal tM = mModel.max();
                 qreal scale = (tH/tM);
                 qreal tC = itemCount+1;
                 qreal xStepPerSeries = (tW/tC);

src/barchart/bargroupbase.cpp +9 -5

                 ,mBarDefaultWidth(20) // TODO: remove hard coding, when we have layout code ready
                 ,mLayoutSet(false)
                 ,mLayoutDirty(true)
-                ,mTheme(0)
                 ,mSeparatorsVisible(true)
                 ,mModel(series.model())
+                ,mSeries(series)
             {
+                dataChanged();
             }
             void BarGroupBase::setSeparatorsVisible(bool visible)
                 int count = mModel.countColumns();    // mSeries.countColumns();
                 for (int i=0; i<count; i++) {
                     BarLabel* label = new BarLabel(this);
-                    QString text("Label " + QString::number(i));
+            //        QString text("Label " + QString::number(i));
-                    label->set(text);
+                    label->set(mSeries.label(i));
                     childItems().append(label);
                 }
             void BarGroupBase::handleModelChanged(int index)
             {
-            //    qDebug() << "BarGroupBase::handleModelChanged" << index;
+                qDebug() << "BarGroupBase::handleModelChanged" << index;
                 dataChanged();
             }
             void BarGroupBase::handleDomainChanged(const Domain& domain)
             {
             //    qDebug() << "BarGroupBase::handleDomainChanged";
-                dataChanged();
+                // TODO: Figure out the use case for this.
+                // Affects the size of visible item, so layout is changed.
+            //    layoutChanged();
             }
             void BarGroupBase::handleGeometryChanged(const QRectF& rect)

src/barchart/bargroupbase.h +5 -14

             #ifndef BARGROUPBASE_H
             #define BARGROUPBASE_H
-            #include "charttheme_p.h"
             #include "chartitem_p.h"
-            //#include "barlabel_p.h"
-            //#include "bar_p.h"
             #include "barchartseriesbase.h"
             #include "barchartmodel_p.h"
             #include <QGraphicsItem>
                 void setSeparatorsVisible(bool visible = true);
             public: // From ChartItem
-                void setSize(const QSizeF &size){};
+            //    void setSize(const QSizeF &size){};
-                void setPlotDomain(const PlotDomain& data){};
                 // From QGraphicsItem
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
                 QRectF boundingRect() const;
-                // From ChartThemeObserver
-            //    void themeChanged(ChartTheme *theme);
                 // TODO: these may change with layout awarness.
                 void setBarWidth( int w );
                 int addColor( QColor color );
                 void resetColors();
+                // TODO: Consider the domain for layoutChanged. May be use case, may not be. If it is, then the derived classes need to implement it
                 virtual void dataChanged();     // data of series has changed -> need to recalculate bar sizes
                 virtual void layoutChanged() = 0;   // layout has changed -> need to recalculate bar sizes
                 void handleDomainChanged(const Domain& domain);
                 void handleGeometryChanged(const QRectF& size);
             protected:
                 // TODO: consider these.
-                int mMin;           // Min and max values of data. (updated when data is changed, used when drawing)
+                //int mMin;           // Min and max values of data. (updated when data is changed, used when drawing)
-                int mMax;
+                //int mMax;
                 int mHeight;        // Layout spesific
                 int mWidth;
                 bool mLayoutDirty;
                 QList<QColor> mColors;  // List of colors for series for now
-                ChartTheme* mTheme;
                 bool mSeparatorsVisible;
                 BarChartModel& mModel;
+                BarChartSeriesBase& mSeries;
             };

src/barchart/stackedbargroup.cpp 0 -3

                         qreal barHeight = mModel.valueAt(row, column) * scale;
                         Bar* bar = reinterpret_cast<Bar*> (childItems().at(itemIndex));
-                        // TODO: width settable per bar?
-                        // TODO: theme stuff
-            //            mTheme->themeForSeries();
                         bar->resize(mBarDefaultWidth, barHeight);
                         bar->setColor(mColors.at(row));
                         bar->setPos(xPos, yPos-barHeight);

src/chartdataset.cpp +3 -3

                         domain.m_minY = qMin(domain.m_minY,y);
                         domain.m_maxX = qMax(domain.m_maxX,x);
                         domain.m_maxY = qMax(domain.m_maxY,y);
+                        break;
                     }
-                    break;
                     case QChartSeries::SeriesTypeStackedBar: {
                         StackedBarChartSeries* stackedBarSeries = static_cast<StackedBarChartSeries*>(series);
                         domain.m_minY = qMin(domain.m_minY,y);
                         domain.m_maxX = qMax(domain.m_maxX,x);
                         domain.m_maxY = qMax(domain.m_maxY,y);
                         break;
+                    }
                     case QChartSeries::SeriesTypePercentBar: {
                         PercentBarChartSeries* percentBarSeries = static_cast<PercentBarChartSeries*>(series);
                         domain.m_minY = 0;
                         domain.m_maxX = qMax(domain.m_maxX,x);
                         domain.m_maxY = 100;
                         break;
+                    }
                     case QChartSeries::SeriesTypePie: {
                         QPieSeries *pieSeries = static_cast<QPieSeries *>(series);

src/charttheme.cpp +4 -1

             void ChartTheme::decorate(BarGroup* item, BarChartSeries* series,int count)
             {
-                for (int i=0; i< m_seriesColor.count(); i++) {
+                item->resetColors();
+                for (int i=0; i<m_seriesColor.count(); i++) {
                     item->addColor(m_seriesColor.at(i));
                 }
                 item->addColor(QColor(255,0,0,128));
             void ChartTheme::decorate(StackedBarGroup* item, StackedBarChartSeries* series,int count)
             {
+                item->resetColors();
                 for (int i=0; i< m_seriesColor.count(); i++) {
                     item->addColor(m_seriesColor.at(i));
                 }
             void ChartTheme::decorate(PercentBarGroup* item, PercentBarChartSeries* series,int count)
             {
+                item->resetColors();
                 for (int i=0; i< m_seriesColor.count(); i++) {
                     item->addColor(m_seriesColor.at(i));
                 }

test/chartwidgettest/mainwidget.cpp +13 0

                     series0->addData(data2);
                     series0->addData(data3);
                     series0->addData(data4);
+                    QList<QString> labels;
+                    labels << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "June" << "Jul" << "Aug" << "Sep" << "Nov" << "Dec";
+                    series0->setLabels(labels);
                     m_chartWidget->addSeries(series0);
                     newSeries = series0;
                 } else if (series == "StackedBar") {
                     series0->addData(data2);
                     series0->addData(data3);
                     series0->addData(data4);
+                    QList<QString> labels;
+                    labels << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "June" << "Jul" << "Aug" << "Sep" << "Nov" << "Dec";
+                    series0->setLabels(labels);
                     m_chartWidget->addSeries(series0);
                     newSeries = series0;
                 } else if (series == "PercentBar") {
                     series0->addData(data2);
                     series0->addData(data3);
                     series0->addData(data4);
+                    QList<QString> labels;
+                    labels << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "June" << "Jul" << "Aug" << "Sep" << "Nov" << "Dec";
+                    series0->setLabels(labels);
                     m_chartWidget->addSeries(series0);
                     newSeries = series0;
                 } else {
             {
                 qDebug() << "changeChartTheme: " << themeIndex;
                 m_chartWidget->setChartTheme((QChart::ChartTheme) themeIndex);
+                //TODO: remove this hack. This is just to make it so that theme change is seen immediately.
+                QSize s = size();
+                s.setWidth(s.width()+1);
+                resize(s);
             }
             void MainWidget::setPieSizeFactor(double size)

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