HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1262:61ed30bfe89b

XYModelMapper slots for series signals implemented

Marek Rosa -

r1262:61ed30bfe89b

parent child

Context file:

r1262:61ed30bfe89b

Collapse all files

src/xychart/qxymodelmapper.cpp +35 -4

                  // connect the signals from the series
                  connect(d->m_series, SIGNAL(pointAdded(int)), d, SLOT(handlePointAdded(int)));
                  connect(d->m_series, SIGNAL(pointRemoved(int)), d, SLOT(handlePointRemoved(int)));
-                 connect(d->m_series, SIGNAL(pointReplaced(int)), d, SLOT(pointReplaced(int)));
+                 connect(d->m_series, SIGNAL(pointReplaced(int)), d, SLOT(handlePointReplaced(int)));
              }
              int QXYModelMapper::first() const
              void QXYModelMapperPrivate::handlePointAdded(int pointPos)
              {
-                 Q_UNUSED(pointPos)
+                 if (m_seriesSignalsBlock)
+                     return;
+                 if (m_count != -1)
+                     m_count += 1;
+                 blockModelSignals();
+                 if (m_orientation == Qt::Vertical)
+                     m_model->insertRows(pointPos + m_first, 1);
+                 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());
+                 blockModelSignals(false);
              }
              void QXYModelMapperPrivate::handlePointRemoved(int pointPos)
              {
-                 Q_UNUSED(pointPos)
+                 if (m_seriesSignalsBlock)
+                     return;
+                 if (m_count != -1)
+                     m_count -= 1;
+                 blockModelSignals();
+                 if (m_orientation == Qt::Vertical)
+                     m_model->removeRow(pointPos + m_first);
+                 else
+                     m_model->removeColumn(pointPos + m_first);
+                 blockModelSignals(false);
              }
              void QXYModelMapperPrivate::handlePointReplaced(int pointPos)
              {
-                 Q_UNUSED(pointPos)
+                 if (m_seriesSignalsBlock)
+                     return;
+                 blockModelSignals();
+                 m_model->setData(xModelIndex(pointPos), m_series->points().at(pointPos).x());
+                 m_model->setData(yModelIndex(pointPos), m_series->points().at(pointPos).y());
+                 blockModelSignals(false);
              }
              void QXYModelMapperPrivate::modelUpdated(QModelIndex topLeft, QModelIndex bottomRight)

