HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1481:3fafc6aab8aa

color and borderColor properties to XY charts; removed unnecessary signals

Tero Ahola -

r1481:3fafc6aab8aa

parent child

Context file:

r1481:3fafc6aab8aa

Expand all files

plugins/declarative/declarativeareaseries.cpp 0 -24

@@ -64,30 +64,6 DeclarativeLineSeries* DeclarativeAreaSeries::lowerSeries() const
64	return qobject_cast<DeclarativeLineSeries *>(QAreaSeries::lowerSeries());	64	return qobject_cast<DeclarativeLineSeries *>(QAreaSeries::lowerSeries());
65	}	65	}
66		66
67	QColor DeclarativeAreaSeries::penColor() const
68	{
69	return pen().color();
70	}
71
72	void DeclarativeAreaSeries::setPenColor(QColor color)
73	{
74	QPen p = pen();
75	p.setColor(color);
76	setPen(p);
77	}
78
79	QColor DeclarativeAreaSeries::brushColor() const
80	{
81	return brush().color();
82	}
83
84	void DeclarativeAreaSeries::setBrushColor(QColor color)
85	{
86	QBrush b = brush();
87	b.setColor(color);
88	setBrush(b);
89	}
90
91	#include "moc_declarativeareaseries.cpp"	67	#include "moc_declarativeareaseries.cpp"
92		68
93	QTCOMMERCIALCHART_END_NAMESPACE	69	QTCOMMERCIALCHART_END_NAMESPACE

plugins/declarative/declarativeareaseries.h 0 -6

                 Q_OBJECT
                 Q_PROPERTY(DeclarativeLineSeries *upperSeries READ upperSeries WRITE setUpperSeries)
                 Q_PROPERTY(DeclarativeLineSeries *lowerSeries READ lowerSeries WRITE setLowerSeries)
-                Q_PROPERTY(QColor color READ brushColor WRITE setBrushColor)
-                Q_PROPERTY(QColor borderColor READ penColor WRITE setPenColor)
             public:
                 explicit DeclarativeAreaSeries(QObject *parent = 0);
                 DeclarativeLineSeries* upperSeries() const;
                 void setLowerSeries(DeclarativeLineSeries* series);
                 DeclarativeLineSeries* lowerSeries() const;
-                QColor penColor() const;
-                void setPenColor(QColor color);
-                QColor brushColor() const;
-                void setBrushColor(QColor color);
             };
             QTCOMMERCIALCHART_END_NAMESPACE

