HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2815:4c1d3bc34edb

Added option to set labels clipping...

Titta Heikkala -

r2815:4c1d3bc34edb

parent child

Context file:

r2815:4c1d3bc34edb

Expand all files

src/charts/areachart/areachartitem.cpp +9 0

                   m_pointLabelsFormat(areaSeries->pointLabelsFormat()),
                   m_pointLabelsFont(areaSeries->pointLabelsFont()),
                   m_pointLabelsColor(areaSeries->pointLabelsColor()),
+                  m_pointLabelsClipping(true),
                   m_mousePressed(false)
             {
                 setAcceptHoverEvents(true);
                                  this, SLOT(handleUpdated()));
                 QObject::connect(areaSeries, SIGNAL(pointLabelsColorChanged(QColor)),
                                  this, SLOT(handleUpdated()));
+                QObject::connect(areaSeries, SIGNAL(pointLabelsClippingChanged(bool)),
+                                 this, SLOT(handleUpdated()));
                 handleUpdated();
             }
                 m_pointLabelsVisible = m_series->pointLabelsVisible();
                 m_pointLabelsFont = m_series->pointLabelsFont();
                 m_pointLabelsColor = m_series->pointLabelsColor();
+                m_pointLabelsClipping = m_series->pointLabelsClipping();
                 update();
             }
                     static const QString yPointTag(QLatin1String("@yPoint"));
                     const int labelOffset = 2;
+                    if (m_pointLabelsClipping)
+                        painter->setClipping(true);
+                    else
+                        painter->setClipping(false);
                     painter->setFont(m_pointLabelsFont);
                     painter->setPen(QPen(m_pointLabelsColor));
                     QFontMetrics fm(painter->font());

src/charts/areachart/areachartitem_p.h +1 0

                 QString m_pointLabelsFormat;
                 QFont m_pointLabelsFont;
                 QColor m_pointLabelsColor;
+                bool m_pointLabelsClipping;
                 QPointF m_lastMousePos;
                 bool m_mousePressed;

src/charts/areachart/qareaseries.cpp +42 -3

