HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2716:bf30bed1cefb

Added plotAreaChanged signal to chart....

Miikka Heikkinen -

r2716:bf30bed1cefb

parent child

Context file:

r2716:bf30bed1cefb

Collapse all files

src/charts/chartpresenter.cpp +1 0

                         chart->domain()->setSize(rect.size());
                         chart->setPos(rect.topLeft());
                     }
+                    emit plotAreaChanged(m_rect);
                 }
             }

src/charts/chartpresenter_p.h +3 0

                 void handleAxisAdded(QAbstractAxis *axis);
                 void handleAxisRemoved(QAbstractAxis *axis);
+            signals:
+                void plotAreaChanged(const QRectF &plotArea);
             private:
                 QChart *m_chart;
                 QList<ChartItem *> m_chartItems;

src/charts/qchart.cpp +7 -4

             */
             /*!
+              \property QChart::plotArea
+              Holds the rectangle within which the drawing of the chart is done.
+              It does not include the area defined by margins.
+            */
+            /*!
              \internal
              Constructs a chart object of \a type which is a child of a \a parent.
              Parameter \a wFlags is passed to the QGraphicsWidget constructor.
                 return d_ptr->m_type;
             }
-            /*!
-                Returns the the rectangle within which the drawing of the chart is done.
-                It does not include the area defined by margins.
-             */
             QRectF QChart::plotArea() const
             {
                 return d_ptr->m_presenter->geometry();
                 QObject::connect(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries*)), m_themeManager, SLOT(handleSeriesRemoved(QAbstractSeries*)));
                 QObject::connect(m_dataset, SIGNAL(axisAdded(QAbstractAxis*)), m_themeManager, SLOT(handleAxisAdded(QAbstractAxis*)));
                 QObject::connect(m_dataset, SIGNAL(axisRemoved(QAbstractAxis*)), m_themeManager, SLOT(handleAxisRemoved(QAbstractAxis*)));
+                QObject::connect(m_presenter, &ChartPresenter::plotAreaChanged, q, &QChart::plotAreaChanged);
             }
             QChartPrivate::~QChartPrivate()

src/charts/qchart.h +4 0

                 Q_PROPERTY(bool plotAreaBackgroundVisible READ isPlotAreaBackgroundVisible WRITE setPlotAreaBackgroundVisible)
                 Q_PROPERTY(bool localizeNumbers READ localizeNumbers WRITE setLocalizeNumbers)
                 Q_PROPERTY(QLocale locale READ locale WRITE setLocale)
+                Q_PROPERTY(QRectF plotArea READ plotArea NOTIFY plotAreaChanged)
                 Q_ENUMS(ChartTheme)
                 Q_ENUMS(AnimationOption)
                 Q_ENUMS(ChartType)
                 ChartType chartType() const;
+            signals:
+                void plotAreaChanged(const QRectF &plotArea);
             protected:
                 explicit QChart(QChart::ChartType type, QGraphicsItem *parent, Qt::WindowFlags wFlags);
                 QScopedPointer<QChartPrivate> d_ptr;

src/chartsqml2/declarativechart.cpp +1 -13

             */
             /*!
-              \qmlsignal ChartView::onPlotAreaChanged(rect plotArea)
-              The plot area of the chart has changed. This may happen for example, if you modify minimumMargins
-              or if you resize the chart, or if you modify font size related properties of the legend or chart
-              title.
-            */
-            /*!
               \qmlsignal ChartView::seriesAdded(AbstractSeries series)
               The \a series has been added to the chart.
             */
                 connect(m_margins, SIGNAL(rightChanged(int,int,int,int)), this, SLOT(changeMinimumMargins(int,int,int,int)));
                 connect(m_chart->d_ptr->m_dataset, SIGNAL(seriesAdded(QAbstractSeries*)), this, SLOT(handleSeriesAdded(QAbstractSeries*)));
                 connect(m_chart->d_ptr->m_dataset, SIGNAL(seriesRemoved(QAbstractSeries*)), this, SIGNAL(seriesRemoved(QAbstractSeries*)));
+                connect(m_chart, &QChart::plotAreaChanged, this, &DeclarativeChart::plotAreaChanged);
             }
             void DeclarativeChart::handleSeriesAdded(QAbstractSeries *series)
             {
                 m_chart->setMargins(QMargins(left, top, right, bottom));
                 emit minimumMarginsChanged();
-                emit plotAreaChanged(m_chart->plotArea());
             }
             DeclarativeChart::~DeclarativeChart()
                     }
                 }
                 QQuickItem::geometryChanged(newGeometry, oldGeometry);
-                // It would be better to trigger the plotAreaChanged signal from QChart::plotAreaChanged or
-                // similar. Since that kind of a signal is not clearly needed in the C++ API the work-around is
-                // to implement it here for the QML API purposes.
-                emit plotAreaChanged(m_chart->plotArea());
             }
             void DeclarativeChart::sceneChanged(QList<QRectF> region)

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