HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1195:505ff5d19e3d

Pie now has defualt Model to which slice data is copied.

Marek Rosa -

r1195:505ff5d19e3d

parent child

Context file:

r1195:505ff5d19e3d

Collapse all files

qmlplugin/declarativepieseries.cpp +2 -2

              //    setModel(new DeclarativeTableModel());
                  // TODO: Set default mapper parameters to allow easy to use PieSeries api?
-                 QPieModelMapper *mapper = new QPieModelMapper();
+                 QPieModelMapper *mapper = modelMapper();//new QPieModelMapper();
                  mapper->setMapLabels(0);
                  mapper->setMapValues(1);
                  mapper->setOrientation(Qt::Vertical);
                  mapper->setFirst(0);
                  mapper->setCount(-1);
-                 setModelMapper(mapper);
+             //    setModelMapper(mapper);
              }
              void DeclarativePieSeries::classBegin()

src/piechart/qpieseries.cpp +189 -53

              #include "charttheme_p.h"
              #include "chartanimator_p.h"
              #include "legendmarker_p.h"
-             #include <QAbstractItemModel>
+             //#include <QAbstractItemModel>
+             #include <QStandardItemModel>
              #include "qpiemodelmapper.h"
              QTCOMMERCIALCHART_BEGIN_NAMESPACE
                  if (!slice || d->m_slices.contains(slice))
                      return false;