plugins/declarative/declarativechart.cpp +3 -9

             void DeclarativeChart::setTheme(DeclarativeChart::Theme theme)
             {
                 QChart::ChartTheme chartTheme = (QChart::ChartTheme) theme;
-                if (chartTheme != m_chart->theme()) {
+                if (chartTheme != m_chart->theme())
                     m_chart->setTheme(chartTheme);
-                    themeChanged();
             }
             DeclarativeChart::Theme DeclarativeChart::theme()
             void DeclarativeChart::setAnimationOptions(DeclarativeChart::Animation animations)
             {
                 QChart::AnimationOption animationOptions = (QChart::AnimationOption) animations;
-                if (animationOptions != m_chart->animationOptions()) {
+                if (animationOptions != m_chart->animationOptions())
                     m_chart->setAnimationOptions(animationOptions);
-                    animationOptionsChanged();
             }
             DeclarativeChart::Animation DeclarativeChart::animationOptions()
             void DeclarativeChart::setTitle(QString title)
             {
-                if (title != m_chart->title()) {
+                if (title != m_chart->title())
                     m_chart->setTitle(title);
-                    emit titleChanged();
             }
             QString DeclarativeChart::title()
             {

plugins/declarative/declarativechart.h +3 -6

             //class DeclarativeChart : public QQuickPaintedItem, public Chart
             {
                 Q_OBJECT
-                Q_PROPERTY(Theme theme READ theme WRITE setTheme NOTIFY themeChanged)
+                Q_PROPERTY(Theme theme READ theme WRITE setTheme)
-                Q_PROPERTY(Animation animationOptions READ animationOptions WRITE setAnimationOptions NOTIFY animationOptionsChanged)
+                Q_PROPERTY(Animation animationOptions READ animationOptions WRITE setAnimationOptions)
-                Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged)
+                Q_PROPERTY(QString title READ title WRITE setTitle)
                 Q_PROPERTY(QColor titleColor READ titleColor WRITE setTitleColor NOTIFY titleColorChanged)
                 Q_PROPERTY(QAxis *axisX READ axisX)
                 Q_PROPERTY(QAxis *axisY READ axisY)
                 Q_INVOKABLE QAbstractSeries *createSeries(DeclarativeChart::SeriesType type, QString name = "");
             Q_SIGNALS:
-                void themeChanged();
-                void animationOptionsChanged();
-                void titleChanged();
                 void axisLabelsChanged();
                 void titleColorChanged();
                 void backgroundColorChanged();

plugins/declarative/declarativelineseries.h 0 -1

             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
-                Q_PROPERTY(QColor color READ penColor WRITE setPenColor)
                 Q_PROPERTY(int count READ count NOTIFY countChanged)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> declarativeChildren READ declarativeChildren)
                 Q_CLASSINFO("DefaultProperty", "declarativeChildren")

plugins/declarative/declarativescatterseries.cpp 0 -12

@@ -68,18 +68,6 void DeclarativeScatterSeries::appendDeclarativeChildren(QDeclarativeListPropert
68	// Empty implementation, childs are parsed in componentComplete	68	// Empty implementation, childs are parsed in componentComplete
69	}	69	}
70		70
71	QColor DeclarativeScatterSeries::brushColor()
72	{
73	return brush().color();
74	}
75
76	void DeclarativeScatterSeries::setBrushColor(QColor color)
77	{
78	QBrush b = brush();
79	b.setColor(color);
80	setBrush(b);
81	}
82
83	#include "moc_declarativescatterseries.cpp"	71	#include "moc_declarativescatterseries.cpp"
84		72
85	QTCOMMERCIALCHART_END_NAMESPACE	73	QTCOMMERCIALCHART_END_NAMESPACE

plugins/declarative/declarativescatterseries.h 0 -4

             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
-                Q_PROPERTY(QColor color READ brushColor WRITE setBrushColor)
-                Q_PROPERTY(QColor borderColor READ penColor WRITE setPenColor)
                 Q_PROPERTY(int count READ count NOTIFY countChanged)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> declarativeChildren READ declarativeChildren)
                 Q_CLASSINFO("DefaultProperty", "declarativeChildren")
                 explicit DeclarativeScatterSeries(QObject *parent = 0);
                 QXYSeries *xySeries();
                 QDeclarativeListProperty<QObject> declarativeChildren();
-                QColor brushColor();
-                void setBrushColor(QColor color);
             public: // from QDeclarativeParserStatus
                 void classBegin() { DeclarativeXySeries::classBegin(); }

plugins/declarative/declarativesplineseries.h 0 -1

             {
                 Q_OBJECT
                 Q_INTERFACES(QDeclarativeParserStatus)
-                Q_PROPERTY(QColor color READ penColor WRITE setPenColor)
                 Q_PROPERTY(QDeclarativeListProperty<QObject> declarativeChildren READ declarativeChildren)
                 Q_CLASSINFO("DefaultProperty", "declarativeChildren")

plugins/declarative/declarativexyseries.cpp 0 -17

@@ -59,23 +59,6 void DeclarativeXySeries::componentComplete()
59	}	59	}
60	}	60	}
61		61
62	QColor DeclarativeXySeries::penColor()
63	{
64	// All the inherited objects must be of type QXYSeries, so it is safe to cast
65	QXYSeries series = qobject_cast<QXYSeries >(xySeries());
66	Q_ASSERT(series);
67	return series->pen().color();
68	}
69
70	void DeclarativeXySeries::setPenColor(QColor color)
71	{
72	QXYSeries series = qobject_cast<QXYSeries >(xySeries());
73	Q_ASSERT(series);
74	QPen pen = series->pen();
75	pen.setColor(color);
76	series->setPen(pen);
77	}
78
79	DeclarativeXyPoint *DeclarativeXySeries::at(int index)	62	DeclarativeXyPoint *DeclarativeXySeries::at(int index)
80	{	63	{
81	QXYSeries series = qobject_cast<QXYSeries >(xySeries());	64	QXYSeries series = qobject_cast<QXYSeries >(xySeries());

plugins/declarative/declarativexyseries.h 0 -2

                 void classBegin();
                 void componentComplete();
                 virtual QXYSeries *xySeries() = 0;
-                QColor penColor();
-                void setPenColor(QColor color);
                 DeclarativeXyPoint *at(int index);
             };

src/areachart/qareaseries.cpp +53 0

@@ -58,6 +58,18 QTCOMMERCIALCHART_BEGIN_NAMESPACE
58	*/	58	*/
59		59
60	/*!	60	/*!
		61	\property QAreaSeries::color
		62	Fill (brush) color of the series. This is a convenience property for modifying the color of brush.
		63	\sa QAreaSeries::brush()
		64	*/
		65
		66	/*!
		67	\property QAreaSeries::borderColor
		68	Line (pen) color of the series. This is a convenience property for modifying the color of pen.
		69	\sa QAreaSeries::pen()
		70	*/
		71
		72	/*!
61	\fn QPen QAreaSeries::pen() const	73	\fn QPen QAreaSeries::pen() const
62	\brief Returns the pen used to draw line for this series.	74	\brief Returns the pen used to draw line for this series.
63	\sa setPen()	75	\sa setPen()
@@ -70,6 +82,16 QTCOMMERCIALCHART_BEGIN_NAMESPACE
70	*/	82	*/
71		83
72	/*!	84	/*!
		85	\fn void QAreaSeries::colorChanged(QColor color)
		86	\brief Signal is emitted when the fill (brush) color has changed to \a color.
		87	*/
		88
		89	/*!
		90	\fn void QAreaSeries::borderColorChanged(QColor color)
		91	\brief Signal is emitted when the line (pen) color has changed to \a color.
		92	*/
		93
		94	/*!
73	\fn bool QAreaSeries::pointsVisible() const	95	\fn bool QAreaSeries::pointsVisible() const
74	\brief Returns if the points are drawn for this series.	96	\brief Returns if the points are drawn for this series.
75	\sa setPointsVisible()	97	\sa setPointsVisible()
@@ -191,6 +213,37 QBrush QAreaSeries::brush() const
191	Q_D(const QAreaSeries);	213	Q_D(const QAreaSeries);
192	return d->m_brush;	214	return d->m_brush;
193	}	215	}
		216
		217	void QAreaSeries::setColor(const QColor &color)
		218	{
		219	QBrush b = brush();
		220	if (b.color() != color) {
		221	b.setColor(color);
		222	setBrush(b);
		223	emit colorChanged(color);
		224	}
		225	}
		226
		227	QColor QAreaSeries::color() const
		228	{
		229	return brush().color();
		230	}
		231
		232	void QAreaSeries::setBorderColor(const QColor &color)
		233	{
		234	QPen p = pen();
		235	if (p.color() != color) {
		236	p.setColor(color);
		237	setPen(p);
		238	emit borderColorChanged(color);
		239	}
		240	}
		241
		242	QColor QAreaSeries::borderColor() const
		243	{
		244	return pen().color();
		245	}
		246
194	/*!	247	/*!
195	Sets if data points are \a visible and should be drawn on line.	248	Sets if data points are \a visible and should be drawn on line.
196	*/	249	*/

src/areachart/qareaseries.h +12 -2

                 Q_OBJECT
                 Q_PROPERTY(QAbstractSeries *upperSeries READ upperSeries)
                 Q_PROPERTY(QAbstractSeries *lowerSeries READ lowerSeries)
+                Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
+                Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor NOTIFY borderColorChanged)
             public:
                 explicit QAreaSeries(QObject *parent = 0);
                 void setBrush(const QBrush &brush);
                 QBrush brush() const;
