HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1462:62d898329cbd

Minor modifications to properties of abstract, area and bar series

Tero Ahola -

r1462:62d898329cbd

parent child

Context file:

r1462:62d898329cbd

Collapse all files

examples/presenterchart/chartview.cpp +1 -1

             m_index(-1),m_chart(chart)
             {
                 m_chart->setTitle("Charts presenter");
-                m_chart->setBackgroundDropShadowEnabled(false);
+                m_chart->setDropShadowEnabled(false);
                 QObject::connect(&m_timer,SIGNAL(timeout()),this,SLOT(handleTimeout()));
                 m_timer.setInterval(3000);

examples/scatterchart/chartview.cpp +1 -1

                 chart()->addSeries(series0);
                 chart()->addSeries(series1);
                 chart()->setTitle("Simple scatterchart example");
-                chart()->setBackgroundDropShadowEnabled(false);
+                chart()->setDropShadowEnabled(false);
                 //![3]
             }

plugins/declarative/declarativechart.cpp +44 -35

@@ -42,6 +42,44 QTCOMMERCIALCHART_BEGIN_NAMESPACE
42	\clearfloat	42	\clearfloat
43	*/	43	*/
44		44
		45	/*!
		46	\qmlproperty Theme ChartView::theme
		47	Theme defines the visual appearance of the chart, including for example colors, fonts, line
		48	widths and chart background.
		49	*/
		50
		51	/*!
		52	\qmlproperty Animation ChartView::animation
		53	Animation configuration of the chart. One of ChartView.NoAnimation, ChartView.GridAxisAnimations,
		54	ChartView.SeriesAnimations or ChartView.AllAnimations.
		55	*/
		56
		57	/*!
		58	\qmlproperty string ChartView::title
		59	The title of the chart, shown on top of the chart.
		60	*/
		61
		62	/*!
		63	\qmlproperty string ChartView::titleColor
		64	The color of the title text.
		65	*/
		66
		67	/*!
		68	\qmlproperty Axis ChartView::axisX
		69	The x-axis of the chart.
		70	*/
		71
		72	/*!
		73	\qmlproperty Axis ChartView::axisY
		74	The default y-axis of the chart.
		75	*/
		76
		77	/*!
		78	\qmlmethod Axis ChartView::axisY(QAbstractSeries *series)
		79	The y-axis of the series. This is the same as the default y-axis of the chart, unless you have
		80	explicitly defined the series to have a non-default y-axis.
		81	*/
		82
