HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1005:a6e87336a436

barchart: removed old model

sauimone -

r1005:a6e87336a436

parent child

Context file:

r1005:a6e87336a436

Collapse all files

examples/stackedbarchartdrilldown/drilldownchart.cpp +2 -1

              void DrilldownChart::changeSeries(QAbstractSeries *series)
              {
-                 if (m_currentSeries)
+                 if (m_currentSeries) {
                      removeSeries(m_currentSeries);
+                 }
                  m_currentSeries = series;
                  addSeries(series);
                  setTitle(series->name());

src/barchart/barchart.pri 0 -2

              SOURCES += \
                  $$PWD/bar.cpp \
-                 $$PWD/barchartmodel.cpp \
                  $$PWD/barchartitem.cpp \
                  $$PWD/percentbarchartitem.cpp \
                  $$PWD/qbarseries.cpp \
              PRIVATE_HEADERS += \
                  $$PWD/bar_p.h \
-                 $$PWD/barchartmodel_p.h \
                  $$PWD/barchartitem_p.h \
                  $$PWD/percentbarchartitem_p.h \
                  $$PWD/stackedbarchartitem_p.h \

src/barchart/barchartitem_p.h 0 -2

                  void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
                  QRectF boundingRect() const;
-                 // 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 QVector<QRectF> calculateLayout();
              protected:
-                 // TODO: consider these.
                  qreal m_domainMinX;
                  qreal m_domainMaxX;
                  qreal m_domainMinY;

src/barchart/qbarseries.cpp +98 -42

              #include "qbarseries_p.h"
              #include "qbarset.h"
              #include "qbarset_p.h"
-             #include "barchartmodel_p.h"
              #include "domain_p.h"
              #include "legendmarker_p.h"
              #include "chartdataset_p.h"
              void QBarSeries::appendBarSet(QBarSet *set)
              {
                  Q_D(QBarSeries);
-                 d->m_internalModel->appendBarSet(set);
+                 d->m_barSets.append(set);
                  QObject::connect(set->d_ptr.data(), SIGNAL(valueChanged()), d, SLOT(barsetChanged()));
                  emit d->restructuredBars();
              }
              void QBarSeries::removeBarSet(QBarSet *set)
              {
                  Q_D(QBarSeries);
-                 d->m_internalModel->removeBarSet(set);
+                 if (d->m_barSets.contains(set)) {
+                     d->m_barSets.removeOne(set);
                  emit d->restructuredBars();
              }
+             }
              /*!
                  Adds a list of barsets to series. Takes ownership of \a sets.
              {
                  Q_D(QBarSeries);
                  foreach (QBarSet* barset, sets) {
-                     d->m_internalModel->appendBarSet(barset);
+                     d->m_barSets.append(barset);
                      QObject::connect(barset, SIGNAL(valueChanged()), this, SLOT(barsetChanged()));
                  }
                  emit d->restructuredBars();
              }
              /*!
                  Q_D(QBarSeries);
                  foreach (QBarSet* barset, sets) {
-                     d->m_internalModel->removeBarSet(barset);
+                     if (d->m_barSets.contains(barset)) {
+                         d->m_barSets.removeOne(barset);
+                     }
                  }
                  emit d->restructuredBars();
              }
              void QBarSeries::insertBarSet(int i, QBarSet *set)
              {
                  Q_D(QBarSeries);
-                 d->m_internalModel->insertBarSet(i, set);
+                 d->m_barSets.insert(i,set);
                  emit d->barsetChanged();
              }
              int QBarSeries::barsetCount() const
              {
                  Q_D(const QBarSeries);
-                 return d->m_internalModel->barsetCount();
+                 return d->m_barSets.count();
              }
              /*!
              int QBarSeries::categoryCount() const
              {
                  Q_D(const QBarSeries);
-                 return d->m_internalModel->categoryCount();
+                 return d->m_categories.count();
              }
              /*!
              QList<QBarSet*> QBarSeries::barSets() const
              {
                  Q_D(const QBarSeries);
-                 return d->m_internalModel->barSets();
+                 return d->m_barSets;
              }
              /*!
              QBarCategories QBarSeries::categories() const
              {
                  Q_D(const QBarSeries);
-                 QBarCategories categories;
-                 int count = d->m_internalModel->categoryCount();
-                 for (int i=1; i <= count; i++) {
-                     categories.insert(i, d->m_internalModel->categoryName(i - 1));
+                 }
-                 return categories;
+                 return d->m_categories;
              }
              /*!
              QBarSeriesPrivate::QBarSeriesPrivate(QBarCategories categories, QBarSeries *q) :
                  QAbstractSeriesPrivate(q),
-                 m_internalModel(new BarChartModel(categories,this)),
+                 m_categories(categories),
                  m_model(0),
                  m_mapCategories(-1),
                  m_mapBarBottom(-1),
              QBarSet* QBarSeriesPrivate::barsetAt(int index)
              {
-                 return m_internalModel->barsetAt(index);
+                 return m_barSets.at(index);
              }
              QString QBarSeriesPrivate::categoryName(int category)
              {
-                 return m_internalModel->categoryName(category);
+                 return m_categories.at(category);
              }
              qreal QBarSeriesPrivate::min()
              {
-                 return m_internalModel->min();
+                 if (m_barSets.count() <= 0) {
+                     return 0;
+                 }
+                 qreal min = INT_MAX;
+                 for (int i = 0; i < m_barSets.count(); i++) {
+                     int categoryCount = m_barSets.at(i)->count();
+                     for (int j = 0; j < categoryCount; j++) {
+                         qreal temp = m_barSets.at(i)->at(j);
+                         if (temp < min)
+                             min = temp;
+                     }
+                 }
+                 return min;
              }
              qreal QBarSeriesPrivate::max()
              {
-                 return m_internalModel->max();
+                 if (m_barSets.count() <= 0) {
+                     return 0;
+                 }
+                 qreal max = INT_MIN;
+                 for (int i = 0; i < m_barSets.count(); i++) {
+                     int categoryCount = m_barSets.at(i)->count();
+                     for (int j = 0; j < categoryCount; j++) {
+                         qreal temp = m_barSets.at(i)->at(j);
+                         if (temp > max)
+                             max = temp;
+                     }
+                 }
+                 return max;
              }
              qreal QBarSeriesPrivate::valueAt(int set, int category)
              {
-                 return m_internalModel->valueAt(set, category);
+                 if ((set < 0) || (set >= m_barSets.count())) {
+                     // No set, no value.
+                     return 0;
+                 } else if ((category < 0) || (category >= m_barSets.at(set)->count())) {
+                     // No category, no value.
+                     return 0;
+                 }
+                 return m_barSets.at(set)->at(category);
              }
              qreal QBarSeriesPrivate::percentageAt(int set, int category)
              {
-                 return m_internalModel->percentageAt(set, category);
+                 if ((set < 0) || (set >= m_barSets.count())) {
+                     // No set, no value.
+                     return 0;
+                 } else if ((category < 0) || (category >= m_barSets.at(set)->count())) {
+                     // No category, no value.
+                     return 0;
+                 }
+                 qreal value = m_barSets.at(set)->at(category);
+                 qreal sum = categorySum(category);
+                 if ( qFuzzyIsNull(sum) ) {
+                     return 0;
+                 }
+                 return value / sum;
              }
              qreal QBarSeriesPrivate::categorySum(int category)
              {
-                 return m_internalModel->categorySum(category);
+                 qreal sum(0);
+                 int count = m_barSets.count(); // Count sets
+                 for (int set = 0; set < count; set++) {
+                     if (category < m_barSets.at(set)->count())
+                         sum += m_barSets.at(set)->at(category);
+                 }
+                 return sum;
              }
              qreal QBarSeriesPrivate::absoluteCategorySum(int category)
              {
-                 return m_internalModel->absoluteCategorySum(category);
+                 qreal sum(0);
+                 int count = m_barSets.count(); // Count sets
+                 for (int set = 0; set < count; set++) {
+                     if (category < m_barSets.at(set)->count())
+                         sum += qAbs(m_barSets.at(set)->at(category));
+                 }
+                 return sum;
              }
              qreal QBarSeriesPrivate::maxCategorySum()
              {
-                 return m_internalModel->maxCategorySum();
+                 qreal max = INT_MIN;
+                 int count = m_categories.count();
+                 for (int i = 0; i < count; i++) {
+                     qreal sum = categorySum(i);
+                     if (sum > max)
+                         max = sum;
              }
-             BarChartModel& QBarSeriesPrivate::modelInternal()
+             {
-                 return *m_internalModel;
+                 return max;
              }
              bool QBarSeriesPrivate::setModel(QAbstractItemModel *model)
                          this, SLOT(modelUpdated(QModelIndex,QModelIndex)));
                  // create the initial bars
-                 delete m_internalModel;
+                 m_categories.clear();
                  if (m_mapOrientation == Qt::Vertical) {
-                     QStringList categories;
-                     for (int k = 0; k < m_model->rowCount(); k++)
-                         categories << m_model->data(m_model->index(k, m_mapCategories), Qt::DisplayRole).toString();
-                     m_internalModel = new BarChartModel(categories, this);
+                     for (int k = 0; k < m_model->rowCount(); k++) {
+                         m_categories << m_model->data(m_model->index(k, m_mapCategories), Qt::DisplayRole).toString();
+                     }
                      for (int i = m_mapBarBottom; i <= m_mapBarTop; i++) {
                          QBarSet* barSet = new QBarSet(QString("Column: %1").arg(i + 1));
                          q->appendBarSet(barSet);
                      }
                  } else {
-                     QStringList categories;
-                     for (int k = 0; k < m_model->columnCount(); k++)
-                         categories << m_model->data(m_model->index(m_mapCategories, k), Qt::DisplayRole).toString();
-                     m_internalModel = new BarChartModel(categories, this);
+                     for (int k = 0; k < m_model->columnCount(); k++) {
+                         m_categories << m_model->data(m_model->index(m_mapCategories, k), Qt::DisplayRole).toString();
+                     }
                      for (int i = m_mapBarBottom; i <= m_mapBarTop; i++) {
                          QBarSet* barSet = new QBarSet(QString("Row: %1").arg(i + 1));
                  int tickXCount(domain.tickXCount());
                  int tickYCount(domain.tickYCount());
-                 qreal x = m_internalModel->categoryCount();
+                 qreal x = m_categories.count();
                  qreal y = max();
                  minX = qMin(minX, x);
                  minY = qMin(minY, y);

src/barchart/qbarseries.h 0 -1

              typedef QStringList QBarCategories;
              class QBarSet;
-             class BarChartModel;
              class BarCategory;
              class QBarSeriesPrivate;

src/barchart/qbarseries_p.h +3 -2

                  qreal categorySum(int category);
                  qreal absoluteCategorySum(int category);
                  qreal maxCategorySum();
-                 BarChartModel& modelInternal();
              Q_SIGNALS:
                  void clicked(QBarSet *barset, QString category, Qt::MouseButtons button);
                  void barsetChanged();
              protected:
-                 BarChartModel *m_internalModel;     // TODO: this may change... current "2 models" situation doesn't look good.
+                 QList<QBarSet *> m_barSets;
+                 QBarCategories m_categories;
                  QAbstractItemModel* m_model;
                  int m_mapCategories;
                  int m_mapBarBottom;

src/barchart/qstackedbarseries.cpp +1 -2

              #include "qstackedbarseries.h"
              #include "qstackedbarseries_p.h"
              #include "stackedbarchartitem_p.h"
-             #include "barchartmodel_p.h"
              #include "chartdataset_p.h"
              #include "charttheme_p.h"
              #include "chartanimator_p.h"
                  int tickXCount(domain.tickXCount());
                  int tickYCount(domain.tickYCount());
-                 qreal x = m_internalModel->categoryCount();
+                 qreal x = m_categories.count();
                  qreal y = maxCategorySum();
                  minX = qMin(minX, x);
                  minY = qMin(minY, y);

src/barchart/barchartmodel.cpp removed 0 -198

NO CONTENT: file was removed

src/barchart/barchartmodel_p.h removed 0 -78

NO CONTENT: file was removed

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