HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2531:baa389f1ece6

Documentation and fix for box specific pen color...

Mika Salmela -

r2531:baa389f1ece6

parent child

Context file:

r2531:baa389f1ece6

Collapse all files

examples/boxplotchart/main.cpp +1 -1

             //![3]
                 QChart *chart = new QChart();
                 chart->addSeries(series);
-                chart->setTitle("Cargotec's share deviation 2012")
+                chart->setTitle("Cargotec's share deviation in 2012");
                 chart->setAnimationOptions(QChart::SeriesAnimations);
             //![3]

examples/qmlboxplot/qml/qmlboxplot/box.qml +6 0

                 id: myNewBox
                 label: "Foo"
                 values: [5, 6, 7, 8, 9]
+                onPenChanged: {
+                    console.log("onPenChanged")
+                }
+                onColorChanged: {
+                    console.log("onColorChanged")
+                }
                 Component.onCompleted: {
                     console.log("BoxSet completed")
                 }

examples/qmlboxplot/qml/qmlboxplot/main.qml +15 -2

                     BoxSet { values: [3, 4, 4.4, 6, 7] }
                     BoxSet { label: "Tok"; values: [5, 6, 7.5, 8, 12] }
                     BoxSet { label: "Kol"; values: [2, 5, 5.7, 8, 9] }
-                    BoxSet { label: "Nel"; values: [5, 6, 6.8, 7, 8] }
+                    BoxSet { id: nelBox
-                    BoxSet { label: "Vii"; values: [4, 5, 5.2, 6, 7] }
+                             label: "Nel"
+                             values: [5, 6, 6.8, 7, 8];
+                             onColorChanged: {
+                                console.log("onColorChanged")
+                             }
+                    }
+                    BoxSet { label: "Vii"; values: [4, 5, 5.2, 6, 7]; color: "#aa0000" }
+                    //onClicked: console.log("series onClicked " + boxset.median)
+                    //onHovered: console.log("series onHovered " + status + "median = " + boxset.median)
+                    onCountChanged: console.log("onCountChanged")
                 }
             //![2]
                     MouseArea {
                         anchors.fill: parent
                         onClicked: {
+                            nelBox.color = "#0000aa"
                             var com = Qt.createComponent("box.qml")
                             if (com.status == Component.Ready) {
                                 var obj = com.createObject(moreButton)
                                 obj.label = "mik"
                                 console.log("label = " + obj.label)
                                 plotSeries.append(obj)
+                                obj.color = "#aa0000"
+                                console.log("color = " + obj.color)
+                                obj.borderColor = "#00aa00"
                             } else {
                                 console.log(com.errorString())
                             }

plugins/declarative/declarativeboxplotseries.cpp +12 -2

                 }
             }
-            // Declarative box&whiskers series =====================================================
+            // =====================================================
             DeclarativeBoxPlotSeries::DeclarativeBoxPlotSeries(QDeclarativeItem *parent) :
                 QBoxPlotSeries(parent),
                 connect(m_axes, SIGNAL(axisYChanged(QAbstractAxis*)), this, SIGNAL(axisYChanged(QAbstractAxis*)));
                 connect(m_axes, SIGNAL(axisXTopChanged(QAbstractAxis*)), this, SIGNAL(axisXTopChanged(QAbstractAxis*)));
                 connect(m_axes, SIGNAL(axisYRightChanged(QAbstractAxis*)), this, SIGNAL(axisYRightChanged(QAbstractAxis*)));
+                connect(this, SIGNAL(hovered(bool, QBoxSet*)), this, SLOT(onHovered(bool, QBoxSet*)));
+                connect(this, SIGNAL(clicked(QBoxSet*)), this, SLOT(onClicked(QBoxSet*)));
             }
             void DeclarativeBoxPlotSeries::classBegin()
             DeclarativeBoxSet *DeclarativeBoxPlotSeries::at(int index)
             {
-                qDebug() << "DeclarativeBoxPlotSeries::at";
                 QList<QBoxSet *> setList = boxSets();
                 if (index >= 0 && index < setList.count())
                     return qobject_cast<DeclarativeBoxSet *>(setList[index]);
                 return 0;
             }