+                void setColor(const QColor &color);
+                QColor color() const;
+                void setBorderColor(const QColor &color);
+                QColor borderColor() const;
                 void setPointsVisible(bool visible = true);
                 bool pointsVisible() const;
             Q_SIGNALS:
                 void clicked(const QPointF &point);
                 void selected();
+                void colorChanged(QColor color);
+                void borderColorChanged(QColor color);
             private:
-                Q_DECLARE_PRIVATE(QAreaSeries);
+                Q_DECLARE_PRIVATE(QAreaSeries)
-                Q_DISABLE_COPY(QAreaSeries);
+                Q_DISABLE_COPY(QAreaSeries)
                 friend class AreaLegendMarker;
                 friend class AreaChartItem;
             };

src/axis/qaxis.cpp 0 -20

             */
             /*!
-              \fn void QAxis::labelsAngleChanged(int)
-              Emitted if the \a angle of the axis labels is changed.
-            */
-            /*!
               \fn void QAxis::shadesVisibleChanged(bool)
               Emitted if the visibility of the axis shades is changed to \a visible.
             */
             */
             /*!
-              \fn void QAxis::ticksCountChanged(int count)
-              \brief Emits the new \a count of ticks on the axis
-              Signal is emitted when the number of the ticks on the axis has been changed to a different value.
-              Parementer count\a count is the new number of ticks on the axis.
-            */
-            /*!
-              \fn void QAxis::niceNumbersEnabledChanged(bool)
-              Nice numbers algorithm was \a enabled or disabled.
-            */
-            /*!
               Constructs new axis object which is a child of \a parent. Ownership is taken by
               QChart when axis added.
             */
                 if (d_ptr->m_labelsAngle != angle) {
                     d_ptr->m_labelsAngle = angle;
                     emit d_ptr->updated();
-                    emit labelsAngleChanged(angle);
             	}
             }
             {
                 if (d_ptr->m_ticksCount != count) {
                     d_ptr->m_ticksCount = count;
-            		emit ticksCountChanged(count);
             		emit d_ptr->changed(d_ptr->m_min, d_ptr->m_max, d_ptr->m_ticksCount, d_ptr->m_niceNumbers);
             	}
             }
                 if (d_ptr->m_niceNumbers != enable){
                     d_ptr->m_niceNumbers = enable;
                     emit d_ptr->changed(d_ptr->m_min, d_ptr->m_max, d_ptr->m_ticksCount, d_ptr->m_niceNumbers);
-                    emit niceNumbersEnabledChanged(enable);
                 }
             }

