HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1648:8b084e770b03

Adds plotArea()...

Michal Klocek -

r1648:8b084e770b03

parent child

Context file:

r1648:8b084e770b03

demos/dynamicspline/chart.cpp +13 -8

             #include "chart.h"
             #include <QAbstractAxis>
             #include <QSplineSeries>
+            #include <QValuesAxis>
             #include <QTime>
+            #include <QDebug>
             Chart::Chart(QGraphicsItem *parent, Qt::WindowFlags wFlags)
                 :QChart(parent, wFlags),
-                m_step(1),
+                m_step(0),
-                m_x(0),
+                m_axis(new QValuesAxis),
+                m_x(5),
                 m_y(1)
             {
                 qsrand((uint) QTime::currentTime().msec());
                 addSeries(m_series);
                 createDefaultAxes();
+                setAxisX(m_axis,m_series);
-                axisY()->setRange(-5, 5);
+                m_axis->setTicksCount(5);
-                axisX()->setRange(-9, 1);
+                axisX()->setRange(0, 10);
-                //TODO:axisX()->setTicksCount(11);
+                axisY()->setRange(-5, 10);
                 m_timer.start();
             }
             void Chart::handleTimeout()
             {
-                m_x += m_step;
+                qreal x = plotArea().width()/m_axis->ticksCount();
+                qreal y =(m_axis->max() - m_axis->min())/m_axis->ticksCount();
+                m_x += y;
                 m_y = qrand() % 5 - 2.5;
                 m_series->append(m_x, m_y);
-                scroll(10,0);
+                scroll(x,0);
                 if(m_x==100) m_timer.stop();
             }

demos/dynamicspline/chart.h +2 0

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QSplineSeries;
+            class QValuesAxis;
             QTCOMMERCIALCHART_END_NAMESPACE
             QTCOMMERCIALCHART_USE_NAMESPACE
                 QTimer m_timer;
                 QSplineSeries* m_series;
                 QStringList m_titles;
+                QValuesAxis* m_axis;
                 qreal m_step;
                 qreal m_x;
                 qreal m_y;

src/chartpresenter.cpp +1 -1

             QRectF ChartPresenter::margins() const
             {
-                return QRectF();//m_layout->margins();
+                return m_layout->margins();
             }
             QLegend* ChartPresenter::legend()

src/qchart.cpp +5 0

                 return d_ptr->m_presenter->margins();
             }
+            QRectF QChart::plotArea() const
+            {
+                return d_ptr->m_presenter->geometry();
+            }
             /*!
              Sets animation \a options for the chart
              */

src/qchart.h +1 0

                 void setMarginsMinimum(const QRectF& margins);
                 QRectF margins() const;
+                QRectF plotArea() const;
             Q_SIGNALS:
                 void marginsChanged(QRectF newMargins);

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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