-                 slice->setParent(this);
-                 d->m_slices.insert(index, slice);
+                 d->m_model->insertRow(index);
+                 if (d->m_mapper->orientation() == Qt::Vertical) {
+                     d->m_model->setData(d->m_model->index(index, d->m_mapper->mapValues()), slice->value());
+                     d->m_model->setData(d->m_model->index(index, d->m_mapper->mapLabels()), slice->label());
+                 } else {
+                     d->m_model->setData(d->m_model->index(d->m_mapper->mapValues(), index), slice->value());
+                     d->m_model->setData(d->m_model->index(d->m_mapper->mapLabels(), index), slice->label());
+                 }
-                 d->updateDerivativeData();
+                 //    if (index < 0 || index > d->m_slices.count())
+                 //        return false;
+                 //    if (!slice || d->m_slices.contains(slice))
+                 //        return false;
+                 //    slice->setParent(this);
+                 //    d->m_slices.insert(index, slice);
+                 //    d->updateDerivativeData();
+                 //    connect(slice, SIGNAL(changed()), d, SLOT(sliceChanged()));
+                 //    connect(slice, SIGNAL(clicked()), d, SLOT(sliceClicked()));
+                 //    connect(slice, SIGNAL(hovered(bool)), d, SLOT(sliceHovered(bool)));
+                 //    emit d->added(QList<QPieSlice*>() << slice);
-                 connect(slice, SIGNAL(changed()), d, SLOT(sliceChanged()));
-                 connect(slice, SIGNAL(clicked()), d, SLOT(sliceClicked()));
-                 connect(slice, SIGNAL(hovered(bool)), d, SLOT(sliceHovered(bool)));
-                 emit d->added(QList<QPieSlice*>() << slice);
                  return true;
              }
              void QPieSeries::clear()
              {
                  Q_D(QPieSeries);
-                 if (d->m_slices.count() == 0)
+                 if (count() == 0)
                      return;
+                 if (d->m_mapper->orientation() == Qt::Vertical)
+                     d->m_model->removeRows(d->m_mapper->first(), count());
+                 else
+                     d->m_model->removeColumns(d->m_mapper->first(), count());
+                 //    if (d->m_slices.count() == 0)
+                 //        return;
-                 QList<QPieSlice*> slices = d->m_slices;
-                 foreach (QPieSlice* s, d->m_slices) {
-                     d->m_slices.removeOne(s);
-                     delete s;
+                 }
+                 //    QList<QPieSlice*> slices = d->m_slices;
+                 //    foreach (QPieSlice* s, d->m_slices) {
+                 //        d->m_slices.removeOne(s);
+                 //        delete s;
+                 //    }
-                 d->updateDerivativeData();
+                 //    d->updateDerivativeData();
-                 emit d->removed(slices);
+                 //    emit d->removed(slices);
              }
              /*!
              int QPieSeries::count() const
              {
                  Q_D(const QPieSeries);
-                 return d->m_slices.count();
+                 //    return d->m_slices.count();
+                 //    if (d->m_model && d->m_mapper) {
+                 if (d->m_mapper->orientation() == Qt::Vertical) {
+                     // data is in a column. Return the number of mapped items if the model's column have enough items
+                     // or the number of items that can be mapped
+                     if (d->m_mapper->mapValues() >= d->m_model->columnCount() || d->m_mapper->mapLabels() >= d->m_model->columnCount())
+                         return 0;   // mapped columns are not existing
+                     else if (d->m_mapper->count() != -1)
+                         //    void setModelMapper(QPieModelMapper *mapper);
+                         return qMin(d->m_mapper->count(), qMax(d->m_model->rowCount() - d->m_mapper->first(), 0));
+                     else
+                         return qMax(d->m_model->rowCount() - d->m_mapper->first(), 0);
+                 } else {
+                     // data is in a row. Return the number of mapped items if the model's row have enough items
+                     // or the number of items that can be mapped
+                     if (d->m_mapper->mapValues() >= d->m_model->rowCount() || d->m_mapper->mapLabels() >= d->m_model->rowCount())
+                         return 0;   // mapped rows are not existing
+                     else if (d->m_mapper->count() != -1)
+                         return qMin(d->m_mapper->count(), qMax(d->m_model->columnCount() - d->m_mapper->first(), 0));
+                     else
+                         return qMax(d->m_model->columnCount() - d->m_mapper->first(), 0);
+                 }
+                 //    }
              }
              /*!
              void QPieSeries::setModel(QAbstractItemModel* model)
              {
                  Q_D(QPieSeries);
-                 // disconnect signals from old model
-                 if(d->m_model)
+                 {
-                     disconnect(d->m_model, 0, this, 0);
+                 }
                  // set new model
                  if(model)
                  {
+                     // disconnect signals from old model and delete it
+                     disconnect(d->m_model, 0, this, 0);
+                     delete d->m_model;
                      d->m_model = model;
                      // connect signals from the model
                      connect(d->m_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), d, SLOT(modelUpdated(QModelIndex,QModelIndex)));
                      if (d->m_mapper)
                          d->initializePieFromModel();
                  }
-                 else
+                 {
-                     d->m_model = 0;
+                 }
+             }
-             void QPieSeries::setModelMapper(QPieModelMapper *mapper)
+             {
-                 Q_D(QPieSeries);
-                 // disconnect signals from old mapper
-                 if (d->m_mapper) {
-                     QObject::disconnect(d->m_mapper, 0, this, 0);
+                 }
-                 if (mapper) {
-                     d->m_mapper = mapper;
-                     // connect the signal from the mapper
-                     connect(d->m_mapper, SIGNAL(updated()), d, SLOT(initializePieFromModel()));
-                     if (d->m_model)
-                         d->initializePieFromModel();
-                 } else {
-                     d->m_mapper = 0;
+                 }
+             }
+                 //    else
+                 //    {
+                 //        d->m_model = new QStandardItemModel;
+                 //        d->m_mapper->reset();
+                 //        d->m_mapper->setMapLabels(0);
+                 //        d->m_mapper->setMapValues(1);
+                 //    }
+             }
+             //void QPieSeries::setModelMapper(QPieModelMapper *mapper)
+             //{
+             //    Q_D(QPieSeries);
+             //    // disconnect signals from old mapper
+             //    if (d->m_mapper) {
+             //        QObject::disconnect(d->m_mapper, 0, this, 0);
+             //    }
+             //    if (mapper) {
+             //        d->m_mapper = mapper;
+             //        if (d->m_model)
+             //            d->initializePieFromModel();
+             //    } else {
+             //        d->m_mapper = new QPieModelMapper;
+             //        d->m_mapper->setMapLabels(0);
+             //        d->m_mapper->setMapValues(1);
+             //    }
+             //    // connect the signal from the mapper
+             //    connect(d->m_mapper, SIGNAL(updated()), d, SLOT(initializePieFromModel()));
+             //}
              QPieModelMapper* QPieSeries::modelMapper() const
              {
                  m_pieStartAngle(0),
                  m_pieEndAngle(360),
                  m_sum(0),
-                 m_mapper(0)
+                 m_model(new QStandardItemModel),
+                 m_mapper(new QPieModelMapper)
              {
+                 // connect signals from the model
+                 connect(m_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelUpdated(QModelIndex,QModelIndex)));
+                 connect(m_model, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(modelRowsAdded(QModelIndex,int,int)));
+                 connect(m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SLOT(modelRowsRemoved(QModelIndex,int,int)));
+                 connect(m_model, SIGNAL(columnsInserted(QModelIndex,int,int)), this, SLOT(modelColumnsAdded(QModelIndex,int,int)));
+                 connect(m_model, SIGNAL(columnsRemoved(QModelIndex,int,int)), this, SLOT(modelColumnsRemoved(QModelIndex,int,int)));
+                 // connect the signal from the mapper
+                 connect(m_mapper, SIGNAL(updated()), this, SLOT(initializePieFromModel()));
              }
              QPieSeriesPrivate::~QPieSeriesPrivate()
              void QPieSeriesPrivate::sliceChanged()
              {
                  Q_ASSERT(m_slices.contains(qobject_cast<QPieSlice *>(sender())));
+                 QPieSlice *slice = qobject_cast<QPieSlice *>(sender());
+                 int sliceIndex = m_slices.indexOf(slice);
+                 if (m_mapper->orientation() == Qt::Vertical) {
+                     QModelIndex modelIndex =  m_model->index(sliceIndex + m_mapper->first(), m_mapper->mapValues());
+                     if (m_model->data(modelIndex).toReal() != slice->value())
+                         m_model->setData(modelIndex, slice->value());
+                     modelIndex =  m_model->index(sliceIndex + m_mapper->first(), m_mapper->mapLabels());
+                     if (m_model->data(modelIndex).toString() != slice->label())
+                         m_model->setData(modelIndex, slice->label());
+                 } else {
+                     QModelIndex modelIndex =  m_model->index(m_mapper->mapValues(), sliceIndex + m_mapper->first());
+                     if (m_model->data(modelIndex).toReal() != slice->value())
+                         m_model->setData(modelIndex, slice->value());
+                     modelIndex =  m_model->index(m_mapper->mapLabels(), sliceIndex + m_mapper->first());
+                     if (m_model->data(modelIndex).toString() != slice->label())
+                         m_model->setData(modelIndex, slice->label());
+                 }
                  updateDerivativeData();
              }
                  emit q->hovered(slice, state);
              }
+             void QPieSeriesPrivate::doClear()
+             {
+                 if (m_slices.count() == 0)
+                     return;
+                 QList<QPieSlice*> slices = m_slices;
+                 foreach (QPieSlice* s, m_slices) {
+                     m_slices.removeOne(s);
+                     delete s;
+                 }
+                 updateDerivativeData();
+                 emit removed(slices);
+             }
+             void QPieSeriesPrivate::doRemove(QPieSlice* slice)
+             {
+                 if (!m_slices.removeOne(slice))
+                     return;// false;
+                 updateDerivativeData();
+                 emit removed(QList<QPieSlice*>() << slice);
+                 delete slice;
+                 slice = 0;
+                 return;// true;
+             }
+             void QPieSeriesPrivate::doInsert(int index, QPieSlice* slice)
+             {
+                 if (index < 0 || index > m_slices.count())
+                     return;// false;
+                 if (!slice || m_slices.contains(slice))
+                     return;// false;
+                 slice->setParent(this);
+                 m_slices.insert(index, slice);
+                 updateDerivativeData();
+                 connect(slice, SIGNAL(changed()), this, SLOT(sliceChanged()));
+                 connect(slice, SIGNAL(clicked()), this, SLOT(sliceClicked()));
+                 connect(slice, SIGNAL(hovered(bool)), this, SLOT(sliceHovered(bool)));
+                 emit added(QList<QPieSlice*>() << slice);
+                 return;// true;
+             }
              void QPieSeriesPrivate::modelUpdated(QModelIndex topLeft, QModelIndex bottomRight)
              {
                  if (m_mapper) {
                                  slice->setLabel(m_model->data(m_model->index(m_mapper->mapLabels(), i), Qt::DisplayRole).toString());
                              }
                              slice->setLabelVisible();
-                             q->insert(i - m_mapper->first(), slice);
+                             //                q->insert(i - m_mapper->first(), slice);
+                             doInsert(i - m_mapper->first(), slice);
                          }
                          if (m_mapper->count() != -1 && m_slices.size() > m_mapper->count())
                              for (int i = m_slices.size() - 1; i >= m_mapper->count(); i--)
-                                 q->remove(q->slices().at(i));
+                                 //                    q->remove(q->slices().at(i));
+                                 doRemove(q->slices().at(i));
                      }
                  }
              }
                          int first = qMax(start, m_mapper->first());    // get the index of the first item that will be removed.
                          int last = qMin(first + toRemove - 1, m_slices.size() + m_mapper->first() - 1);    // get the index of the last item that will be removed.
                          for (int i = last; i >= first; i--)
-                             q->remove(q->slices().at(i - m_mapper->first()));
+                             //                q->remove(q->slices().at(i - m_mapper->first()));
+                             doRemove(q->slices().at(i - m_mapper->first()));
                          if (m_mapper->count() != -1) {
                              int itemsAvailable;     // check how many are available to be added
                                          slice->setLabel(m_model->data(m_model->index(m_mapper->mapLabels(), i + m_mapper->first()), Qt::DisplayRole).toString());
                                      }
                                      slice->setLabelVisible();
-                                     q->insert(i, slice);
+                                     //                        q->insert(i, slice);
+                                     doInsert(i, slice);
                                  }
                          }
                      }
                  Q_Q(QPieSeries);
                  // clear current content
-                 q->clear();
+                 doClear();
                  if (m_model == 0 || m_mapper == 0)
                      return;

src/piechart/qpieseries.h +1 -1

                  void setLabelsVisible(bool visible = true);
                  void setModel(QAbstractItemModel* model);
-                 void setModelMapper(QPieModelMapper *mapper);
+             //    void setModelMapper(QPieModelMapper *mapper);
                  QPieModelMapper* modelMapper() const;
              Q_SIGNALS:

src/piechart/qpieseries_p.h +5 -1

                  bool setRealValue(qreal &value, qreal newValue, qreal max, qreal min = 0.0);
              private:
+                 void doClear();
+                 void doRemove(QPieSlice* slice);
+                 void doInsert(int index, QPieSlice* slice);
                  void insertData(int start, int end);
                  void removeData(int start, int end);
                  qreal m_pieEndAngle;
                  qreal m_sum;
-                 // model map
+                 // model
+                 QAbstractItemModel *m_model;
                  QPieModelMapper *m_mapper;
              private:

src/piechart/qpieslice.cpp +2 0

              #include "qpieslice.h"
              #include "pieslicedata_p.h"
+             #include <QAbstractItemModel>
              QTCOMMERCIALCHART_BEGIN_NAMESPACE
              {
                  if (d->m_labelText != label) {
                      d->m_labelText = label;
                      emit changed();
                  }
              }

test/auto/qpieseries/tst_qpieseries.cpp +8 -8

                  QVERIFY2(series->slices().count() == 0, "Mapper has not been set, so the number of slices should be 0");
                  // set the mapper
-                 QPieModelMapper *mapper = new QPieModelMapper;
+                 QPieModelMapper *mapper = series->modelMapper();//new QPieModelMapper;
                  mapper->setMapValues(0);
                  mapper->setMapLabels(0);
-                 series->setModelMapper(mapper); // this should cause the Pie to get initialized from the model, since there is now both the model and the mapper defined
+             //    series->setModelMapper(mapper); // this should cause the Pie to get initialized from the model, since there is now both the model and the mapper defined
                  QCOMPARE(series->slices().count(), rowCount);
                  // set the mappings to be outside of the model
                  // unset the model and the mapper
                  series->setModel(0);
-                 series->setModelMapper(0);
+             //    series->setModelMapper(0);
                  QVERIFY(series->model() == 0); // Model should be unset
-                 QVERIFY(series->modelMapper() == 0); // Model mapper should be unset
+             //    QVERIFY(series->modelMapper() == 0); // Model mapper should be unset
              }
              void tst_qpieseries::modelCustomMap()
                  chartView->show();
                  series->setModel(stdModel);
-                 QPieModelMapper *mapper = new QPieModelMapper;
+                 QPieModelMapper *mapper = series->modelMapper();//new QPieModelMapper;
                  mapper->setMapValues(0);
                  mapper->setMapLabels(0);
-                 series->setModelMapper(mapper);
+             //    series->setModelMapper(mapper);
                  QCOMPARE(series->slices().count(), rowCount);
                  // lets change the orientation to horizontal
                  chartView->show();
                  series->setModel(stdModel);
-                 QPieModelMapper *mapper = new QPieModelMapper;
+                 QPieModelMapper *mapper = series->modelMapper();//new QPieModelMapper;
                  mapper->setMapValues(0);
                  mapper->setMapLabels(0);
-                 series->setModelMapper(mapper);
+             //    series->setModelMapper(mapper);
                  stdModel->insertRows(3, 5);
                  QCOMPARE(series->slices().count(), rowCount + 5);

test/tablemodelchart/tablewidget.cpp +10 -6

                                  QPieSeries* pieSeries = new QPieSeries;
                                  pieSeries->setModel(m_model);
-                                 QPieModelMapper *mapper = new QPieModelMapper;
-                                 mapper->setMapValues(-1);
-                                 mapper->setMapLabels(-1);
+                                 QPieModelMapper *mapper = pieSeries->modelMapper();//new QPieModelMapper;
+                                 mapper->setMapValues(1);
+                                 mapper->setMapLabels(0);
                                  mapper->setFirst(2);
                                  mapper->setCount(5);
-                                 pieSeries->setModelMapper(mapper);
+             //                    pieSeries->setModelMapper(mapper);
                                  pieSeries->setLabelsVisible(true);
                                  pieSeries->setPieSize(0.75);
                      //            pieSeries->setVerticalPosition(0.3);
                                  m_chart->addSeries(pieSeries);
-             //                    seriesColorHex = "#" + QString::number(pieSeries->slices().at(pieSeries->slices().count()/2)->brush().color().rgb(), 16).right(6).toUpper();
+                                 seriesColorHex = "#" + QString::number(pieSeries->slices().at(pieSeries->slices().count()/2)->brush().color().rgb(), 16).right(6).toUpper();
                                  m_model->addMapping(seriesColorHex, QRect(0, 2, 2, 5));
+                                 pieSeries->slices().at(0)->setValue(400);
+                                 pieSeries->slices().at(0)->setLabel(QString("36"));
                      //            // pie 2
                      //            pieSeries = new QPieSeries;
                      //            pieSeries->setModel(m_model);
              void TableWidget::testPie()
              {
-                 m_series->modelMapper()->setMapX(4);
+             //    m_series->modelMapper()->setMapX(4);
              //    m_tableView->setColumnWidth(10, 250);
                  //    if (specialPie) {
                  //        specialPie->remove(specialPie->slices().at(2));

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