45	DeclarativeChart::DeclarativeChart(QDeclarativeItem *parent)	83	DeclarativeChart::DeclarativeChart(QDeclarativeItem *parent)
46	: QDeclarativeItem(parent),	84	: QDeclarativeItem(parent),
47	m_chart(new QChart(this))	85	m_chart(new QChart(this))
@@ -66,15 +104,13 void DeclarativeChart::childEvent(QChildEvent *event)
66		104
67	void DeclarativeChart::componentComplete()	105	void DeclarativeChart::componentComplete()
68	{	106	{
69	// qDebug() << "DeclarativeChart::componentComplete(), maxX: " << axisX()->max();
70	foreach(QObject *child, children()) {	107	foreach(QObject *child, children()) {
71	if (qobject_cast<QAbstractSeries *>(child)) {	108	if (qobject_cast<QAbstractSeries *>(child)) {
72	// qDebug() << "DeclarativeChart::componentComplete(), add: " << child;	109	// qDebug() << "DeclarativeChart::componentComplete(), add: " << child;
		110	// TODO: how about optional y-axis?
73	m_chart->addSeries(qobject_cast<QAbstractSeries *>(child));	111	m_chart->addSeries(qobject_cast<QAbstractSeries *>(child));
74	}	112	}
75	}	113	}
76	// qDebug() << "DeclarativeChart::componentComplete(), maxX: " << axisX()->max();
77
78	QDeclarativeItem::componentComplete();	114	QDeclarativeItem::componentComplete();
79	}	115	}
80		116
@@ -150,9 +186,9 QAxis *DeclarativeChart::axisX()
150	return m_chart->axisX();	186	return m_chart->axisX();
151	}	187	}
152		188
153	QAxis *DeclarativeChart::axisY()	189	QAxis DeclarativeChart::axisY(QAbstractSeries series)
154	{	190	{
155	return m_chart->axisY();	191	return m_chart->axisY(series);
156	}	192	}
157		193
158	QLegend *DeclarativeChart::legend()	194	QLegend *DeclarativeChart::legend()
@@ -222,15 +258,15 int DeclarativeChart::count()
222		258
223	void DeclarativeChart::setDropShadowEnabled(bool enabled)	259	void DeclarativeChart::setDropShadowEnabled(bool enabled)
224	{	260	{
225	if (enabled != m_chart->is~~Background~~DropShadowEnabled()) {	261	if (enabled != m_chart->isDropShadowEnabled()) {
226	m_chart->set~~Background~~DropShadowEnabled(enabled);	262	m_chart->setDropShadowEnabled(enabled);
227	dropShadowEnabledChanged(enabled);	263	dropShadowEnabledChanged(enabled);
228	}	264	}
229	}	265	}
230		266
231	bool DeclarativeChart::dropShadowEnabled()	267	bool DeclarativeChart::dropShadowEnabled()
232	{	268	{
233	return m_chart->is~~Background~~DropShadowEnabled();	269	return m_chart->isDropShadowEnabled();
234	}	270	}
235		271
236	void DeclarativeChart::zoom(qreal factor)	272	void DeclarativeChart::zoom(qreal factor)
@@ -258,33 +294,6 void DeclarativeChart::scrollDown(qreal pixels)
258	m_chart->scroll(QPointF(0, -pixels));	294	m_chart->scroll(QPointF(0, -pixels));
259	}	295	}
260		296
261	//void DeclarativeChart::scrollLeft(qreal ticks)
262	//{
263	// m_chart->scroll(QPointF(ticksToPixels(m_chart->axisX(), ticks), 0));
264	//}
265
266	//void DeclarativeChart::scrollRight(qreal ticks)
267	//{
268	// m_chart->scroll(QPointF(-ticksToPixels(m_chart->axisX(), ticks), 0));
269	//}
270
271	//void DeclarativeChart::scrollUp(qreal ticks)
272	//{
273	// m_chart->scroll(QPointF(0, ticksToPixels(m_chart->axisY(), ticks)));
274	//}
275
276	//void DeclarativeChart::scrollDown(qreal ticks)
277	//{
278	// m_chart->scroll(QPointF(0, -ticksToPixels(m_chart->axisY(), ticks)));
279	//}
280
281	//qreal DeclarativeChart::ticksToPixels(QAxis *axis, qreal ticks)
282	//{
283	// qreal tickCount = axis->max() - axis->min();
284	// qreal tickPixels = (m_chart->size().width() - m_chart->margins().width() * 2) / tickCount;
285	// return tickPixels * ticks;
286	//}
287
288	QAbstractSeries *DeclarativeChart::series(int index)	297	QAbstractSeries *DeclarativeChart::series(int index)
289	{	298	{
290	if (index < m_chart->series().count()) {	299	if (index < m_chart->series().count()) {

plugins/declarative/declarativechart.h +1 -1

                 void setTitle(QString title);
                 QString title();
                 QAxis *axisX();
-                QAxis *axisY();
+                Q_INVOKABLE QAxis *axisY(QAbstractSeries *series = 0);
                 QLegend *legend();
                 QVariantList axisXLabels();
                 void setAxisXLabels(QVariantList list);

src/areachart/qareaseries.cpp +5 -5

             */
             /*!
-               \fn QLineSeries* QAreaSeries::upperSeries() const
+               \property QAreaSeries::upperSeries
-               \brief Returns upperSeries used to define one of area boundaries.
+               \brief The upper one of the two line series used to define area series boundaries.
             */
             /*!
-               \fn QLineSeries* QAreaSeries::lowerSeries() const
+                \property QAreaSeries::lowerSeries
-               \brief Returns lowerSeries used to define one of area boundaries. Note if QAreaSeries where counstucted wihtout a\ lowerSeries
+                The lower one of the two line series used to define are series boundaries. Note if
-                this function return Null pointer.
+                QAreaSeries was counstucted wihtout a\ lowerSeries this is null.
             */
             /*!

src/areachart/qareaseries.h +2 0

             class QTCOMMERCIALCHART_EXPORT QAreaSeries : public QAbstractSeries
             {
                 Q_OBJECT
+                Q_PROPERTY(QAbstractSeries *upperSeries READ upperSeries)
+                Q_PROPERTY(QAbstractSeries *lowerSeries READ lowerSeries)
             public:
                 explicit QAreaSeries(QObject *parent = 0);

src/barchart/barchartitem.cpp +2 -2

                 // Create new graphic items for bars
                 for (int c = 0; c < m_series->d_func()->categoryCount(); c++) {
-                    for (int s = 0; s < m_series->barsetCount(); s++) {
+                    for (int s = 0; s < m_series->count(); s++) {
                         QBarSet *set = m_series->d_func()->barsetAt(s);
                         // Bars
                 // Use temporary qreals for accuracy
                 qreal categoryCount = m_series->d_func()->categoryCount();
-                qreal setCount = m_series->barsetCount();
+                qreal setCount = m_series->count();
                 bool barsVisible = m_series->isVisible();
                 // Domain:

src/barchart/groupedbarchartitem.cpp +1 -1

                 // Use temporary qreals for accuracy
                 qreal categoryCount = m_series->d_func()->categoryCount();
-                qreal setCount = m_series->barsetCount();
+                qreal setCount = m_series->count();
                 bool barsVisible = m_series->isVisible();
                 // Domain:

src/barchart/percentbarchartitem.cpp +1 -1

                 // Use temporary qreals for accuracy
                 qreal categoryCount = m_series->d_func()->categoryCount();
-                qreal setCount = m_series->barsetCount();
+                qreal setCount = m_series->count();
                 bool barsVisible = m_series->isVisible();
                 // Domain:

src/barchart/qbarseries.cpp +7 -7

             */
             /*!
-                \fn void QBarSeries::barsetCountChanged()
+                \fn void QBarSeries::countChanged()
                 This signal is emitted when barset count has been changed, for example by append or remove.
             */
                     QList<QBarSet*> sets;
                     sets.append(set);
                     emit barsetsAdded(sets);
-                    emit barsetCountChanged();
+                    emit countChanged();
                 }
                 return success;
             }
                     QList<QBarSet*> sets;
                     sets.append(set);
                     emit barsetsRemoved(sets);
-                    emit barsetCountChanged();
+                    emit countChanged();
                 }
                 return success;
             }
                 bool success = d->append(sets);
                 if (success) {
                     emit barsetsAdded(sets);
-                    emit barsetCountChanged();
+                    emit countChanged();
                 }
                 return success;
             }
                     QList<QBarSet*> sets;
                     sets.append(set);
                     emit barsetsAdded(sets);