src/xychart/qxyseries.cpp +8 -4

              {
                  Q_D(QXYSeries);
                  d->m_points<<point;
-                 emit d->pointAdded(d->m_points.count()-1);
+             //    emit d->pointAdded(d->m_points.count()-1);
+                 emit pointAdded(d->m_points.count()-1);
              }
              /*!
                  int index = d->m_points.indexOf(oldPoint);
                  if(index==-1) return;
                  d->m_points[index] = newPoint;
-                 emit d->pointReplaced(index);
+             //    emit d->pointReplaced(index);
+                 emit pointReplaced(index);
              }
              /*!
                  int index = d->m_points.indexOf(point);
                  if(index==-1) return;
                  d->m_points.remove(index);
-                 emit d->pointRemoved(index);
+             //    emit d->pointRemoved(index);
+                 emit pointRemoved(index);
              }
              /*!
              {
                  Q_D(QXYSeries);
                  d->m_points.insert(index, point);
-                 emit d->pointAdded(index);
+             //    emit d->pointAdded(index);
+                 emit pointAdded(index);
              }
              void QXYSeries::clear()

src/xychart/qxyseries.h +3 0

              Q_SIGNALS:
                  void clicked(const QPointF &point);
+                 void pointReplaced(int index);
+                 void pointRemoved(int index);
+                 void pointAdded(int index);
              private:
                  Q_DECLARE_PRIVATE(QXYSeries)

src/xychart/qxyseries_p.h +3 -3

              Q_SIGNALS:
                  void updated();
-                 void pointReplaced(int index);
-                 void pointRemoved(int index);
-                 void pointAdded(int index);
+             //    void pointReplaced(int index);
+             //    void pointRemoved(int index);
+             //    void pointAdded(int index);
              protected:
                  QVector<QPointF> m_points;

src/xychart/xychart.cpp +7 -4

              m_animation(0),
              m_dirty(true)
              {
-                 QObject::connect(series->d_func(),SIGNAL(pointReplaced(int)),this,SLOT(handlePointReplaced(int)));
-                 QObject::connect(series->d_func(),SIGNAL(pointAdded(int)),this,SLOT(handlePointAdded(int)));
-                 QObject::connect(series->d_func(),SIGNAL(pointRemoved(int)),this,SLOT(handlePointRemoved(int)));
-                 QObject::connect(this,SIGNAL(clicked(QPointF)),series,SIGNAL(clicked(QPointF)));
+             //    QObject::connect(series->d_func(),SIGNAL(pointReplaced(int)),this,SLOT(handlePointReplaced(int)));
+             //    QObject::connect(series->d_func(),SIGNAL(pointAdded(int)),this,SLOT(handlePointAdded(int)));
+             //    QObject::connect(series->d_func(),SIGNAL(pointRemoved(int)),this,SLOT(handlePointRemoved(int)));
+                 QObject::connect(series, SIGNAL(pointReplaced(int)), this,SLOT(handlePointReplaced(int)));
+                 QObject::connect(series, SIGNAL(pointAdded(int)), this,SLOT(handlePointAdded(int)));
+                 QObject::connect(series, SIGNAL(pointRemoved(int)), this,SLOT(handlePointRemoved(int)));
+                 QObject::connect(this, SIGNAL(clicked(QPointF)), series,SIGNAL(clicked(QPointF)));
              }
              void XYChart::setGeometryPoints(const QVector<QPointF>& points)

tests/tablemodelchart/tablewidget.cpp +19 -4

                  QPushButton* specialPieButton3 = new QPushButton("Modify slices using series API");
                  connect(specialPieButton3, SIGNAL(clicked()), this, SLOT(testPie3()));
+                 QPushButton* xyTestButton = new QPushButton("Append XY point");
+                 connect(xyTestButton, SIGNAL(clicked()), this, SLOT(testXY()));
                  QLabel *spinBoxLabel = new QLabel("Rows affected:");
                  buttonsLayout->addWidget(specialPieButton);
                  buttonsLayout->addWidget(specialPieButton2);
                  buttonsLayout->addWidget(specialPieButton3);
+                 buttonsLayout->addWidget(xyTestButton);
                  buttonsLayout->addStretch();
                  // chart type radio buttons
                      if (m_lineRadioButton->isChecked())
                      {
-                         //            m_chart->setAnimationOptions(QChart::NoAnimation);
+                                     m_chart->setAnimationOptions(QChart::NoAnimation);
                          // series 1
                          m_series = new QLineSeries(this);
                          mapper->setXColumn(0);
                          mapper->setYColumn(1);
                          mapper->setFirst(3);
-                         //            mapper->setCount(4);
+                                     mapper->setCount(4);
                          //            m_series->setModelMapping(0,1, Qt::Vertical);
                          //            m_series->setModelMappingRange(3, 4);
                          m_pieMapper->setLabelsColumn(7);
                          m_pieMapper->setSeries(m_pieSeries);
                          m_pieMapper->setModel(m_model);
-             //            m_pieMapper->setFirst(2);
+                         m_pieMapper->setFirst(2);
                          //                        m_pieMapper->setCount(5);
                          //                    pieSeries->setModelMapper(mapper);
                          m_pieMapper->setLabelsColumn(7);
                          m_pieMapper->setModel(m_model);
                          m_pieMapper->setSeries(m_pieSeries2);
-             //            m_pieMapper->setFirst(2);
+                         m_pieMapper->setFirst(2);
                          m_pieSeries2->setLabelsVisible(true);
                          m_pieSeries2->setPieSize(0.35);
                  }
              }
+             void TableWidget::testXY()
+             {
+             //    if (m_series->type() != QAbstractSeries::SeriesTypeLine) {
+             //        m_series->append(QPointF(150, 75));
+             //    }
+                 if (m_series->count() > 0) {
+                     m_series->remove(m_series->points().last());
+                 }
+             }
              TableWidget::~TableWidget()
              {

tests/tablemodelchart/tablewidget.h +2 0

                  void testPie2();
                  void testPie3();
+                 void testXY();
                  private:
                  QChartView* m_chartView;
                  QChart* m_chart;

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