src/axis/qaxis.h +3 -6

                 Q_PROPERTY(bool visible READ isAxisVisible WRITE setAxisVisible NOTIFY visibleChanged)
                 Q_PROPERTY(QColor color READ axisPenColor WRITE setAxisPenColor NOTIFY colorChanged)
                 Q_PROPERTY(bool labelsVisible READ labelsVisible WRITE setLabelsVisible NOTIFY labelsVisibleChanged)
-                Q_PROPERTY(int labelsAngle READ labelsAngle WRITE setLabelsAngle NOTIFY labelsAngleChanged)
+                Q_PROPERTY(int labelsAngle READ labelsAngle WRITE setLabelsAngle)
                 Q_PROPERTY(QColor labelsColor READ labelsColor WRITE setLabelsColor NOTIFY labelsColorChanged)
                 Q_PROPERTY(bool gridVisible READ isGridLineVisible WRITE setGridLineVisible NOTIFY gridVisibleChanged)
                 Q_PROPERTY(bool shadesVisible READ shadesVisible WRITE setShadesVisible NOTIFY shadesVisibleChanged)
                 Q_PROPERTY(QColor shadesBorderColor READ shadesBorderColor WRITE setShadesBorderColor NOTIFY shadesBorderColorChanged)
                 Q_PROPERTY(qreal min READ min WRITE setMin NOTIFY minChanged)
                 Q_PROPERTY(qreal max READ max WRITE setMax NOTIFY maxChanged)
-                Q_PROPERTY(int ticksCount READ ticksCount WRITE setTicksCount NOTIFY ticksCountChanged)
+                Q_PROPERTY(int ticksCount READ ticksCount WRITE setTicksCount)
-                Q_PROPERTY(bool niceNumbersEnabled READ niceNumbersEnabled WRITE setNiceNumbersEnabled NOTIFY niceNumbersEnabledChanged)
+                Q_PROPERTY(bool niceNumbersEnabled READ niceNumbersEnabled WRITE setNiceNumbersEnabled)
             public:
             	void rangeChanged(qreal min, qreal max);
                 void colorChanged(QColor color);
                 void labelsColorChanged(QColor color);
-                void labelsAngleChanged(int angle);
                 void shadesVisibleChanged(bool visible);
                 void shadesColorChanged(QColor color);
                 void shadesBorderColorChanged(QColor color);
                 void minChanged(qreal min);
                 void maxChanged(qreal max);
-                void ticksCountChanged(int count);
-                void niceNumbersEnabledChanged(bool enabled);
             private:
             	QScopedPointer<QAxisPrivate> d_ptr;

src/legend/qlegend.cpp 0 -6

             */
             /*!
-                \fn void QLegend::alignmentChanged(Qt::Alignment)
-                Emitted when the \a alignment of the legend changes.
-            */
-            /*!
                 \fn void QLegend::backgroundVisibleChanged(bool)
                 The visibility of the legend background changed to \a visible.
             */
                 if(d_ptr->m_alignment!=alignment) {
                     d_ptr->m_alignment = alignment;
                     d_ptr->updateLayout();
-                    alignmentChanged(alignment);
                 }
             }

src/legend/qlegend.h +1 -2

             class QTCOMMERCIALCHART_EXPORT QLegend : public QGraphicsWidget
             {
                 Q_OBJECT
-                Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment NOTIFY alignmentChanged)
+                Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment)
                 Q_PROPERTY(bool backgroundVisible READ isBackgroundVisible WRITE setBackgroundVisible NOTIFY backgroundVisibleChanged)
                 Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
                 Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor NOTIFY borderColorChanged)
                 void showEvent(QShowEvent *event);
             Q_SIGNALS:
-                void alignmentChanged(Qt::Alignment alignment);
                 void backgroundVisibleChanged(bool visible);
                 void colorChanged(QColor color);
                 void borderColorChanged(QColor color);

