Adding missing QML series API line/border properties

8 files changed, 152 insertions, 0 deletions

diff --git a/plugins/declarative/declarativebarseries.cpp b/plugins/declarative/declarativebarseries.cpp
index 7e32cab5..28636e6b 100644
--- a/plugins/declarative/declarativebarseries.cpp
+++ b/plugins/declarative/declarativebarseries.cpp
@@ -39,6 +39,21 @@ void DeclarativeBarSet::handleCountChanged(int index, int count)
     emit countChanged(QBarSet::count());
 }
 
+qreal DeclarativeBarSet::borderWidth() const
+{
+    return pen().widthF();
+}
+
+void DeclarativeBarSet::setBorderWidth(qreal width)
+{
+    if (width != pen().widthF()) {
+        QPen p = pen();
+        p.setWidthF(width);
+        setPen(p);
+        emit borderWidthChanged(width);
+    }
+}
+
 QVariantList DeclarativeBarSet::values()
 {
     QVariantList values;
diff --git a/plugins/declarative/declarativebarseries.h b/plugins/declarative/declarativebarseries.h
index 3ed8adc2..62060895 100644
--- a/plugins/declarative/declarativebarseries.h
+++ b/plugins/declarative/declarativebarseries.h
@@ -39,12 +39,15 @@ class DeclarativeBarSet : public QBarSet
 {
     Q_OBJECT
     Q_PROPERTY(QVariantList values READ values WRITE setValues)
+    Q_PROPERTY(qreal borderWidth READ borderWidth WRITE setBorderWidth NOTIFY borderWidthChanged REVISION 1)
     Q_PROPERTY(int count READ count NOTIFY countChanged)
 
 public:
     explicit DeclarativeBarSet(QObject *parent = 0);
     QVariantList values();
     void setValues(QVariantList values);
+    qreal borderWidth() const;
+    void setBorderWidth(qreal borderWidth);
 
 public: // From QBarSet
     Q_INVOKABLE void append(qreal value) { QBarSet::append(value); }
@@ -54,6 +57,7 @@ public: // From QBarSet
 
 Q_SIGNALS:
     void countChanged(int count);
+    Q_REVISION(1) void borderWidthChanged(qreal width);
 
 private Q_SLOTS:
     void handleCountChanged(int index, int count);
diff --git a/plugins/declarative/declarativelineseries.cpp b/plugins/declarative/declarativelineseries.cpp
index cfca1f0f..c695c678 100644
--- a/plugins/declarative/declarativelineseries.cpp
+++ b/plugins/declarative/declarativelineseries.cpp
@@ -37,6 +37,51 @@ void DeclarativeLineSeries::handleCountChanged(int index)
     emit countChanged(points().count());
 }
 
+qreal DeclarativeLineSeries::width() const
+{
+    return pen().widthF();
+}
+
+void DeclarativeLineSeries::setWidth(qreal width)
+{
+    if (width != pen().widthF()) {
+        QPen p = pen();
+        p.setWidthF(width);
+        setPen(p);
+        emit widthChanged(width);
+    }
+}
+
+Qt::PenStyle DeclarativeLineSeries::style() const
+{
+    return pen().style();
+}
+
+void DeclarativeLineSeries::setStyle(Qt::PenStyle style)
+{
+    if (style != pen().style()) {
+        QPen p = pen();
+        p.setStyle(style);
+        setPen(p);
+        emit styleChanged(style);
+    }
+}
+
+Qt::PenCapStyle DeclarativeLineSeries::capStyle() const
+{
+    return pen().capStyle();
+}
+
+void DeclarativeLineSeries::setCapStyle(Qt::PenCapStyle capStyle)
+{
+    if (capStyle != pen().capStyle()) {
+        QPen p = pen();
+        p.setCapStyle(capStyle);
+        setPen(p);
+        emit capStyleChanged(capStyle);
+    }
+}
+
 QDeclarativeListProperty<QObject> DeclarativeLineSeries::declarativeChildren()
 {
     return QDeclarativeListProperty<QObject>(this, 0, &appendDeclarativeChildren);
diff --git a/plugins/declarative/declarativelineseries.h b/plugins/declarative/declarativelineseries.h
index 29292d25..698047fb 100644
--- a/plugins/declarative/declarativelineseries.h
+++ b/plugins/declarative/declarativelineseries.h
@@ -35,6 +35,9 @@ class DeclarativeLineSeries : public QLineSeries, public DeclarativeXySeries, pu
     Q_PROPERTY(int count READ count NOTIFY countChanged)
     Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
     Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
+    Q_PROPERTY(qreal width READ width WRITE setWidth NOTIFY widthChanged REVISION 1)
+    Q_PROPERTY(Qt::PenStyle style READ style WRITE setStyle NOTIFY styleChanged REVISION 1)
+    Q_PROPERTY(Qt::PenCapStyle capStyle READ capStyle WRITE setCapStyle NOTIFY capStyleChanged REVISION 1)
     Q_PROPERTY(QDeclarativeListProperty<QObject> declarativeChildren READ declarativeChildren)
     Q_CLASSINFO("DefaultProperty", "declarativeChildren")
 
@@ -45,6 +48,12 @@ public:
     void setAxisX(QAbstractAxis *axis) { m_axisX = axis; emit axisXChanged(axis); }
     QAbstractAxis *axisY() { return m_axisY; }
     void setAxisY(QAbstractAxis *axis) { m_axisY = axis; emit axisYChanged(axis); }
+    qreal width() const;
+    void setWidth(qreal width);
+    Qt::PenStyle style() const;
+    void setStyle(Qt::PenStyle style);
+    Qt::PenCapStyle capStyle() const;
+    void setCapStyle(Qt::PenCapStyle capStyle);
     QDeclarativeListProperty<QObject> declarativeChildren();
 
 public: // from QDeclarativeParserStatus
@@ -63,6 +72,9 @@ Q_SIGNALS:
     void countChanged(int count);
     Q_REVISION(1) void axisXChanged(QAbstractAxis *axis);
     Q_REVISION(1) void axisYChanged(QAbstractAxis *axis);
+    Q_REVISION(1) void widthChanged(qreal width);
+    Q_REVISION(1) void styleChanged(Qt::PenStyle style);
+    Q_REVISION(1) void capStyleChanged(Qt::PenCapStyle capStyle);
 
 public Q_SLOTS:
     static void appendDeclarativeChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
diff --git a/plugins/declarative/declarativescatterseries.cpp b/plugins/declarative/declarativescatterseries.cpp
index c8ed47d0..2e159f4c 100644
--- a/plugins/declarative/declarativescatterseries.cpp
+++ b/plugins/declarative/declarativescatterseries.cpp
@@ -37,6 +37,21 @@ void DeclarativeScatterSeries::handleCountChanged(int index)
     emit countChanged(QScatterSeries::count());
 }
 
+qreal DeclarativeScatterSeries::borderWidth() const
+{
+    return pen().widthF();
+}
+
+void DeclarativeScatterSeries::setBorderWidth(qreal width)
+{
+    if (width != pen().widthF()) {
+        QPen p = pen();
+        p.setWidthF(width);
+        setPen(p);
+        emit borderWidthChanged(width);
+    }
+}
+
 QDeclarativeListProperty<QObject> DeclarativeScatterSeries::declarativeChildren()
 {
     return QDeclarativeListProperty<QObject>(this, 0, &appendDeclarativeChildren);
diff --git a/plugins/declarative/declarativescatterseries.h b/plugins/declarative/declarativescatterseries.h
index d56e9543..ea28ecbe 100644
--- a/plugins/declarative/declarativescatterseries.h
+++ b/plugins/declarative/declarativescatterseries.h
@@ -35,6 +35,7 @@ class DeclarativeScatterSeries : public QScatterSeries, public DeclarativeXySeri
     Q_PROPERTY(int count READ count NOTIFY countChanged)
     Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
     Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
+    Q_PROPERTY(qreal borderWidth READ borderWidth WRITE setBorderWidth NOTIFY borderWidthChanged REVISION 1)
     Q_PROPERTY(QDeclarativeListProperty<QObject> declarativeChildren READ declarativeChildren)
     Q_CLASSINFO("DefaultProperty", "declarativeChildren")
 
@@ -45,6 +46,8 @@ public:
     void setAxisX(QAbstractAxis *axis) { m_axisX = axis; emit axisXChanged(axis); }
     QAbstractAxis *axisY() { return m_axisY; }
     void setAxisY(QAbstractAxis *axis) { m_axisY = axis; emit axisYChanged(axis); }
+    qreal borderWidth() const;
+    void setBorderWidth(qreal borderWidth);
     QDeclarativeListProperty<QObject> declarativeChildren();
 
 public: // from QDeclarativeParserStatus
@@ -63,6 +66,7 @@ Q_SIGNALS:
     void countChanged(int count);
     Q_REVISION(1) void axisXChanged(QAbstractAxis *axis);
     Q_REVISION(1) void axisYChanged(QAbstractAxis *axis);
+    Q_REVISION(1) void borderWidthChanged(qreal width);
 
 public Q_SLOTS:
     static void appendDeclarativeChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
diff --git a/plugins/declarative/declarativesplineseries.cpp b/plugins/declarative/declarativesplineseries.cpp
index 8ff8834b..ebe14b15 100644
--- a/plugins/declarative/declarativesplineseries.cpp
+++ b/plugins/declarative/declarativesplineseries.cpp
@@ -37,6 +37,51 @@ void DeclarativeSplineSeries::handleCountChanged(int index)
     emit countChanged(points().count());
 }
 
+qreal DeclarativeSplineSeries::width() const
+{
+    return pen().widthF();
+}
+
+void DeclarativeSplineSeries::setWidth(qreal width)
+{
+    if (width != pen().widthF()) {
+        QPen p = pen();
+        p.setWidthF(width);
+        setPen(p);
+        emit widthChanged(width);
+    }
+}
+
+Qt::PenStyle DeclarativeSplineSeries::style() const
+{
+    return pen().style();
+}
+
+void DeclarativeSplineSeries::setStyle(Qt::PenStyle style)
+{
+    if (style != pen().style()) {
+        QPen p = pen();
+        p.setStyle(style);
+        setPen(p);
+        emit styleChanged(style);
+    }
+}
+
+Qt::PenCapStyle DeclarativeSplineSeries::capStyle() const
+{
+    return pen().capStyle();
+}
+
+void DeclarativeSplineSeries::setCapStyle(Qt::PenCapStyle capStyle)
+{
+    if (capStyle != pen().capStyle()) {
+        QPen p = pen();
+        p.setCapStyle(capStyle);
+        setPen(p);
+        emit capStyleChanged(capStyle);
+    }
+}
+
 QDeclarativeListProperty<QObject> DeclarativeSplineSeries::declarativeChildren()
 {
     return QDeclarativeListProperty<QObject>(this, 0, &appendDeclarativeChildren);
diff --git a/plugins/declarative/declarativesplineseries.h b/plugins/declarative/declarativesplineseries.h
index 478e1c7c..9ac5b7a5 100644
--- a/plugins/declarative/declarativesplineseries.h
+++ b/plugins/declarative/declarativesplineseries.h
@@ -35,6 +35,9 @@ class DeclarativeSplineSeries : public QSplineSeries, public DeclarativeXySeries
     Q_PROPERTY(int count READ count NOTIFY countChanged)
     Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
     Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
+    Q_PROPERTY(qreal width READ width WRITE setWidth NOTIFY widthChanged REVISION 1)
+    Q_PROPERTY(Qt::PenStyle style READ style WRITE setStyle NOTIFY styleChanged REVISION 1)
+    Q_PROPERTY(Qt::PenCapStyle capStyle READ capStyle WRITE setCapStyle NOTIFY capStyleChanged REVISION 1)
     Q_PROPERTY(QDeclarativeListProperty<QObject> declarativeChildren READ declarativeChildren)
     Q_CLASSINFO("DefaultProperty", "declarativeChildren")
 
@@ -45,6 +48,12 @@ public:
     void setAxisX(QAbstractAxis *axis) { m_axisX = axis; emit axisXChanged(axis); }
     QAbstractAxis *axisY() { return m_axisY; }
     void setAxisY(QAbstractAxis *axis) { m_axisY = axis; emit axisYChanged(axis); }
+    qreal width() const;
+    void setWidth(qreal width);
+    Qt::PenStyle style() const;
+    void setStyle(Qt::PenStyle style);
+    Qt::PenCapStyle capStyle() const;
+    void setCapStyle(Qt::PenCapStyle capStyle);
     QDeclarativeListProperty<QObject> declarativeChildren();
 
 public: // from QDeclarativeParserStatus
@@ -63,6 +72,9 @@ Q_SIGNALS:
     void countChanged(int count);
     Q_REVISION(1) void axisXChanged(QAbstractAxis *axis);
     Q_REVISION(1) void axisYChanged(QAbstractAxis *axis);
+    Q_REVISION(1) void widthChanged(qreal width);
+    Q_REVISION(1) void styleChanged(Qt::PenStyle style);
+    Q_REVISION(1) void capStyleChanged(Qt::PenCapStyle capStyle);
 
 public Q_SLOTS:
     static void appendDeclarativeChildren(QDeclarativeListProperty<QObject> *list, QObject *element);