-                    emit barsetCountChanged();
+                    emit countChanged();
                 }
                 return success;
             }
                 bool success = d->remove(sets);
                 if (success) {
                     emit barsetsRemoved(sets);
-                    emit barsetCountChanged();
+                    emit countChanged();
                 }
             }
             /*!
                 Returns number of sets in series.
             */
-            int QBarSeries::barsetCount() const
+            int QBarSeries::count() const
             {
                 Q_D(const QBarSeries);
                 return d->m_barSets.count();

src/barchart/qbarseries.h +3 -3

             {
                 Q_OBJECT
                 Q_PROPERTY(qreal barWidth READ barWidth WRITE setBarWidth NOTIFY barWidthChanged)
-                Q_PROPERTY(int count READ barsetCount NOTIFY barsetCountChanged)
+                Q_PROPERTY(int count READ count NOTIFY countChanged)
                 Q_PROPERTY(bool labelsVisible READ isLabelsVisible WRITE setLabelsVisible NOTIFY labelsVisibleChanged)
             public:
                 bool remove(QBarSet *set);
                 bool append(QList<QBarSet* > sets);
                 bool insert(int index, QBarSet *set);
-                int barsetCount() const;
+                int count() const;
                 QList<QBarSet*> barSets() const;
                 void clear();
                 void clicked(QBarSet *barset, int index);
                 void hovered(QBarSet* barset, bool status);
                 void barWidthChanged();
-                void barsetCountChanged();
+                void countChanged();
                 void labelsVisibleChanged();
                 void barsetsAdded(QList<QBarSet*> sets);

src/barchart/stackedbarchartitem.cpp +1 -1

                 QVector<QRectF> layout;
                 // Use temporary qreals for accuracy
                 qreal categoryCount = m_series->d_func()->categoryCount();
-                qreal setCount = m_series->barsetCount();
+                qreal setCount = m_series->count();
                 bool barsVisible = m_series->isVisible();
                 // Domain:

src/charttheme.cpp +1 -1

                     chart->setBackgroundBrush(m_chartBackgroundGradient);
                 chart->setTitleFont(m_masterFont);
                 chart->setTitleBrush(m_titleBrush);
-                chart->setBackgroundDropShadowEnabled(m_backgroundDropShadowEnabled);
+                chart->setDropShadowEnabled(m_backgroundDropShadowEnabled);
             }
             void ChartTheme::decorate(QLegend *legend)

src/qabstractseries.cpp +2 -2

             */
             /*!
-                \fn QSeriesType QAbstractSeries::type() const
+                \property QAbstractSeries::type
-                \brief The type of the series.
+                The type of the series.
             */
             /*!

src/qabstractseries.h +1 0

                 Q_OBJECT
                 Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
                 Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged)
+                Q_PROPERTY(SeriesType type READ type)
                 Q_ENUMS(SeriesType)
             public:

src/qchart.cpp +2 -2

             /*!
                 Sets the background drop shadow effect state to \a enabled.
             */
-            void QChart::setBackgroundDropShadowEnabled(bool enabled)
+            void QChart::setDropShadowEnabled(bool enabled)
             {
                 d_ptr->m_presenter->createChartBackgroundItem();
                 d_ptr->m_presenter->m_backgroundItem->setDropShadowEnabled(enabled);
             /*!
                 Returns true if the drop shadow effect is enabled for the chart background.
             */
-            bool QChart::isBackgroundDropShadowEnabled() const
+            bool QChart::isDropShadowEnabled() const
             {
                 if (!d_ptr->m_presenter->m_backgroundItem)
                     return false;

src/qchart.h +2 -2

                 QPen backgroundPen() const;
                 void setBackgroundVisible(bool visible = true);
                 bool isBackgroundVisible() const;
-                void setBackgroundDropShadowEnabled(bool enabled = true);
-                bool isBackgroundDropShadowEnabled() const;
+                void setDropShadowEnabled(bool enabled = true);
+                bool isDropShadowEnabled() const;
                 void setAnimationOptions(AnimationOptions options);
                 AnimationOptions animationOptions() const;

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