+            void DeclarativeBoxPlotSeries::onHovered(bool status, QBoxSet *boxset)
+            {
+                emit hovered(status, qobject_cast<DeclarativeBoxSet *>(boxset));
+            }
+            void DeclarativeBoxPlotSeries::onClicked(QBoxSet *boxset)
+            {
+                emit clicked(qobject_cast<DeclarativeBoxSet *>(boxset));
+            }
             #include "moc_declarativeboxplotseries.cpp"

plugins/declarative/declarativeboxplotseries.h +4 0

                 Q_REVISION(1) void axisYChanged(QAbstractAxis *axis);
                 Q_REVISION(2) void axisXTopChanged(QAbstractAxis *axis);
                 Q_REVISION(2) void axisYRightChanged(QAbstractAxis *axis);
+                void clicked(DeclarativeBoxSet *boxset);
+                void hovered(bool status, DeclarativeBoxSet *boxset);
             public Q_SLOTS:
                 static void appendSeriesChildren(QDeclarativeListProperty<QObject> *list, QObject *element);
+                void onHovered(bool status, QBoxSet *boxset);
+                void onClicked(QBoxSet *boxset);
             public:
                 DeclarativeAxes *m_axes;

src/boxplotchart/boxplotchartitem.cpp 0 -2

             void BoxPlotChartItem::handleUpdatedBars()
             {
-                qDebug() << "BoxPlotChartItem::handleUpdatedBars()";
                 foreach (BoxWhiskers *item, m_boxTable.values()) {
                     item->setBrush(m_series->brush());
                     item->setPen(m_series->pen());

src/boxplotchart/qboxplotseries.cpp +47 -4

@@ -42,8 +42,8 QTCOMMERCIALCHART_BEGIN_NAMESPACE
42	\mainclass	42	\mainclass
43		43
44	QBoxPlotSeries represents a series of data shown as box-and-whisker bars. The purpose of this class is to act as	44	QBoxPlotSeries represents a series of data shown as box-and-whisker bars. The purpose of this class is to act as
45	a container for single box-and-whisker items. Each item is drawn to own slot. If chart includes multiple ~~QBoxPlotSer~~ies	45	a container for single box-and-whisker items. Each item is drawn to own slot. If chart includes multiple instances of
46	items with the same index are drawn to same slot.	46	QBoxPlotSeries then box-and-whiskers items with the same index are drawn to same slot.
47		47
48	See the \l {Box and Whiskers Example} {box-and-whiskers chart example} to learn how to create a box-and-whiskers chart.	48	See the \l {Box and Whiskers Example} {box-and-whiskers chart example} to learn how to create a box-and-whiskers chart.
49	\image examples_boxplotchart.png	49	\image examples_boxplotchart.png
@@ -53,12 +53,16 QTCOMMERCIALCHART_BEGIN_NAMESPACE
53		53
54	/*!	54	/*!
55	\qmlclass BoxPlotSeries QBoxPlotSeries	55	\qmlclass BoxPlotSeries QBoxPlotSeries
56	\inherits Abstract~~Bar~~Series	56	\inherits QAbstractSeries
		57
		58	BoxPlotSeries represents a series of data shown as box-and-whisker bars. The purpose of this class is to act as
		59	a container for single box-and-whisker items. Each item is drawn to own slot. If chart includes multiple instances of
		60	BoxPlotSeries then box-and-whiskers items with the same index are drawn to same slot.
57		61
58	The following QML shows how to create a simple box-and-whiskers chart:	62	The following QML shows how to create a simple box-and-whiskers chart:
59	\snippet ../examples/qmlboxplot/qml/qmlboxplot/main.qml 1	63	\snippet ../examples/qmlboxplot/qml/qmlboxplot/main.qml 1
60	\beginfloatleft	64	\beginfloatleft
61	\image demos_qmlchart7.png	65	\image TODO_CREATE_IMAGE.png
62	\endfloat	66	\endfloat
63	\clearfloat	67	\clearfloat
64	*/	68	*/
@@ -87,6 +91,45 QTCOMMERCIALCHART_BEGIN_NAMESPACE
87	\fn QBoxPlotSeries::countChanged()	91	\fn QBoxPlotSeries::countChanged()
88	\brief Signal is emitted when there is change in count of box-and-whiskers items in the series.	92	\brief Signal is emitted when there is change in count of box-and-whiskers items in the series.
89	*/	93	*/
		94	/*!
		95	\qmlmethod BoxPlotSeries::append(const QString label, QVariantList values)
		96	Appends a new box-and-whiskers set with \a label and \a values to the series.
		97	*/
		98	/*!
		99	\qmlmethod BoxPlotSeries::append(BoxSet *box)
		100	Appends the \a box to the series.
		101	*/
		102	/*!
		103	\qmlmethod BoxPlotSeries::insert(int index, const QString label, QVariantList values)
		104	Inserts a new box-and-whiskers set with \a label and \a values at the \a index position.
		105	*/
		106	/*!
		107	\qmlmethod BoxPlotSeries::remove(QBoxSet *boxset)
		108	Removes the \a boxset from the series.
		109	*/
		110	/*!
		111	\qmlmethod BoxPlotSeries::clear()
		112	Removes all boxsets from the series. Deletes removed sets.
		113	*/
		114
		115	/*!
		116	\qmlsignal BoxPlotSeries::onClicked(BoxSet boxset);
		117	Signal is emitted when the user clicks the \a boxset on the chart.
		118	*/
		119	/*!
		120	\qmlsignal BoxPlotSeries::onHovered(bool status, BoxSet boxset);
		121	Signal is emitted when there is change in hover \a status over \a boxset.
		122	*/
		123	/*!
		124	\qmlsignal BoxPlotSeries::onCountChanged();
		125	Signal is emitted when there is change in count of box-and-whiskers items in the series.
		126	*/
		127	/*
		128	void boxsetsAdded(QList<QBoxSet *> sets);
		129	*/
		130	/*
		131	void boxsetsRemoved(QList<QBoxSet *> sets);
		132	*/
90		133
91	/*!	134	/*!
92	Constructs empty QBoxPlotSeries.	135	Constructs empty QBoxPlotSeries.

src/boxplotchart/qboxset.cpp +84 -8

                 QBoxSet represents one box-and-whiskers item. It takes fives values to create a graphical representation
                 of range and three medians. There's two type of methods to give the values. The first one is with constructor
-                or append type of methods (append and operator <<). In these the values have to be given in order lower extreme,
+                or append type of methods (append and operator <<). The values have to be given in order lower extreme,
                 lower quartile, median, upper quartile and upper extre. Second method is to create an empty QBoxSet instance and
-                give the values using own methods.
+                give the values using value specific methods.
                 \mainclass
                 BoxSet represents one box-and-whiskers item. It takes fives values to create a graphical representation
                 of range and three medians. There's two type of methods to give the values. The first one is with constructor
-                or append type of methods (append and operator <<). In these the values have to be given in order lower extreme,
+                or with append method. In these the values have to be given in order lower extreme, lower quartile, median,
-                lower quartile, median, upper quartile and upper extre. Second method is to create an empty BoxSet instance and
+                upper quartile and upper extre. Second method is to create an empty QBoxSet instance and
-                give the values using own methods.
+                give the values using value specific methods.
                 \sa BoxPlotSeries
             */
+            /*!
+                \qmlproperty string BoxSet::label
+                Defines the label of the boxSet.
+            */
+            /*!
+                \qmlproperty int BoxSet::count
+                The count of values on the box-and-whiskers set
+            */
             /*!
                 \property QBoxSet::pen
                 \property QBoxSet::color
                 The fill (brush) color of the box-and-whiskers set.
             */
+            /*!
+                \qmlproperty color BoxSet::color
+                Defines the fill (brush) color of the box-and-whiskers set.
+            */
             /*!
                 \property QBoxSet::borderColor
                 The line (pen) color of the box-and-whiskers set.
             */
+            /*!
+                \qmlproperty color BoxSet::borderColor
+                Defines the outline color of the box-and-whiskers set.
+            */
+            /*!
+                \qmlproperty qreal BoxSet::lowerExtreme
+                The lower extreme value of the box-and-whiskers set
+            */
+            /*!
+                \qmlproperty qreal BoxSet::lowerQuartile
+                The lower quartile value of the box-and-whiskers set
+            */
+            /*!
+                \qmlproperty qreal BoxSet::median
+                The median value of the box-and-whiskers set
+            */
+            /*!
+                \qmlproperty qreal BoxSet::upperQuartile
+                The upper quartile value of the box-and-whiskers set
+            */
+            /*!
+                \qmlproperty qreal BoxSet::upperExtreme
+                The upper extreme value of the box-and-whiskers set
+            */
             /*!
                 \fn void QBoxSet::clicked()
                 The signal is emitted if the user clicks with a mouse on top of box-and-whisker item.
             */
+            /*!
+                \qmlsignal BoxSet::onClicked()
+                This signal is emitted when the user clicks with a mouse on top of box-and-whisker item.
+            */
             /*!
                 \fn void QBoxSet::hovered(bool status)
                 The signal is emitted if mouse is hovered on top of box-and-whisker item.
                 Parameter \a status is true, if mouse entered on top of item, false if mouse left from top of item.
             */
+            /*!
+                \qmlsignal BoxSet::onHovered(bool status)
+                The signal is emitted if mouse is hovered on top of box-and-whisker item.
+                Parameter \a status is true, if mouse entered on top of item, false if mouse left from top of item.
+            */
             /*!
                 \fn void QBoxSet::penChanged()
                 This signal is emitted when the pen of the box-and-whisker item has changed.
                 \sa pen
             */
+            /*!
+                \qmlsignal BoxSet::onPenChanged()
+                This signal is emitted when the pen of the box-and-whisker item has changed.
+            */
             /*!
                 \fn void QBoxSet::brushChanged()
                 This signal is emitted when the brush of the box-and-whisker item has changed.
                 \sa brush
             */
+            /*!
+                \qmlsignal BoxSet::onBrushChanged()
+                This signal is emitted when the brush of the box-and-whisker item has changed.
+            */
             /*!
                 \fn void QBoxSet::colorChanged(QColor)
                 This signal is emitted when the fill (brush) color of the box-and-whisker item has changed to \a color.
             */
+            /*!
+                \qmlsignal BoxSet::onColorChanged(QColor color)
+                This signal is emitted when the fill (brush) color of the box-and-whisker item has changed to \a color.
+            */
             /*!
                 \fn void QBoxSet::valuesAdded(int index, int count)
                 Parameter \a count is the number of inserted values.
                 \sa append(), insert()
             */
+            /*!
+                \qmlsignal BoxSet::onValuesAdded(int index, int count)
+                This signal is emitted when new values have been added to the box-and-whisker item.
+                Parameter \a index indicates the position of the first inserted value.
+                Parameter \a count is the number of inserted values.
+            */
             /*!
                 \fn void QBoxSet::valueChanged(int index)
                 Parameter \a index indicates the position of the modified value.
                 \sa at()
             */
+            /*!
+                \qmlsignal BoxSet::onValueChanged(int index)
+                This signal is emitted values the value in the box-and-whisker item has been modified.
+                Parameter \a index indicates the position of the modified value.
+            */
             /*!
                 \fn void QBoxSet::borderColorChanged(QColor)
                 This signal is emitted when the line (pen) color of the box-and-whisker item has changed to \a color.
             */
+            /*!
+                \qmlsignal BoxSet::onBorderColorChanged(QColor color)
+                This signal is emitted when the line (pen) color of the box-and-whisker item has changed to \a color.
+            */
             /*!
                 Constructs QBoxSet with optional \a label and parent of \a parent
                 QPen p = pen();
                 if (p.color() != color) {
                     p.setColor(color);
+                    p.setStyle(Qt::SolidLine);
                     setPen(p);
                     emit borderColorChanged(color);
                 }

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