src/scatterchart/qscatterseries.cpp +52 -23

             */
             /*!
-              \property QScatterSeries::markerShape
+                \property QScatterSeries::color
+                Fill (brush) color of the series. This is a convenience property for modifying the color of brush.
-              Defines the shape of the marker used to draw the points in the series.
+                \sa QScatterSeries::brush()
             */
             /*!
-                \fn void QScatterSeries::markerShapeChanged()
+                \property QScatterSeries::borderColor
-                Emitted when marker shape is changed
+                Line (pen) color of the series. This is a convenience property for modifying the color of pen.
+                \sa QScatterSeries::pen()
             */
             /*!
-                \fn void QScatterSeries::markerSizeChanged()
+              \property QScatterSeries::markerShape
-                Emitted when marker size is changed
+              Defines the shape of the marker used to draw the points in the series. The default shape is MarkerShapeCircle.
             */
             /*!
               \property QScatterSeries::markerSize
-              Defines the size of the marker used to draw the points in the series.
+              Defines the size of the marker used to draw the points in the series. The default size is 15.0.
+            */
+            /*!
+                \fn void QScatterSeries::colorChanged(QColor color)
+                \brief Signal is emitted when the fill (brush) color has changed to \a color.
+            */
+            /*!
+                \fn void QScatterSeries::borderColorChanged(QColor color)
+                \brief Signal is emitted when the line (pen) color has changed to \a color.
             */
             /*!
                 return QAbstractSeries::SeriesTypeScatter;
             }
-            /*!
+            void QScatterSeries::setColor(const QColor &color)
-                Returns the shape used for drawing markers.
-            */
+                QBrush b = brush();
+                if (b.color() != color) {
+                    b.setColor(color);
+                    setBrush(b);
+                    emit colorChanged(color);
+                }
+            }
+            QColor QScatterSeries::color() const
+            {
+                return brush().color();
+            }
+            void QScatterSeries::setBorderColor(const QColor &color)
+            {
+                QPen p = pen();
+                if (p.color() != color) {
+                    p.setColor(color);
+                    setPen(p);
+                    emit borderColorChanged(color);
+                }
+            }
+            QColor QScatterSeries::borderColor() const
+            {
+                return pen().color();
+            }
             QScatterSeries::MarkerShape QScatterSeries::markerShape() const
             {
                 Q_D(const QScatterSeries);
                 return d->m_shape;
             }
-            /*!
-                Overrides the default shape of the marker items with a user defined \a shape. The default shape
-                is defined by chart theme setting.
-            */
             void QScatterSeries::setMarkerShape(MarkerShape shape)
             {
                 Q_D(QScatterSeries);
                 if (d->m_shape != shape) {
                     d->m_shape = shape;
-                    emit markerShapeChanged();
+                    emit d->updated();
                 }
             }
-            /*!
-                Returns the size of the marker items.
-            */
             qreal QScatterSeries::markerSize() const
             {
                 Q_D(const QScatterSeries);
                 return d->m_size;
             }
-            /*!
-                Set the \a size of the marker items. The default size is 15.
-            */
             void QScatterSeries::setMarkerSize(qreal size)
             {
                 Q_D(QScatterSeries);
                 if (!qFuzzyIsNull(d->m_size - size)) {
                     d->m_size = size;
-                    emit markerSizeChanged();
+                    emit d->updated();
                 }
             }

