HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r527:b700a12da54b

QXYSeries: model data orientation added. QBarSeries: some model data function placeholders

Marek Rosa -

r527:b700a12da54b

parent child

Context file:

r527:b700a12da54b

Collapse all files

examples/tablemodelchart/customtablemodel.cpp +7 -4

                  m_labels.append("Lemons");
                  m_points.append(QPointF(200, 150));
                  m_labels.append("Plums");
+                 m_points.append(QPointF(225, 75));
+                 m_labels.append("Pearls");
              }
              int CustomTableModel::rowCount(const QModelIndex & parent) const
              int CustomTableModel::columnCount(const QModelIndex & parent) const
              {
-                 return 3;
+                 return 2;
              }
              QVariant CustomTableModel::headerData (int section, Qt::Orientation orientation, int role ) const
                          return "y";
                      case 2:
                          return "Fruit";
-                     default: "What?";
+                     default:
+                         return "What?";
                      }
                  }
                  else
              Qt::ItemFlags CustomTableModel::flags ( const QModelIndex & index ) const
              {
-                 if (!index.isValid())
-                             return Qt::ItemIsEnabled;
+             //    if (!index.isValid())
+             //                return Qt::ItemIsEnabled;
                      return QAbstractItemModel::flags(index) | Qt::ItemIsEditable;
              }

examples/tablemodelchart/tablewidget.cpp +2 -2

              //    QLineSeries* series = new QLineSeries;
                  QSplineSeries* series = new QSplineSeries;
                  series->setModel(model);
-                 series->setModelMappingX(0);
-                 series->setModelMappingY(1);
+                 series->setModelMapping(0,1, Qt::Vertical);
+             //    series->setModelMappingY(1);
              //    series->add(QPointF(150, 100));
              //    series->add(QPointF(200, 130));

src/barchart/qbarseries.cpp +18 0

              */
              int QBarSeries::barsetCount()
              {
+                 if(m_model)
+                     return m_mapBarTop - m_mapBarBottom;
+                 else
                  return mModel->barsetCount();
              }
                  return mSeparatorsVisible;
              }
+             bool QBarSeries::setModel(QAbstractItemModel* model)
+             {
+                 m_model = model;
+             }
+             void QBarSeries::setModelMappingCategories(int modelColumn)
+             {
+                 //
+             }
+             void QBarSeries::setModelMappingBarRange(int bottomBoundry, int topBoundry)
+             {
+                 //
+             }
              #include "moc_qbarseries.cpp"
              QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qbarseries.h +10 0

                  QList<QBarSet*> barSets();
                  QList<QSeries::LegendEntry> legendEntries();
+                 bool setModel(QAbstractItemModel* model);
+                 QAbstractItemModel* modelExt() {return m_model;}
+                 void setModelMappingCategories(int modelColumn);
+                 void setModelMappingBarRange(int bottomBoundry, int topBoundry);
              public:
                  // TODO: Functions below this are not part of api and will be moved
                  // to private implementation, when we start using it
              protected:
                  BarChartModel* mModel;
                  bool mSeparatorsVisible;
+                 QAbstractItemModel* m_model;
+                 int m_mapCategories;
+                 int m_mapBarBottom;
+                 int m_mapBarTop;
              };
              QTCOMMERCIALCHART_END_NAMESPACE

src/splinechart/qsplineseries.cpp +6 0

              bool QSplineSeries::setModel(QAbstractItemModel* model)
              {
                  QXYSeries::setModel(model);
+             //    calculateControlPoints();
+             }
+             void QSplineSeries::setModelMapping(int modelX, int modelY, Qt::Orientation orientation)
+             {
+                 QLineSeries::setModelMapping(modelX, modelY, orientation);
                  calculateControlPoints();
              }

src/splinechart/qsplineseries.h +2 0

                  QPointF controlPoint(int index) const {return m_controlPoints[index];}
                  bool setModel(QAbstractItemModel* model);
+                 void setModelMapping(int modelX, int modelY, Qt::Orientation orientation = Qt::Vertical);
                  // TODO: allow the user to set custom control points
              //    void setCustomControlPoints(QList<QPointsF> controlPoints);
              //    bool calculateControlPointsAutomatically();

