HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2549:a58216ed7654

Added API to set chart background roundness...

Miikka Heikkinen -

r2549:a58216ed7654

parent child

Context file:

r2549:a58216ed7654

Collapse all files

plugins/declarative/declarativechart.cpp +18 0

@@ -115,6 +115,11 QTCOMMERCIALCHART_BEGIN_NAMESPACE
115	*/	115	*/
116		116
117	/*!	117	/*!
		118	\qmlproperty real ChartView::backgroundRoundness
		119	The diameter of the rounding cirle at the corners of the chart background.
		120	*/
		121
		122	/*!
118	\qmlproperty color ChartView::plotAreaColor	123	\qmlproperty color ChartView::plotAreaColor
119	The color of the background of the chart's plot area. By default plot area background uses chart's	124	The color of the background of the chart's plot area. By default plot area background uses chart's
120	background color.	125	background color.
@@ -706,6 +711,19 bool DeclarativeChart::dropShadowEnabled()
706	return m_chart->isDropShadowEnabled();	711	return m_chart->isDropShadowEnabled();
707	}	712	}
708		713
		714	qreal DeclarativeChart::backgroundRoundness() const
		715	{
		716	return m_chart->backgroundRoundness();
		717	}
		718
		719	void DeclarativeChart::setBackgroundRoundness(qreal diameter)
		720	{
		721	if (m_chart->backgroundRoundness() != diameter) {
		722	m_chart->setBackgroundRoundness(diameter);
		723	emit backgroundRoundnessChanged(diameter);
		724	}
		725	}
		726
709	qreal DeclarativeChart::topMargin()	727	qreal DeclarativeChart::topMargin()
710	{	728	{
711	qWarning() << "ChartView.topMargin is deprecated. Use margins instead.";	729	qWarning() << "ChartView.topMargin is deprecated. Use margins instead.";

plugins/declarative/declarativechart.h +4 0

                 Q_PROPERTY(int count READ count)
                 Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor NOTIFY backgroundColorChanged)
                 Q_PROPERTY(bool dropShadowEnabled READ dropShadowEnabled WRITE setDropShadowEnabled NOTIFY dropShadowEnabledChanged)
+                Q_PROPERTY(qreal backgroundRoundness READ backgroundRoundness WRITE setBackgroundRoundness NOTIFY backgroundRoundnessChanged REVISION 3)
                 Q_PROPERTY(qreal topMargin READ topMargin)
                 Q_PROPERTY(qreal bottomMargin READ bottomMargin)
                 Q_PROPERTY(qreal leftMargin READ leftMargin)
                 int count();
                 void setDropShadowEnabled(bool enabled);
                 bool dropShadowEnabled();
+                Q_REVISION(3) qreal backgroundRoundness() const;
+                Q_REVISION(3) void setBackgroundRoundness(qreal diameter);
                 // Margins & plotArea
                 qreal topMargin();
                 void seriesAdded(QAbstractSeries *series);
                 void seriesRemoved(QAbstractSeries *series);
                 Q_REVISION(3) void plotAreaColorChanged();
+                Q_REVISION(3) void backgroundRoundnessChanged(qreal diameter);
             private Q_SLOTS:
                 void changeMinimumMargins(int top, int bottom, int left, int right);

src/chartbackground.cpp +5 -11

             ChartBackground::ChartBackground(QGraphicsItem *parent)
                 : QGraphicsRectItem(parent),
-                  m_diameter(15),
+                  m_diameter(5),
                   m_dropShadow(0)
             {
             }
                 painter->save();
                 painter->setPen(pen());
                 painter->setBrush(brush());
-                painter->drawRoundRect(rect(), roundness(rect().width()), roundness(rect().height()));
+                painter->drawRoundedRect(rect(), m_diameter, m_diameter);
             #ifndef QT_NO_DEBUG
                 painter->setPen(Qt::black);
                 QFont font;
                 painter->restore();
             }
-            int ChartBackground::roundness(qreal size) const
+            qreal ChartBackground::diameter() const
-                if (qFuzzyCompare(size, 0))
-                    return 0;
-                return 100 * m_diameter / int(size);
-            int ChartBackground::diameter() const
             {
                 return m_diameter;
             }
-            void ChartBackground::setDiameter(int diameter)
+            void ChartBackground::setDiameter(qreal diameter)
             {
                 m_diameter = diameter;
+                update();
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/chartbackground_p.h +3 -6

                 ChartBackground(QGraphicsItem *parent = 0);
                 ~ChartBackground();
-                void setDiameter(int diameter);
+                void setDiameter(qreal diameter);
-                int diameter() const;
+                qreal diameter() const;
                 void setDropShadowEnabled(bool enabled);
                 bool isDropShadowEnabled() { return m_dropShadow != 0; }
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
             private:
-                int roundness(qreal size) const;
+                qreal m_diameter;
-            private:
-                int m_diameter;
                 QGraphicsDropShadowEffect *m_dropShadow;
             };

src/chartpresenter.cpp +14 0

@@ -227,6 +227,20 QPen ChartPresenter::backgroundPen() const
227	return m_background->pen();	227	return m_background->pen();
228	}	228	}
229		229
		230	void ChartPresenter::setBackgroundRoundness(qreal diameter)
		231	{
		232	createBackgroundItem();
		233	m_background->setDiameter(diameter);
		234	m_layout->invalidate();
		235	}
		236
		237	qreal ChartPresenter::backgroundRoundness() const
		238	{
		239	if (!m_background)
		240	return 0;
		241	return m_background->diameter();
		242	}
		243
230	void ChartPresenter::setPlotAreaBackgroundBrush(const QBrush &brush)	244	void ChartPresenter::setPlotAreaBackgroundBrush(const QBrush &brush)
231	{	245	{
232	createPlotAreaBackgroundItem();	246	createPlotAreaBackgroundItem();

src/chartpresenter_p.h +3 0

                 void setBackgroundPen(const QPen &pen);
                 QPen backgroundPen() const;
+                void setBackgroundRoundness(qreal diameter);
+                qreal backgroundRoundness() const;
                 void setPlotAreaBackgroundBrush(const QBrush &brush);
                 QBrush plotAreaBackgroundBrush() const;

src/qchart.cpp +15 0

              */
             /*!
+             \property QChart::backgroundRoundness
+             The diameter of the rounding cirle at the corners of the chart background.
+             */
+            /*!
              \property QChart::minimumMargins
              Minimum margins between the plot area (axes) and the edge of the chart widget.
              This property is deprecated; use margins property instead.
                 return d_ptr->m_presenter->isBackgroundDropShadowEnabled();
             }
+            void QChart::setBackgroundRoundness(qreal diameter)
+            {
+                d_ptr->m_presenter->setBackgroundRoundness(diameter);
+            }
+            qreal QChart::backgroundRoundness() const
+            {
+                return d_ptr->m_presenter->backgroundRoundness();
+            }
             /*!
               Returns all series that are added to the chart.

src/qchart.h +3 0

                 Q_PROPERTY(QString title READ title WRITE setTitle)
                 Q_PROPERTY(bool backgroundVisible READ isBackgroundVisible WRITE setBackgroundVisible)
                 Q_PROPERTY(bool dropShadowEnabled READ isDropShadowEnabled WRITE setDropShadowEnabled)
+                Q_PROPERTY(qreal backgroundRoundness READ backgroundRoundness WRITE setBackgroundRoundness)
                 Q_PROPERTY(QChart::AnimationOptions animationOptions READ animationOptions WRITE setAnimationOptions)
                 Q_PROPERTY(QMargins minimumMargins READ minimumMargins WRITE setMinimumMargins)
                 Q_PROPERTY(QMargins margins READ margins WRITE setMargins)
                 void setDropShadowEnabled(bool enabled = true);
                 bool isDropShadowEnabled() const;
+                void setBackgroundRoundness(qreal diameter);
+                qreal backgroundRoundness() const;
                 void setAnimationOptions(AnimationOptions options);
                 AnimationOptions animationOptions() const;

tests/auto/qchart/tst_qchart.cpp +9 0

                 void createDefaultAxesForLineSeries_data();
                 void createDefaultAxesForLineSeries();
                 void axisPolarOrientation();
+                void backgroundRoundness();
             private:
                 void createTestData();
                 QCOMPARE(chart.axisPolarOrientation(yAxes[0]), QPolarChart::PolarOrientationRadial);
             }
+            void tst_QChart::backgroundRoundness()
+            {
+                createTestData();
+                m_chart->createDefaultAxes();
+                m_chart->setBackgroundRoundness(100.0);
+                QVERIFY(m_chart->backgroundRoundness() == 100.0);
+            }
             QTEST_MAIN(tst_QChart)
             #include "tst_qchart.moc"

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

                 onTitleColorChanged:               console.log("chart.onTitleColorChanged: " + color);
                 onBackgroundColorChanged:          console.log("chart.onBackgroundColorChanged: " + chart.backgroundColor);
                 onDropShadowEnabledChanged:        console.log("chart.onDropShadowEnabledChanged: " + enabled);
+                onBackgroundRoundnessChanged:      console.log("chart.onBackgroundRoundnessChanged: " + diameter);
                 onSeriesAdded:                     console.log("chart.onSeriesAdded: " + series.name);
                 onSeriesRemoved:                   console.log("chart.onSeriesRemoved: " + series.name);
                 onPlotAreaColorChanged:            console.log("chart.plotAreaColorChanged: " + chart.plotAreaColor);

tests/qmlchartproperties/qml/qmlchartproperties/ChartEditorProperties.qml +4 0

                     onClicked: chart.dropShadowEnabled = !chart.dropShadowEnabled;
                 }
                 Button {
+                    text: "roundness"
+                    onClicked: chart.backgroundRoundness++;
+                }
+                Button {
                     text: "zoom +"
                     onClicked: chart.zoom(2);
                 }

tests/quick2chartproperties/qml/quick2chartproperties/Chart.qml +1 0

                 onTitleColorChanged:               console.log("chart.onTitleColorChanged: " + color);
                 onBackgroundColorChanged:          console.log("chart.onBackgroundColorChanged: " + chart.backgroundColor);
                 onDropShadowEnabledChanged:        console.log("chart.onDropShadowEnabledChanged: " + enabled);
+                onBackgroundRoundnessChanged:      console.log("chart.onBackgroundRoundnessChanged: " + diameter);
                 onSeriesAdded:                     console.log("chart.onSeriesAdded: " + series.name);
                 onSeriesRemoved:                   console.log("chart.onSeriesRemoved: " + series.name);
                 onPlotAreaColorChanged:            console.log("chart.plotAreaColorChanged: " + chart.plotAreaColor);

tests/quick2chartproperties/qml/quick2chartproperties/ChartEditorProperties.qml +4 0

                     onClicked: chart.dropShadowEnabled = !chart.dropShadowEnabled;
                 }
                 Button {
+                    text: "roundness"
+                    onClicked: chart.backgroundRoundness++;
+                }
+                Button {
                     text: "zoom +"
                     onClicked: chart.zoom(2);
                 }

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