src/scatterchart/qscatterseries.h +10 -5

             class QTCOMMERCIALCHART_EXPORT QScatterSeries : public QXYSeries
             {
                 Q_OBJECT
-                Q_PROPERTY(MarkerShape markerShape READ markerShape WRITE setMarkerShape NOTIFY markerShapeChanged)
+                Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
-                Q_PROPERTY(qreal markerSize READ markerSize WRITE setMarkerSize NOTIFY markerSizeChanged)
+                Q_PROPERTY(QColor borderColor READ borderColor WRITE setBorderColor NOTIFY borderColorChanged)
+                Q_PROPERTY(MarkerShape markerShape READ markerShape WRITE setMarkerShape)
+                Q_PROPERTY(qreal markerSize READ markerSize WRITE setMarkerSize)
                 Q_ENUMS(MarkerShape)
             public:
                 explicit QScatterSeries(QObject *parent = 0);
                 ~QScatterSeries();
                 QAbstractSeries::SeriesType type() const;
+                void setColor(const QColor &color);
+                QColor color() const;
+                void setBorderColor(const QColor &color);
+                QColor borderColor() const;
                 MarkerShape markerShape() const;
                 void setMarkerShape(MarkerShape shape);
                 qreal markerSize() const;
                 void setMarkerSize(qreal size);
             Q_SIGNALS:
-                void markerShapeChanged();
+                void colorChanged(QColor color);
-                void markerSizeChanged();
+                void borderColorChanged(QColor color);
             private:
                 Q_DECLARE_PRIVATE(QScatterSeries)
                 Q_DISABLE_COPY(QScatterSeries)
                 friend class ScatterChartItem;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

src/scatterchart/scatterchartitem.cpp 0 -2

                 m_size(15)
             {
                 QObject::connect(m_series->d_func(),SIGNAL(updated()), this, SLOT(handleUpdated()));
-                QObject::connect(m_series, SIGNAL(markerShapeChanged()), this, SLOT(handleUpdated()));
-                QObject::connect(m_series, SIGNAL(markerSizeChanged()), this, SLOT(handleUpdated()));
                 QObject::connect(m_series, SIGNAL(visibleChanged()), this, SLOT(handleUpdated()));
                 setZValue(ChartPresenter::ScatterSeriesZValue);

src/xychart/qxyseries.cpp +22 -3

             */
             /*!
+                \property QXYSeries::color
+                Line (pen) color of the series. This is a convenience property for modifying the color of pen.
+                \sa QXYSeries::pen()
+            */
+            /*!
                 \fn void QXYSeries::clicked(const QPointF& point)
                 \brief Signal is emitted when user clicks the \a point on chart.
             */
             */
             /*!
-                \fn void QXYSeries::pointsVisibleChanged(bool visible)
+                \fn void QXYSeries::colorChanged(QColor color)
-                \brief Signal is emitted when the point visibility has changed to \a visible.
+                \brief Signal is emitted when the line (pen) color has changed to \a color.
             */
             /*!
                 return d->m_brush;
             }
+            void QXYSeries::setColor(const QColor &color)
+            {
+                QPen p = pen();
+                if (p.color() != color) {
+                    p.setColor(color);
+                    setPen(p);
+                    emit colorChanged(color);
+                }
+            }
+            QColor QXYSeries::color() const
+            {
+                return pen().color();
+            }
             void QXYSeries::setPointsVisible(bool visible)
             {
                 if (d->m_pointsVisible != visible){
                     d->m_pointsVisible = visible;
                     emit d->updated();
-                    emit pointsVisibleChanged(visible);
                 }
             }

src/xychart/qxyseries.h +6 -3

             class QTCOMMERCIALCHART_EXPORT QXYSeries : public QAbstractSeries
             {
                 Q_OBJECT
-                Q_PROPERTY(bool pointsVisible READ pointsVisible WRITE setPointsVisible NOTIFY pointsVisibleChanged)
+                Q_PROPERTY(bool pointsVisible READ pointsVisible WRITE setPointsVisible)
+                Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
             protected:
                 explicit QXYSeries(QXYSeriesPrivate &d,QObject *parent = 0);
                 void setBrush(const QBrush &brush);
                 QBrush brush() const;
+                virtual void setColor(const QColor &color);
+                virtual QColor color() const;
                 void setPointsVisible(bool visible = true);
                 bool pointsVisible() const;
                 void pointReplaced(int index);
                 void pointRemoved(int index);
                 void pointAdded(int index);
-                void pointsVisibleChanged(bool visible);
+                void colorChanged(QColor color);
             private:
                 Q_DECLARE_PRIVATE(QXYSeries)

tests/qmlchartproperties/qml/qmlchartproperties/AreaEditor.qml +6 -2

                 property variant series
                 onSeriesChanged: {
-                    seriesConnections.target = series;
+                    if (series && series.name == "area 1") {
+                        seriesConnections.target = series;
+                    } else {
+                        seriesConnections.target = null;
+                    }
                 }
                 Connections {
                     id: seriesConnections
-                    ignoreUnknownSignals: true
+                    target: null
                     onNameChanged:              console.log("series.onNameChanged: " + series.name);
                     onVisibleChanged:           console.log("series.onVisibleChanged: " + series.visible);
                     onColorChanged:             console.log("series.onColorChanged: " + series.color);

tests/qmlchartproperties/qml/qmlchartproperties/BarChart.qml +1 0

                 BarSeries {
                     id: daSeries
+                    name: "bar"
                     BarSet { label: "Bob"; values: [4, 7, 3, 10, 5, 6] }
                     BarSet { label: "Susan"; values: [5, 1, 2, 4, 1, 8] }
                     BarSet { label: "James"; values: [3, 5, 8, 5, 4, 7] }

tests/qmlchartproperties/qml/qmlchartproperties/BarEditor.qml +9 -4

                 property variant series
                 onSeriesChanged: {
-                    seriesConnections.target = series;
+                    if (series && series.name == "bar") {
-                    setConnections.target = series.at(0);
+                        seriesConnections.target = series;
+                        setConnections.target = series.at(0);
+                    } else {
+                        seriesConnections.target = null;
+                        setConnections.target = null;
+                    }
                 }
                 Connections {
                     id: seriesConnections
-                    ignoreUnknownSignals: true
+                    target: null
                     onNameChanged:              console.log("series.onNameChanged: " + series.name);
                     onVisibleChanged:           console.log("series.onVisibleChanged: " + series.visible);
                     onBarWidthChanged:          console.log("series.onBardWidthChanged: " + width)
                 Connections {
                     id: setConnections
-                    ignoreUnknownSignals: true
+                    target: null
                     onColorChanged:             console.log("series.onColorChanged: " + color);
                     onBorderColorChanged:       console.log("series.onBorderColorChanged: " + color);
                     onLabelColorChanged:        console.log("series.onLabelColorChanged: " + color);

tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor.qml +15 -18

                 property variant series // TODO: rename to chart
                 onSeriesChanged: {
-                    legendConnections.target = series.legend;
+                    if (series && series.name == "") {
-                    axisXConnections.target = series.axisX;
+                        chartConnections.target = series;
-                    axisYConnections.target = series.axisY;
+                        legendConnections.target = series.legend;
+                        axisXConnections.target = series.axisX;
+                        axisYConnections.target = series.axisY;
+                    } else {
+                        legendConnections.target = null;
+                        axisXConnections.target = null;
+                        axisYConnections.target = null;
+                    }
                 }
                 Connections {
-                    target: series
+                    id: chartConnections
-                    ignoreUnknownSignals: true
+                    target: null
                     onVisibleChanged:           console.log("chart.onVisibleChanged: " + series.visible);
-                    onThemeChanged:             console.log("chart.onThemeChanged: " + series.theme);
-                    onLegendChanged:            console.log("chart.onLegendChanged: " + series.legend);
-                    onAnimationOptionsChanged:  console.log("chart.onAnimationOptionsChanged: " + series.animationOptions);
                     onTitleColorChanged:        console.log("chart.onTitleColorChanged: " + series.titleColor);
                     onBackgroundColorChanged:   console.log("chart.onBackgroundColorChanged: " + series.backgroundColor);
                     onDropShadowEnabledChanged: console.log("chart.onDropShadowEnabledChanged: " + enabled);
                 Connections {
                     id: legendConnections
-                    ignoreUnknownSignals: true
+                    target: null
-                    onAlignmentChanged:         console.log("legend.onAlignmentChanged: " + alignment);
                     onVisibleChanged:           console.log("legend.onVisibleChanged: " + series.legend.visible);
                     onBackgroundVisibleChanged: console.log("legend.onBackgroundVisibleChanged: " + visible);
                     onColorChanged:             console.log("legend.onColorChanged: " + color);
                 Connections {
                     id: axisXConnections
-                    ignoreUnknownSignals: true
+                    target: null
                     onColorChanged:                 console.log("axisX.onColorChanged: " + color);
                     onLabelsVisibleChanged:         console.log("axisX.onLabelsVisibleChanged: " + visible);
                     onLabelsColorChanged:           console.log("axisX.onLabelsColorChanged: " + color);
-                    onLabelsAngleChanged:           console.log("axisX.onLabelsAngleChanged: " + angle);
                     onVisibleChanged:               console.log("axisX.onVisibleChanged: " + visible);
                     onGridVisibleChanged:           console.log("axisX.onGridVisibleChanged: " + visible);
                     onShadesVisibleChanged:         console.log("axisX.onShadesVisibleChanged: " + visible);
                     onShadesBorderColorChanged:     console.log("axisX.onShadesBorderColorChanged: " + color);
                     onMinChanged:                   console.log("axisX.onMinChanged: " + min);
                     onMaxChanged:                   console.log("axisX.onMaxChanged: " + max);
-                    onTicksCountChanged:            console.log("axisX.onTicksCountChanged: " + count);
-                    onNiceNumbersEnabledChanged:    console.log("axisX.onNiceNumbersEnabledChanged: " + enabled);
                 }
                 Connections {
                     id: axisYConnections
-                    ignoreUnknownSignals: true
+                    target: null
                     onColorChanged:                 console.log("axisY.onColorChanged: " + color);
                     onLabelsVisibleChanged:         console.log("axisY.onLabelsVisibleChanged: " + visible);
                     onLabelsColorChanged:           console.log("axisY.onLabelsColorChanged: " + color);
-                    onLabelsAngleChanged:           console.log("axisY.onLabelsAngleChanged: " + angle);
                     onVisibleChanged:               console.log("axisY.onVisibleChanged: " + visible);
                     onGridVisibleChanged:           console.log("axisY.onGridVisibleChanged: " + visible);
                     onShadesVisibleChanged:         console.log("axisY.onShadesVisibleChanged: " + visible);
                     onShadesBorderColorChanged:     console.log("axisY.onShadesBorderColorChanged: " + color);
                     onMinChanged:                   console.log("axisY.onMinChanged: " + min);
                     onMaxChanged:                   console.log("axisY.onMaxChanged: " + max);
-                    onTicksCountChanged:            console.log("axisY.onTicksCountChanged: " + count);
-                    onNiceNumbersEnabledChanged:    console.log("axisY.onNiceNumbersEnabledChanged: " + enabled);
                 }
                 Button {

tests/qmlchartproperties/qml/qmlchartproperties/GroupedBarChart.qml +1 0

                 GroupedBarSeries {
                     id: daSeries
+                    name: "bar"
                     BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6] }
                     BarSet { label: "Susan"; values: [5, 1, 2, 4, 1, 7] }
                     BarSet { label: "James"; values: [3, 5, 8, 13, 5, 8] }

tests/qmlchartproperties/qml/qmlchartproperties/LineEditor.qml +6 -3

                 property variant series
                 onSeriesChanged: {
-                    seriesConnections.target = series;
+                    if (series && (series.name == "line 1" || series.name == "spline 1")) {
+                        seriesConnections.target = series;
+                    } else {
+                        seriesConnections.target = null;
+                    }
                 }
                 Connections {
                     id: seriesConnections
-                    ignoreUnknownSignals: true
+                    target: null
                     onNameChanged:              console.log("series.onNameChanged: " + series.name);
                     onVisibleChanged:           console.log("series.onVisibleChanged: " + series.visible);
-                    onPointsVisibleChanged:     console.log("series.onPointsVisibleChanged: " + series.pointsVisible);
                     onColorChanged:             console.log("series.onColorChanged: " + series.color);
                     onCountChanged:             console.log("series.onCountChanged: " + series.count);
                 }

tests/qmlchartproperties/qml/qmlchartproperties/PercentBarChart.qml +1 0

                 PercentBarSeries {
                     id: daSeries
+                    name: "bar"
                     BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6] }
                     BarSet { label: "Susan"; values: [5, 1, 2, 4, 1, 7] }
                     BarSet { label: "James"; values: [3, 5, 8, 13, 5, 8] }

tests/qmlchartproperties/qml/qmlchartproperties/PieChart.qml +1 0

                 PieSeries {
                     id: pieSeries
+                    name: "pie"
                     PieSlice { id: daSlice; label: "slice1"; value: 11 }
                     PieSlice { label: "slice2"; value: 22 }
                     PieSlice { label: "slice3"; value: 33 }

tests/qmlchartproperties/qml/qmlchartproperties/PieEditor.qml +9 -4

                 property variant series
                 onSeriesChanged: {
-                    seriesConnections.target = series;
+                    if (series && series.name == "pie") {
-                    sliceConnections.target = series.at(0);
+                        seriesConnections.target = series;
+                        sliceConnections.target = series.at(0);
+                    } else {
+                        seriesConnections.target = null;
+                        sliceConnections.target = null;
+                    }
                 }
                 Connections {
                     id: seriesConnections
-                    ignoreUnknownSignals: true
+                    target: null
                     onVisibleChanged:           console.log("series.onVisibleChanged: " + series.visible);
                     onHorizontalPositionChanged:console.log("series.onHorizontalPositionChanged: " + series.horizontalPosition);
                     onVerticalPositionChanged:  console.log("series.onVerticalPositionChanged: " + series.verticalPosition);
                 Connections {
                     id: sliceConnections
-                    ignoreUnknownSignals: true
+                    target: null
                     onValueChanged:             console.log("slice.onValueChanged: " + series.at(0).value);
                     onLabelVisibleChanged:      console.log("slice.onLabelVisibleChanged: " + series.at(0).labelVisible);
                     onLabelPositionChanged:     console.log("slice.onLabelPositionChanged: " + series.at(0).labelPosition);

tests/qmlchartproperties/qml/qmlchartproperties/ScatterEditor.qml +6 -5

                 property variant series
                 onSeriesChanged: {
-                    seriesConnections.target = series;
+                    if (series && series.name == "scatter 1") {
+                        seriesConnections.target = series;
+                    } else {
+                        seriesConnections.target = null;
+                    }
                 }
                 Connections {
                     id: seriesConnections
-                    ignoreUnknownSignals: true
+                    target: null
                     onNameChanged:              console.log("series.onNameChanged: " + series.name);
                     onVisibleChanged:           console.log("series.onVisibleChanged: " + series.visible);
-                    onPointsVisibleChanged:     console.log("series.onPointsVisibleChanged: " + series.pointsVisible);
                     onColorChanged:             console.log("series.onColorChanged: " + series.color);
                     onBorderColorChanged:       console.log("series.onBorderColorChanged: " + series.borderColor);
                     onCountChanged:             console.log("series.onCountChanged: " + series.count);
-                    onMarkerSizeChanged:        console.log("series.onMarkerSizeChanged: " + series.markerSize);
-                    onMarkerShapeChanged:       console.log("series.onMarkerShapeChanged: " + series.markerShape);
                 }
                 Button {

tests/qmlchartproperties/qml/qmlchartproperties/StackedBarChart.qml +1 0

                 StackedBarSeries {
                     id: daSeries
+                    name: "bar"
                     BarSet { label: "Bob"; values: [2, 2, 3, 4, 5, 6] }
                     BarSet { label: "Susan"; values: [5, 1, 2, 4, 1, 7] }
                     BarSet { label: "James"; values: [3, 5, 8, 13, 5, 8] }

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