@@ -269,13 +269,13 QT_CHARTS_BEGIN_NAMESPACE
269	\property QAreaSeries::pointLabelsVisible	269	\property QAreaSeries::pointLabelsVisible
270	Defines the visibility for data point labels. False by default.	270	Defines the visibility for data point labels. False by default.
271		271
272	\sa QAreaSeries::pointLabelsFormat	272	\sa QAreaSeries::pointLabelsFormat, QAreaSeries::pointLabelsClipping
273	*/	273	*/
274	/*!	274	/*!
275	\qmlproperty bool AreaSeries::pointLabelsVisible	275	\qmlproperty bool AreaSeries::pointLabelsVisible
276	Defines the visibility for data point labels.	276	Defines the visibility for data point labels.
277		277
278	\sa pointLabelsFormat	278	\sa pointLabelsFormat, pointLabelsClipping
279	*/	279	*/
280	/*!	280	/*!
281	\fn void QAreaSeries::pointLabelsVisibilityChanged(bool visible)	281	\fn void QAreaSeries::pointLabelsVisibilityChanged(bool visible)
@@ -331,6 +331,29 QT_CHARTS_BEGIN_NAMESPACE
331	*/	331	*/
332		332
333	/*!	333	/*!
		334	\property QAreaSeries::pointLabelsClipping
		335	Defines the clipping for data point labels. True by default. The labels on the edge of the plot
		336	area are cut when clipping is enabled.
		337
		338	\sa pointLabelsVisible
		339	*/
		340	/*!
		341	\qmlproperty bool AreaSeries::pointLabelsClipping
		342	Defines the clipping for data point labels. True by default. The labels on the edge of the plot
		343	area are cut when clipping is enabled.
		344
		345	\sa pointLabelsVisible
		346	*/
		347	/*!
		348	\fn void QAreaSeries::pointLabelsClippintChanged(bool clipping)
		349	The clipping of the data point labels is changed to \a clipping.
		350	*/
		351	/*!
		352	\qmlsignal AreaSeries::onPointLabelsClippingChanged(bool clipping)
		353	The clipping of the data point labels is changed to \a clipping.
		354	*/
		355
		356	/*!
334	Constructs area series object which is a child of \a upperSeries. Area will be spanned between \a	357	Constructs area series object which is a child of \a upperSeries. Area will be spanned between \a
335	upperSeries line and \a lowerSeries line. If no \a lowerSeries is passed to constructor, area is specified by axis x (y=0) instead.	358	upperSeries line and \a lowerSeries line. If no \a lowerSeries is passed to constructor, area is specified by axis x (y=0) instead.
336	When series object is added to QChartView or QChart instance ownerships is transferred.	359	When series object is added to QChartView or QChart instance ownerships is transferred.
@@ -556,6 +579,21 QColor QAreaSeries::pointLabelsColor() const
556	return d->m_pointLabelsColor;	579	return d->m_pointLabelsColor;
557	}	580	}
558		581
		582	void QAreaSeries::setPointLabelsClipping(bool enabled)
		583	{
		584	Q_D(QAreaSeries);
		585	if (d->m_pointLabelsClipping != enabled) {
		586	d->m_pointLabelsClipping = enabled;
		587	emit pointLabelsClippingChanged(enabled);
		588	}
		589	}
		590
		591	bool QAreaSeries::pointLabelsClipping() const
		592	{
		593	Q_D(const QAreaSeries);
		594	return d->m_pointLabelsClipping;
		595	}
		596
559	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////	597	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
560		598
561	QAreaSeriesPrivate::QAreaSeriesPrivate(QLineSeries upperSeries, QLineSeries lowerSeries, QAreaSeries *q)	599	QAreaSeriesPrivate::QAreaSeriesPrivate(QLineSeries upperSeries, QLineSeries lowerSeries, QAreaSeries *q)
@@ -568,7 +606,8 QAreaSeriesPrivate::QAreaSeriesPrivate(QLineSeries upperSeries, QLineSeries lo
568	m_pointLabelsFormat(QLatin1String("@xPoint, @yPoint")),	606	m_pointLabelsFormat(QLatin1String("@xPoint, @yPoint")),
569	m_pointLabelsVisible(false),	607	m_pointLabelsVisible(false),
570	m_pointLabelsFont(QChartPrivate::defaultFont()),	608	m_pointLabelsFont(QChartPrivate::defaultFont()),
571	m_pointLabelsColor(QChartPrivate::defaultPen().color())	609	m_pointLabelsColor(QChartPrivate::defaultPen().color()),
		610	m_pointLabelsClipping(true)
572	{	611	{
573	}	612	}
574		613

src/charts/areachart/qareaseries.h +5 0

                 Q_PROPERTY(bool pointLabelsVisible READ pointLabelsVisible WRITE setPointLabelsVisible NOTIFY pointLabelsVisibilityChanged)
                 Q_PROPERTY(QFont pointLabelsFont READ pointLabelsFont WRITE setPointLabelsFont NOTIFY pointLabelsFontChanged)
                 Q_PROPERTY(QColor pointLabelsColor READ pointLabelsColor WRITE setPointLabelsColor NOTIFY pointLabelsColorChanged)
+                Q_PROPERTY(bool pointLabelsClipping READ pointLabelsClipping WRITE setPointLabelsClipping NOTIFY pointLabelsClippingChanged)
             public:
                 explicit QAreaSeries(QObject *parent = 0);
                 void setPointLabelsColor(const QColor &color);
                 QColor pointLabelsColor() const;
+                void setPointLabelsClipping(bool enabled = true);
+                bool pointLabelsClipping() const;
             Q_SIGNALS:
                 void clicked(const QPointF &point);
                 void hovered(const QPointF &point, bool state);
                 void pointLabelsVisibilityChanged(bool visible);
                 void pointLabelsFontChanged(const QFont &font);
                 void pointLabelsColorChanged(const QColor &color);
+                void pointLabelsClippingChanged(bool clipping);
             private:
                 Q_DECLARE_PRIVATE(QAreaSeries)

src/charts/areachart/qareaseries_p.h +2 0

                 bool m_pointLabelsVisible;
                 QFont m_pointLabelsFont;
                 QColor m_pointLabelsColor;
+                bool m_pointLabelsClipping;
             private:
                 Q_DECLARE_PUBLIC(QAreaSeries);
             };

src/charts/linechart/linechartitem.cpp +9 -1

                   m_pointLabelsFormat(series->pointLabelsFormat()),
                   m_pointLabelsFont(series->pointLabelsFont()),
                   m_pointLabelsColor(series->pointLabelsColor()),
+                  m_pointLabelsClipping(true),
                   m_mousePressed(false)
             {
                 setAcceptHoverEvents(true);
                                  this, SLOT(handleUpdated()));
                 QObject::connect(series, SIGNAL(pointLabelsFontChanged(QFont)), this, SLOT(handleUpdated()));
                 QObject::connect(series, SIGNAL(pointLabelsColorChanged(QColor)), this, SLOT(handleUpdated()));
+                QObject::connect(series, SIGNAL(pointLabelsClippingChanged(bool)), this, SLOT(handleUpdated()));
                 handleUpdated();
             }
                 m_pointLabelsVisible = m_series->pointLabelsVisible();
                 m_pointLabelsFont = m_series->pointLabelsFont();
                 m_pointLabelsColor = m_series->pointLabelsColor();
+                m_pointLabelsClipping = m_series->pointLabelsClipping();
                 if (doGeometryUpdate)
                     updateGeometry();
                 update();
                 reversePainter(painter, clipRect);
-                if (m_pointLabelsVisible)
+                if (m_pointLabelsVisible) {
+                    if (m_pointLabelsClipping)
+                        painter->setClipping(true);
+                    else
+                        painter->setClipping(false);
                     m_series->d_func()->drawSeriesPointLabels(painter, m_points, m_linePen.width() / 2);
+                }
                 painter->restore();

src/charts/linechart/linechartitem_p.h +1 0

                 QString m_pointLabelsFormat;
                 QFont m_pointLabelsFont;
                 QColor m_pointLabelsColor;
+                bool m_pointLabelsClipping;
                 QPointF m_lastMousePos;
                 bool m_mousePressed;

src/charts/scatterchart/scatterchartitem.cpp +7 0

                   m_pointLabelsFormat(series->pointLabelsFormat()),
                   m_pointLabelsFont(series->pointLabelsFont()),
                   m_pointLabelsColor(series->pointLabelsColor()),
+                  m_pointLabelsClipping(true),
                   m_mousePressed(false)
             {
                 QObject::connect(m_series->d_func(), SIGNAL(updated()), this, SLOT(handleUpdated()));
                                  this, SLOT(handleUpdated()));
                 QObject::connect(series, SIGNAL(pointLabelsFontChanged(QFont)), this, SLOT(handleUpdated()));
                 QObject::connect(series, SIGNAL(pointLabelsColorChanged(QColor)), this, SLOT(handleUpdated()));
+                QObject::connect(series, SIGNAL(pointLabelsClippingChanged(bool)), this, SLOT(handleUpdated()));
                 setZValue(ChartPresenter::ScatterSeriesZValue);
                 setFlags(QGraphicsItem::ItemClipsChildrenToShape);
                 painter->setClipRect(clipRect);
                 if (m_pointLabelsVisible) {
+                    if (m_pointLabelsClipping)
+                        painter->setClipping(true);
+                    else
+                        painter->setClipping(false);
                     m_series->d_func()->drawSeriesPointLabels(painter, m_points,
                                                               m_series->markerSize() / 2
                                                               + m_series->pen().width());
                 m_pointLabelsVisible = m_series->pointLabelsVisible();
                 m_pointLabelsFont = m_series->pointLabelsFont();
                 m_pointLabelsColor = m_series->pointLabelsColor();
+                m_pointLabelsClipping = m_series->pointLabelsClipping();
                 if (recreate) {
                     deletePoints(count);

src/charts/scatterchart/scatterchartitem_p.h +1 0

                 QString m_pointLabelsFormat;
                 QFont m_pointLabelsFont;
                 QColor m_pointLabelsColor;
+                bool m_pointLabelsClipping;
                 bool m_mousePressed;
             };

src/charts/splinechart/splinechartitem.cpp +9 -1

                   m_pointLabelsFormat(series->pointLabelsFormat()),
                   m_pointLabelsFont(series->pointLabelsFont()),
                   m_pointLabelsColor(series->pointLabelsColor()),
+                  m_pointLabelsClipping(true),
                   m_mousePressed(false)
             {
                 setAcceptHoverEvents(true);
                                  this, SLOT(handleUpdated()));
                 QObject::connect(series, SIGNAL(pointLabelsFontChanged(QFont)), this, SLOT(handleUpdated()));
                 QObject::connect(series, SIGNAL(pointLabelsColorChanged(QColor)), this, SLOT(handleUpdated()));
+                QObject::connect(series, SIGNAL(pointLabelsClippingChanged(bool)), this, SLOT(handleUpdated()));
                 handleUpdated();
             }
                 m_pointLabelsVisible = m_series->pointLabelsVisible();
                 m_pointLabelsFont = m_series->pointLabelsFont();
                 m_pointLabelsColor = m_series->pointLabelsColor();
+                m_pointLabelsClipping = m_series->pointLabelsClipping();
                 update();
             }
                 reversePainter(painter, clipRect);
-                if (m_pointLabelsVisible)
+                if (m_pointLabelsVisible) {
+                    if (m_pointLabelsClipping)
+                        painter->setClipping(true);
+                    else
+                        painter->setClipping(false);
                     m_series->d_func()->drawSeriesPointLabels(painter, m_points, m_linePen.width() / 2);
+                }
                 painter->restore();
             }

src/charts/splinechart/splinechartitem_p.h +1 0

                 QString m_pointLabelsFormat;
                 QFont m_pointLabelsFont;
                 QColor m_pointLabelsColor;
+                bool m_pointLabelsClipping;
                 QPointF m_lastMousePos;
                 bool m_mousePressed;

src/charts/xychart/qxyseries.cpp +42 -3

@@ -162,13 +162,13 QT_CHARTS_BEGIN_NAMESPACE
162	\property QXYSeries::pointLabelsVisible	162	\property QXYSeries::pointLabelsVisible
163	Defines the visibility for data point labels. False by default.	163	Defines the visibility for data point labels. False by default.
164		164
165	\sa pointLabelsFormat	165	\sa pointLabelsFormat, pointLabelsClipping
166	*/	166	*/
167	/*!	167	/*!
168	\qmlproperty bool XYSeries::pointLabelsVisible	168	\qmlproperty bool XYSeries::pointLabelsVisible
169	Defines the visibility for data point labels.	169	Defines the visibility for data point labels.
170		170
171	\sa pointLabelsFormat	171	\sa pointLabelsFormat, pointLabelsClipping
172	*/	172	*/
173	/*!	173	/*!
174	\fn void QXYSeries::pointLabelsVisibilityChanged(bool visible)	174	\fn void QXYSeries::pointLabelsVisibilityChanged(bool visible)
@@ -224,6 +224,29 QT_CHARTS_BEGIN_NAMESPACE
224	*/	224	*/
225		225
226	/*!	226	/*!
		227	\property QXYSeries::pointLabelsClipping
		228	Defines the clipping for data point labels. True by default. The labels on the edge of the plot
		229	area are cut when clipping is enabled.
		230
		231	\sa pointLabelsVisible
		232	*/
		233	/*!
		234	\qmlproperty bool XYSeries::pointLabelsClipping
		235	Defines the clipping for data point labels. True by default. The labels on the edge of the plot
		236	area are cut when clipping is enabled.
		237
		238	\sa pointLabelsVisible
		239	*/
		240	/*!
		241	\fn void QXYSeries::pointLabelsClippintChanged(bool clipping)
		242	The clipping of the data point labels is changed to \a clipping.
		243	*/
		244	/*!
		245	\qmlsignal XYSeries::onPointLabelsClippingChanged(bool clipping)
		246	The clipping of the data point labels is changed to \a clipping.
		247	*/
		248
		249	/*!
227	\fn void QXYSeries::clicked(const QPointF& point)	250	\fn void QXYSeries::clicked(const QPointF& point)
228	\brief Signal is emitted when user clicks the \a point on chart. The \a point is the point	251	\brief Signal is emitted when user clicks the \a point on chart. The \a point is the point
229	where the press was triggered.	252	where the press was triggered.
@@ -779,6 +802,21 QColor QXYSeries::pointLabelsColor() const
779	return d->m_pointLabelsColor;	802	return d->m_pointLabelsColor;
780	}	803	}
781		804
		805	void QXYSeries::setPointLabelsClipping(bool enabled)
		806	{
		807	Q_D(QXYSeries);
		808	if (d->m_pointLabelsClipping != enabled) {
		809	d->m_pointLabelsClipping = enabled;
		810	emit pointLabelsClippingChanged(enabled);
		811	}
		812	}
		813
		814	bool QXYSeries::pointLabelsClipping() const
		815	{
		816	Q_D(const QXYSeries);
		817	return d->m_pointLabelsClipping;
		818	}
		819
782	/*!	820	/*!
783	Stream operator for adding a data \a point to the series.	821	Stream operator for adding a data \a point to the series.
784	\sa append()	822	\sa append()
@@ -812,7 +850,8 QXYSeriesPrivate::QXYSeriesPrivate(QXYSeries *q)
812	m_pointLabelsFormat(QLatin1String("@xPoint, @yPoint")),	850	m_pointLabelsFormat(QLatin1String("@xPoint, @yPoint")),
813	m_pointLabelsVisible(false),	851	m_pointLabelsVisible(false),
814	m_pointLabelsFont(QChartPrivate::defaultFont()),	852	m_pointLabelsFont(QChartPrivate::defaultFont()),
815	m_pointLabelsColor(QChartPrivate::defaultPen().color())	853	m_pointLabelsColor(QChartPrivate::defaultPen().color()),
		854	m_pointLabelsClipping(true)
816	{	855	{
817	}	856	}
818		857

src/charts/xychart/qxyseries.h +5 0

                 Q_PROPERTY(bool pointLabelsVisible READ pointLabelsVisible WRITE setPointLabelsVisible NOTIFY pointLabelsVisibilityChanged)
                 Q_PROPERTY(QFont pointLabelsFont READ pointLabelsFont WRITE setPointLabelsFont NOTIFY pointLabelsFontChanged)
                 Q_PROPERTY(QColor pointLabelsColor READ pointLabelsColor WRITE setPointLabelsColor NOTIFY pointLabelsColorChanged)
+                Q_PROPERTY(bool pointLabelsClipping READ pointLabelsClipping WRITE setPointLabelsClipping NOTIFY pointLabelsClippingChanged)
             protected:
                 explicit QXYSeries(QXYSeriesPrivate &d, QObject *parent = 0);
                 void setPointLabelsColor(const QColor &color);
                 QColor pointLabelsColor() const;
+                void setPointLabelsClipping(bool enabled = true);
+                bool pointLabelsClipping() const;
                 void replace(QList<QPointF> points);
                 void replace(QVector<QPointF> points);
                 void pointLabelsVisibilityChanged(bool visible);
                 void pointLabelsFontChanged(const QFont &font);
                 void pointLabelsColorChanged(const QColor &color);
+                void pointLabelsClippingChanged(bool clipping);
                 void pointsRemoved(int index, int count);
             private:

src/charts/xychart/qxyseries_p.h +1 0

                 bool m_pointLabelsVisible;
                 QFont m_pointLabelsFont;
                 QColor m_pointLabelsColor;
+                bool m_pointLabelsClipping;
             private:
                 Q_DECLARE_PUBLIC(QXYSeries)

src/chartsqml2/plugins.qmltypes +10 0

                     Property { name: "pointLabelsVisible"; type: "bool" }
                     Property { name: "pointLabelsFont"; type: "QFont" }
                     Property { name: "pointLabelsColor"; type: "QColor" }
+                    Property { name: "pointLabelsClipping"; type: "bool" }
                     Signal {
                         name: "clicked"
                         Parameter { name: "point"; type: "QPointF" }
                         name: "pointLabelsColorChanged"
                         Parameter { name: "color"; type: "QColor" }
                     }
+                    Signal {
+                        name: "pointLabelsClippingChanged"
+                        Parameter { name: "clipping"; type: "bool" }
+                    }
                 }
                 Component {
                     name: "QtCharts::QBarCategoryAxis"
                     Property { name: "pointLabelsVisible"; type: "bool" }
                     Property { name: "pointLabelsFont"; type: "QFont" }
                     Property { name: "pointLabelsColor"; type: "QColor" }
+                    Property { name: "pointLabelsClipping"; type: "bool" }
                     Signal {
                         name: "clicked"
                         Parameter { name: "point"; type: "QPointF" }
                         Parameter { name: "color"; type: "QColor" }
                     }
                     Signal {
+                        name: "pointLabelsClippingChanged"
+                        Parameter { name: "clipping"; type: "bool" }
+                    }
+                    Signal {
                         name: "pointsRemoved"
                         Parameter { name: "index"; type: "int" }
                         Parameter { name: "count"; type: "int" }

tests/auto/qlineseries/tst_qlineseries.cpp +1 0

                 QCOMPARE(series.pointsVisible(), false);
                 QCOMPARE(series.pointLabelsVisible(), false);
                 QCOMPARE(series.pointLabelsFormat(), QLatin1String("@xPoint, @yPoint"));
+                QCOMPARE(series.pointLabelsClipping(), true);
                 series.append(QList<QPointF>());
                 series.append(0.0,0.0);

tests/auto/qxyseries/tst_qxyseries.cpp +18 0

@@ -152,6 +152,24 void tst_QXYSeries::pointLabelsColor()
152	QVERIFY(arguments.at(0).value<QColor>() == defaultColor);	152	QVERIFY(arguments.at(0).value<QColor>() == defaultColor);
153	}	153	}
154		154
		155	void tst_QXYSeries::pointLabelsClipping()
		156	{
		157	QSignalSpy labelsClippingSpy(m_series, SIGNAL(pointLabelsClippingChanged(bool)));
		158	QCOMPARE(m_series->pointLabelsClipping(), true);
		159
		160	m_series->setPointLabelsClipping(false);
		161	QCOMPARE(m_series->pointLabelsClipping(), false);
		162	TRY_COMPARE(labelsClippingSpy.count(), 1);
		163	QList<QVariant> arguments = labelsClippingSpy.takeFirst();
		164	QVERIFY(arguments.at(0).toBool() == false);
		165
		166	m_series->setPointLabelsClipping();
		167	QCOMPARE(m_series->pointLabelsClipping(), true);
		168	TRY_COMPARE(labelsClippingSpy.count(), 1);
		169	arguments = labelsClippingSpy.takeFirst();
		170	QVERIFY(arguments.at(0).toBool() == true);
		171	}
		172
155	void tst_QXYSeries::append_data()	173	void tst_QXYSeries::append_data()
156	{	174	{
157	QTest::addColumn< QList<QPointF> >("points");	175	QTest::addColumn< QList<QPointF> >("points");

tests/auto/qxyseries/tst_qxyseries.h +1 0

                 void pointLabelsVisible();
                 void pointLabelsFont();
                 void pointLabelsColor();
+                void pointLabelsClipping();
                 void seriesOpacity();
                 void oper_data();
                 void oper();

tests/manual/qmlchartproperties/qml/qmlchartproperties/AreaChart.qml +2 0

                                                                  + font.family);
                     onPointLabelsColorChanged:       console.log(name + ".onPointLabelsColorChanged: "
                                                                  + color);
+                    onPointLabelsClippingChanged:    console.log(name + ".onPointLabelsClippingChanged: "
+                                                                 + clipping);
                     onPressed:          console.log(name + ".onPressed: " + point.x + ", " + point.y);
                     onReleased:         console.log(name + ".onReleased: " + point.x + ", " + point.y);
                     onDoubleClicked:    console.log(name + ".onDoubleClicked: " + point.x + ", " + point.y);

tests/manual/qmlchartproperties/qml/qmlchartproperties/AreaEditor.qml +4 0

                     onClicked: series.pointLabelsColor = main.nextColor();
                 }
                 Button {
+                    text: "point labels clipping"
+                    onClicked: series.pointLabelsClipping = !series.pointLabelsClipping;
+                }
+                Button {
                     id: upperButton
                     text: "upper series"
                     unpressedColor: "#79bd8f"

tests/manual/qmlchartproperties/qml/qmlchartproperties/LineChart.qml +2 0

                                                                  + font.family);
                     onPointLabelsColorChanged:       console.log("lineSeries.onPointLabelsColorChanged: "
                                                                  + color);
+                    onPointLabelsClippingChanged:    console.log("lineSeries.onPointLabelsClippingChanged: "
+                                                                 + clipping);
                     onPressed:          console.log(name + ".onPressed: " + point.x + ", " + point.y);
                     onReleased:         console.log(name + ".onReleased: " + point.x + ", " + point.y);
                     onDoubleClicked:    console.log(name + ".onDoubleClicked: " + point.x + ", " + point.y);

tests/manual/qmlchartproperties/qml/qmlchartproperties/LineEditor.qml +4 0

                     onClicked: series.pointLabelsColor = main.nextColor();
                 }
                 Button {
+                    text: "point labels clipping"
+                    onClicked: series.pointLabelsClipping = !series.pointLabelsClipping;
+                }
+                Button {
                     text: "append point"
                     onClicked: series.append(series.count - 1, series.count - 1);
                 }

tests/manual/qmlchartproperties/qml/qmlchartproperties/ScatterChart.qml +2 0

                                                                  + font.family);
                     onPointLabelsColorChanged:       console.log("scatterSeries.onPointLabelsColorChanged: "
                                                                  + color);
+                    onPointLabelsClippingChanged:    console.log("scatterSeries.onPointLabelsClippingChanged: "
+                                                                 + clipping);
                     onPressed:          console.log(name + ".onPressed: " + point.x + ", " + point.y);
                     onReleased:         console.log(name + ".onReleased: " + point.x + ", " + point.y);
                     onDoubleClicked:    console.log(name + ".onDoubleClicked: " + point.x + ", " + point.y);

tests/manual/qmlchartproperties/qml/qmlchartproperties/ScatterEditor.qml +8 0

                     onClicked: series.pointLabelsVisible = !series.pointLabelsVisible;
                 }
                 Button {
+                    text: "point labels clipping"
+                    onClicked: series.pointLabelsClipping = !series.pointLabelsClipping;
+                }
+                Button {
                     text: "point labels format"
                     onClicked: {
                         if (series.pointLabelsFormat === "@xPoint, @yPoint")
                     onClicked: series.pointLabelsColor = main.nextColor();
                 }
                 Button {
+                    text: "point labels clipping"
+                    onClicked: series.pointLabelsClipping = !series.pointLabelsClipping;
+                }
+                Button {
                     text: "append point"
                     onClicked: series.append(series.count - 1, series.count - 1);
                 }

tests/manual/qmlchartproperties/qml/qmlchartproperties/SplineChart.qml +2 0

                                                                  + font.family);
                     onPointLabelsColorChanged:       console.log("splineSeries.onPointLabelsColorChanged: "
                                                                  + color);
+                    onPointLabelsClippingChanged:    console.log("splineSeries.onPointLabelsClippingChanged: "
+                                                                 + clipping);
                     onPressed:          console.log(name + ".onPressed: " + point.x + ", " + point.y);
                     onReleased:         console.log(name + ".onReleased: " + point.x + ", " + point.y);
                     onDoubleClicked:    console.log(name + ".onDoubleClicked: " + point.x + ", " + point.y);

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