HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2107:9895ee3a7ecb

XYModelMapper: added support for models with QDate and QDateTime cells

Marek Rosa -

r2107:9895ee3a7ecb

parent child

Context file:

r2107:9895ee3a7ecb

Collapse all files

src/xychart/qxymodelmapper.cpp +43 -14

              #include "qxymodelmapper_p.h"
              #include "qxyseries.h"
              #include <QAbstractItemModel>
+             #include <QDateTime>
              QTCOMMERCIALCHART_BEGIN_NAMESPACE
                      return m_model->index(m_ySection, yPos + m_first);
              }
+             qreal QXYModelMapperPrivate::valueFromModel(QModelIndex index)
+             {
+                 QVariant value = m_model->data(index, Qt::DisplayRole);
+                 switch (value.type()) {
+                 case QVariant::DateTime:
+                     return value.toDateTime().toMSecsSinceEpoch();
+                 case QVariant::Date:
+                     return QDateTime(value.toDate()).toMSecsSinceEpoch();
+                 default:
+                     return value.toReal();
+                 }
+             }
+             void QXYModelMapperPrivate::setValueToModel(QModelIndex index, qreal value)
+             {
+                 QVariant oldValue = m_model->data(index, Qt::DisplayRole);
+                 switch (oldValue.type()) {
+                 case QVariant::DateTime:
+                     m_model->setData(index, QDateTime::fromMSecsSinceEpoch(value));
+                     break;
+                 case QVariant::Date:
+                     m_model->setData(index, QDateTime::fromMSecsSinceEpoch(value).date());
+                     break;
+                 default:
+                     m_model->setData(index, value);
+                 }
+             }
              void QXYModelMapperPrivate::handlePointAdded(int pointPos)
              {
                  if (m_seriesSignalsBlock)
                  else
                      m_model->insertColumns(pointPos + m_first, 1);
-                 m_model->setData(xModelIndex(pointPos), m_series->points().at(pointPos).x());
-                 m_model->setData(yModelIndex(pointPos), m_series->points().at(pointPos).y());
+                 setValueToModel(xModelIndex(pointPos), m_series->points().at(pointPos).x());
+                 setValueToModel(yModelIndex(pointPos), m_series->points().at(pointPos).y());
                  blockModelSignals(false);
              }
                      return;
                  blockModelSignals();
-                 m_model->setData(xModelIndex(pointPos), m_series->points().at(pointPos).x());
-                 m_model->setData(yModelIndex(pointPos), m_series->points().at(pointPos).y());
+                 setValueToModel(xModelIndex(pointPos), m_series->points().at(pointPos).x());
+                 setValueToModel(yModelIndex(pointPos), m_series->points().at(pointPos).y());
                  blockModelSignals(false);
              }
                                  QModelIndex yIndex = yModelIndex(index.row() - m_first);
                                  if (xIndex.isValid() && yIndex.isValid()) {
                                      oldPoint = m_series->points().at(index.row() - m_first);
-                                     newPoint.setX(m_model->data(xIndex).toReal());
-                                     newPoint.setY(m_model->data(yIndex).toReal());
+                                     newPoint.setX(valueFromModel(xIndex));
+                                     newPoint.setY(valueFromModel(yIndex));
                                  }
                              }
                          } else if (m_orientation == Qt::Horizontal && (index.row() == m_xSection || index.row() == m_ySection)) {
                                  QModelIndex yIndex = yModelIndex(index.column() - m_first);
                                  if (xIndex.isValid() && yIndex.isValid()) {
                                      oldPoint = m_series->points().at(index.column() - m_first);
-                                     newPoint.setX(m_model->data(xIndex).toReal());
-                                     newPoint.setY(m_model->data(yIndex).toReal());
+                                     newPoint.setX(valueFromModel(xIndex));
+                                     newPoint.setY(valueFromModel(yIndex));
                                  }
                              }
                          } else {
                          QModelIndex xIndex = xModelIndex(i - m_first);
                          QModelIndex yIndex = yModelIndex(i - m_first);
                          if (xIndex.isValid() && yIndex.isValid()) {
-                             point.setX(m_model->data(xIndex, Qt::DisplayRole).toDouble());
-                             point.setY(m_model->data(yIndex, Qt::DisplayRole).toDouble());
+                             point.setX(valueFromModel(xIndex));
+                             point.setY(valueFromModel(yIndex));
                              m_series->insert(i - m_first, point);
                          }
                      }
                                  QModelIndex xIndex = xModelIndex(i);
                                  QModelIndex yIndex = yModelIndex(i);
                                  if (xIndex.isValid() && yIndex.isValid()) {
-                                     point.setX(m_model->data(xIndex, Qt::DisplayRole).toDouble());
-                                     point.setY(m_model->data(yIndex, Qt::DisplayRole).toDouble());
+                                     point.setX(valueFromModel(xIndex));
+                                     point.setY(valueFromModel(yIndex));
                                      m_series->insert(i, point);
                                  }
                              }
                  QModelIndex yIndex = yModelIndex(pointPos);
                  while (xIndex.isValid() && yIndex.isValid()) {
                      QPointF point;
-                     point.setX(m_model->data(xIndex, Qt::DisplayRole).toDouble());
-                     point.setY(m_model->data(yIndex, Qt::DisplayRole).toDouble());
+                     point.setX(valueFromModel(xIndex));
+                     point.setY(valueFromModel(yIndex));
                      m_series->append(point);
                      pointPos++;
                      xIndex = xModelIndex(pointPos);

src/xychart/qxymodelmapper_p.h +2 0

                  void removeData(int start, int end);
                  void blockModelSignals(bool block = true);
                  void blockSeriesSignals(bool block = true);
+                 qreal valueFromModel(QModelIndex index);
+                 void setValueToModel(QModelIndex index, qreal value);
              private:
                  QXYSeries *m_series;

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