src/xychart/qxyseries.cpp +38 -6

              */
              QXYSeries::QXYSeries(QObject* parent):QSeries(parent)
              {
-                 m_model = 0;
-                 m_mapX = 0;
-                 m_mapY = 1;
+                 m_model = NULL;
+                 m_mapX = -1;
+                 m_mapY = -1;
+                 m_mapOrientation = Qt::Vertical;
+             //    m_mapYOrientation = Qt::Vertical;
              }
              /*!
                  Destroys the object. Series added to QChartView or QChart instances are owned by those,
              qreal QXYSeries::x(int pos) const
              {
                  if (m_model)
+                     if (m_mapOrientation == Qt::Vertical)
+                         // consecutive data is read from model's column
                      return m_model->data(m_model->index(pos, m_mapX), Qt::DisplayRole).toDouble();
                  else
+                         // consecutive data is read from model's row
+                         return m_model->data(m_model->index(m_mapX, pos), Qt::DisplayRole).toDouble();
+                 else
+                     // model is not specified, return the data from series' internal data store
                      return m_x.at(pos);
              }
              qreal QXYSeries::y(int pos) const
              {
                  if (m_model)
+                     if (m_mapOrientation == Qt::Vertical)
+                         // consecutive data is read from model's column
                      return m_model->data(m_model->index(pos, m_mapY), Qt::DisplayRole).toDouble();
                  else
+                         // consecutive data is read from model's row
+                         return m_model->data(m_model->index(m_mapY, pos), Qt::DisplayRole).toDouble();
+                 else
+                     // model is not specified, return the data from series' internal data store
                      return m_y.at(pos);
              }
              {
                  Q_ASSERT(m_x.size() == m_y.size());
-             //    int k = m_model->rowCount();
                  if (m_model)
+                     if (m_mapOrientation == Qt::Vertical)
+                         // data is in a column, so return the number of items in single column
                      return m_model->rowCount();
                  else
+                         // data is in a row, so return the number of items in single row
+                         m_model->columnCount();
+                 else
+                     // model is not specified, return the number of points in the series internal data store
                      return m_x.size();
              }
              bool QXYSeries::setModel(QAbstractItemModel* model) {
                  m_model = model;
-                 for (int i = 0; i < m_model->rowCount(); i++)
-                     emit pointAdded(i);
+                 //    for (int i = 0; i < m_model->rowCount(); i++)
+                 //        emit pointAdded(i);
                  connect(m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelUpdated(QModelIndex, QModelIndex)));
              //        connect(m_model,SIGNAL(), this, SLOT(modelUpdated(QModelIndex, QModelIndex)));
              }
+             void QXYSeries::setModelMapping(int modelX, int modelY, Qt::Orientation orientation)
+             {
+                 m_mapX = modelX;
+                 m_mapY = modelY;
+                 m_mapOrientation = orientation;
+             }
+             //void QXYSeries::setModelMappingY(int modelLineIndex, Qt::Orientation orientation)
+             //{
+             //    m_mapY = modelLineIndex;
+             //    m_mapYOrientation = orientation;
+             //}
              #include "moc_qxyseries.cpp"
              QTCOMMERCIALCHART_END_NAMESPACE

src/xychart/qxyseries.h +4 -2

                  bool setModel(QAbstractItemModel* model);
                  QAbstractItemModel* model() {return m_model;}
-                 void setModelMappingX(int modelColumn) {m_mapX = modelColumn;}
-                 void setModelMappingY(int modelColumn) {m_mapY = modelColumn;}
+                 void setModelMapping(int modelX, int modelY, Qt::Orientation orientation = Qt::Vertical);
+             //    void setModelMappingY(int modelLineIndex, Qt::Orientation orientation = Qt::Vertical);
                  private slots:
                      void modelUpdated(QModelIndex topLeft, QModelIndex bottomRight);
                  QAbstractItemModel* m_model;
                  int m_mapX;
+                 Qt::Orientation m_mapOrientation;
                  int m_mapY;
+             //    Qt::Orientation m_mapYOrientation;
              };
              QTCOMMERCIALCHART_END_NAMESPACE

src/xychart/xychartitem.cpp +2 -2

                  Q_ASSERT(index>=0);
                  QPointF point = calculateGeometryPoint(index);
                  QVector<QPointF> points = m_points;
-                 m_points.replace(index,point);
-                 updatePoint(m_points);
+                 points.replace(index,point);
+                 updatePoint(points);
                  update();
              }

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