HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2056:4b7228265b30

Implement QChartView::setChart()

Jani Honkonen -

r2056:4b7228265b30

parent child

Context file:

r2056:4b7228265b30

Collapse all files

src/chartlayout.cpp +2 -1

              void ChartLayout::setGeometry(const QRectF& rect)
              {
-                 Q_ASSERT(rect.isValid());
+                 if (!rect.isValid())
+                     return;
                  QList<ChartAxis*> axes = m_presenter->axisItems();
                  ChartTitle* title = m_presenter->titleElement();

src/qchartview.cpp +36 -3

              }
              /*!
+                 Sets the current chart to \a chart. Ownership of the new chart is passed to chartview
+                 and ownership of the previous chart is released.
+                 To avoid memory leaks users needs to make sure the previous chart is deleted.
+             */
+             void QChartView::setChart(QChart *chart)
+             {
+                 d_ptr->setChart(chart);
+             }
+             /*!
                  Sets the RubberBandPlicy to \a rubberBand. Selected policy determines the way zooming is performed.
              */
              void QChartView::setRubberBand(const RubberBands& rubberBand)
              void QChartView::resizeEvent(QResizeEvent *event)
              {
                  QGraphicsView::resizeEvent(event);
-                 d_ptr->m_chart->resize(size());
-                 setMinimumSize(d_ptr->m_chart->minimumSize().toSize());
-                 setSceneRect(d_ptr->m_chart->geometry());
+                 d_ptr->resize();
              }
              ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
              }
+             void QChartViewPrivate::setChart(QChart *chart)
+             {
+                 Q_ASSERT(chart);
+                 if (m_chart == chart)
+                     return;
+                 if (m_chart)
+                     m_scene->removeItem(m_chart);
+                 m_chart = chart;
+                 m_scene->addItem(m_chart);
+                 resize();
+             }
+             void QChartViewPrivate::resize()
+             {
+                 m_chart->resize(q_ptr->size());
+                 q_ptr->setMinimumSize(m_chart->minimumSize().toSize());
+                 q_ptr->setSceneRect(m_chart->geometry());
+             }
              #include "moc_qchartview.cpp"
              QTCOMMERCIALCHART_END_NAMESPACE

src/qchartview.h +2 0

                  void setRubberBand(const RubberBands& rubberBands);
                  RubberBands rubberBand() const;
                  QChart* chart() const;
+                 void setChart(QChart *chart);
              protected:
                  void resizeEvent(QResizeEvent *event);

src/qchartview_p.h +2 0

              public:
                  explicit QChartViewPrivate(QChartView *q, QChart *chart = 0);
                  ~QChartViewPrivate();
+                 void setChart(QChart *chart);
+                 void resize();
              protected:
                  QChartView *q_ptr;

tests/auto/qchartview/tst_qchartview.cpp +35 0

                  void chart();
                  void rubberBand_data();
                  void rubberBand();
+                 void setChart();
              private:
                  QChartView* m_view;
              }
+             void tst_QChartView::setChart()
+             {
+                 QPointer<QChart> oldChart = m_view->chart();
+                 QLineSeries *series1 = new QLineSeries();
+                 series1->append(0,0);
+                 series1->append(1,1);
+                 oldChart->addSeries(series1);
+                 QPointer<QChart> newChart = new QChart();
+                 QLineSeries *series2 = new QLineSeries();
+                 series2->append(0,1);
+                 series2->append(1,0);
+                 newChart->addSeries(series2);
+                 // show current chart
+                 m_view->show();
+                 QTest::qWaitForWindowShown(m_view);
+                 QTest::qWait(1000);
+                 // set new chart
+                 m_view->setChart(newChart);
+                 QVERIFY(m_view->chart() == newChart);
+                 QVERIFY(!oldChart.isNull()); // ownership of the oldChart is released and not deleted
+                 QTest::qWait(1000);
+                 // delete the view
+                 delete m_view;
+                 m_view = 0;
+                 QVERIFY(newChart.isNull()); // view owns and deletes it
+                 QVERIFY(!oldChart.isNull()); // not owned by view
+                 delete oldChart;
+             }
              QTEST_MAIN(tst_QChartView)
              #include "tst_qchartview.moc"

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