HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1928:6a089ea6fc66

Added ChartView.minimumMargins to QML properties

Tero Ahola -

r1928:6a089ea6fc66

parent child

Context file:

r1928:6a089ea6fc66

Collapse all files

plugins/declarative/declarativemargins.cpp created 644 +111 0

@@ -0,0 +1,111
	1	/****************************************************************************
	2	**
	3	** Copyright (C) 2012 Digia Plc
	4	** All rights reserved.
	5	** For any questions to Digia, please use contact form at http://qt.digia.com
	6	**
	7	** This file is part of the Qt Commercial Charts Add-on.
	8	**
	9	** $QT_BEGIN_LICENSE$
	10	** Licensees holding valid Qt Commercial licenses may use this file in
	11	** accordance with the Qt Commercial License Agreement provided with the
	12	** Software or, alternatively, in accordance with the terms contained in
	13	** a written agreement between you and Digia.
	14	**
	15	** If you have questions regarding the use of this file, please use
	16	** contact form at http://qt.digia.com
	17	** $QT_END_LICENSE$
	18	**
	19	****************************************************************************/
	20
	21	#include "declarativemargins.h"
	22	#include <QDataStream>
	23	#include <QDebug>
	24
	25	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	26
	27	/*!
	28	\qmlclass Margins
	29	Uncreatable type that is used to define top, bottom, left and right margins.
	30	*/
	31
	32	/*!
	33	\qmlproperty int Margins::top
	34	The top margin.
	35	*/
	36
	37	/*!
	38	\qmlproperty int Margins::bottom
	39	The bottom margin.
	40	*/
	41
	42	/*!
	43	\qmlproperty int Margins::left
	44	The left margin.
	45	*/
	46
	47	/*!
	48	\qmlproperty int Margins::right
	49	The right margin.
	50	*/
	51
	52	DeclarativeMargins::DeclarativeMargins(QObject *parent) :
	53	QObject(parent)
	54	{
	55	QMargins::setTop(0);
	56	QMargins::setBottom(0);
	57	QMargins::setLeft(0);
	58	QMargins::setRight(0);
	59	}
	60
	61	void DeclarativeMargins::setTop(int top)
	62	{
	63	if (top < 0) {
	64	qWarning() << "Cannot set top margin to a negative value:" << top;
	65	} else {
	66	if (top != QMargins::top()) {
	67	QMargins::setTop(top);
	68	emit topChanged(QMargins::top(), QMargins::bottom(), QMargins::left(), QMargins::right());
	69	}
	70	}
	71	}
	72
	73	void DeclarativeMargins::setBottom(int bottom)
	74	{
	75	if (bottom < 0) {
	76	qWarning() << "Cannot set bottom margin to a negative value:" << bottom;
	77	} else {
	78	if (bottom != QMargins::bottom()) {
	79	QMargins::setBottom(bottom);
	80	emit bottomChanged(QMargins::top(), QMargins::bottom(), QMargins::left(), QMargins::right());
	81	}
	82	}
	83	}
	84
	85	void DeclarativeMargins::setLeft(int left)
	86	{
	87	if (left < 0) {
	88	qWarning() << "Cannot set left margin to a negative value:" << left;
	89	} else {
	90	if (left != QMargins::left()) {
	91	QMargins::setLeft(left);
	92	emit leftChanged(QMargins::top(), QMargins::bottom(), QMargins::left(), QMargins::right());
	93	}
	94	}
	95	}
	96
	97	void DeclarativeMargins::setRight(int right)
	98	{
	99	if (right < 0) {
	100	qWarning() << "Cannot set left margin to a negative value:" << right;
	101	} else {
	102	if (right != QMargins::right()) {
	103	QMargins::setRight(right);
	104	emit rightChanged(QMargins::top(), QMargins::bottom(), QMargins::left(), QMargins::right());
	105	}
	106	}
	107	}
	108
	109	#include "moc_declarativemargins.cpp"
	110
	111	QTCOMMERCIALCHART_END_NAMESPACE

plugins/declarative/declarativemargins.h created 644 +54 0

@@ -0,0 +1,54
	1	/****************************************************************************
	2	**
	3	** Copyright (C) 2012 Digia Plc
	4	** All rights reserved.
	5	** For any questions to Digia, please use contact form at http://qt.digia.com
	6	**
	7	** This file is part of the Qt Commercial Charts Add-on.
	8	**
	9	** $QT_BEGIN_LICENSE$
	10	** Licensees holding valid Qt Commercial licenses may use this file in
	11	** accordance with the Qt Commercial License Agreement provided with the
	12	** Software or, alternatively, in accordance with the terms contained in
	13	** a written agreement between you and Digia.
	14	**
	15	** If you have questions regarding the use of this file, please use
	16	** contact form at http://qt.digia.com
	17	** $QT_END_LICENSE$
	18	**
	19	****************************************************************************/
	20
	21	#ifndef DECLARATIVE_MARGINS_H
	22	#define DECLARATIVE_MARGINS_H
	23
	24	#include "qchartglobal.h"
	25	#include <QObject>
	26	#include <QMargins>
	27
	28	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	29
	30	class DeclarativeMargins : public QObject, public QMargins
	31	{
	32	Q_OBJECT
	33	Q_PROPERTY(int top READ top WRITE setTop NOTIFY topChanged)
	34	Q_PROPERTY(int bottom READ bottom WRITE setBottom NOTIFY bottomChanged)
	35	Q_PROPERTY(int left READ left WRITE setLeft NOTIFY leftChanged)
	36	Q_PROPERTY(int right READ right WRITE setRight NOTIFY rightChanged)
	37
	38	public:
	39	explicit DeclarativeMargins(QObject *parent = 0);
	40	void setTop(int top);
	41	void setBottom(int bottom);
	42	void setLeft(int left);
	43	void setRight(int right);
	44
	45	Q_SIGNALS:
	46	void topChanged(int top, int bottom, int left, int right);
	47	void bottomChanged(int top, int bottom, int left, int right);
	48	void leftChanged(int top, int bottom, int left, int right);
	49	void rightChanged(int top, int bottom, int left, int right);
	50	};
	51
	52	QTCOMMERCIALCHART_END_NAMESPACE
	53
	54	#endif // DECLARATIVE_MARGINS_H

demos/qmlcustommodel/qml/qmlcustommodel/main.qml +2 -1

                             }
                         }
+                    }
                     VPieModelMapper {
                         model: customModel
+                        series: pieSeries
                         labelsColumn: 1
                         valuesColumn: 2
                         firstRow: 1
                     }
                     //![3]
                 }
             }

plugins/declarative/declarative.pro +4 -2

                 declarativescatterseries.cpp \
                 declarativepieseries.cpp \
                 declarativebarseries.cpp \
-                declarativecategoryaxis.cpp
+                declarativecategoryaxis.cpp \
+                declarativemargins.cpp
             HEADERS += \
                 declarativechart.h \
                 declarativescatterseries.h \
                 declarativepieseries.h \
                 declarativebarseries.h \
-                declarativecategoryaxis.h
+                declarativecategoryaxis.h \
+                declarativemargins.h
             TARGETPATH = QtCommercial/Chart
             target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH

plugins/declarative/declarativechart.cpp +26 -27

             #include "qvalueaxis.h"
             #include "qcategoryaxis.h"
             #include "qabstractseries_p.h"
+            #include "declarativemargins.h"
             #ifndef QT_ON_ARM
                 #include "qdatetimeaxis.h"
             /*!
               \qmlproperty real ChartView::topMargin
-              The space between the top of chart view and the top of the plot area. The title (if non-empty) is drawn on top margin
+              Deprecated. Use minimumMargins and plotArea instead.
-              area of the chart view. Top margin area is also used by legend, if aligned to top.
             */
             /*!
               \qmlproperty real ChartView::bottomMargin
-              The space between the bottom of chart view and the bottom of the plot area. The bottom margin area may be used by
+              Deprecated. Use minimumMargins and plotArea instead.
-              legend (if aligned to bottom), x-axis, x-axis labels and x-axis tick marks.
             */
             /*!
               \qmlproperty real ChartView::leftMargin
-              The space between the left side of chart view and the left side of the plot area. The left margin area may be used by
+              Deprecated. Use minimumMargins and plotArea instead.
-              legend (if aligned to left), y-axis, y-axis labels and y-axis tick marks.
             */
             /*!
               \qmlproperty real ChartView::rightMargin
-              The space between the right side of chart view and the right side of the plot area. The right margin area may be used
+              Deprecated. Use minimumMargins and plotArea instead.
-              by legend (if aligned to right).
+            */
+            /*!
+              \qmlproperty Margins ChartView::minimumMargins
+              The minimum margins allowed between the outer bounds and the plotArea of the ChartView.
             */
             /*!
                   m_chart(new QChart(this))
             {
                 setFlag(QGraphicsItem::ItemHasNoContents, false);
-                //TODO: check what should be really here margins or platArea ?!
+                m_minMargins = new DeclarativeMargins(this);
-                m_chartMargins = m_chart->minimumMargins();
+                connect(m_minMargins, SIGNAL(topChanged(int, int, int, int)), this, SLOT(changeMinimumMargins(int, int, int, int)));
-                connect(m_chart, SIGNAL(marginsChanged(QRectF)), this, SLOT(handleMarginsChanged(QRectF)));
+                connect(m_minMargins, SIGNAL(bottomChanged(int, int, int, int)), this, SLOT(changeMinimumMargins(int, int, int, int)));
+                connect(m_minMargins, SIGNAL(leftChanged(int, int, int, int)), this, SLOT(changeMinimumMargins(int, int, int, int)));
+                connect(m_minMargins, SIGNAL(rightChanged(int, int, int, int)), this, SLOT(changeMinimumMargins(int, int, int, int)));
+                // TODO: connect to plotAreaChanged signal from m_chart
             }
-            void DeclarativeChart::handleMarginsChanged(QRectF newMargins)
+            void DeclarativeChart::changeMinimumMargins(int top, int bottom, int left, int right)
             {
-                //TODO: check what should be really here margins or platArea ?!
+                m_chart->setMinimumMargins(QMargins(left, top, right, bottom));
-                if (m_chartMargins.top() != newMargins.top())
-                    topMarginChanged(m_chart->minimumMargins().top());
-                if (m_chartMargins.bottom() != newMargins.bottom())
-                    bottomMarginChanged(m_chart->minimumMargins().bottom());
-                if (m_chartMargins.left() != newMargins.left())
-                    leftMarginChanged(m_chart->minimumMargins().left());
-                if (m_chartMargins.right() != newMargins.right())
-                    rightMarginChanged(m_chart->minimumMargins().right());
-                m_chartMargins = m_chart->minimumMargins();
             }
             DeclarativeChart::~DeclarativeChart()
             qreal DeclarativeChart::topMargin()
             {
-                return m_chart->minimumMargins().top();
+                qWarning() << "ChartView.topMargin is deprecated. Use minimumMargins and plotArea instead.";
+                return m_chart->plotArea().top();
             }
             qreal DeclarativeChart::bottomMargin()
             {
-                return m_chart->minimumMargins().bottom();
+                qWarning() << "ChartView.bottomMargin is deprecated. Use minimumMargins and plotArea instead.";
+                return m_chart->plotArea().bottom();
             }
             qreal DeclarativeChart::leftMargin()
             {
-                return m_chart->minimumMargins().left();
+                qWarning() << "ChartView.leftMargin is deprecated. Use minimumMargins and plotArea instead.";
+                return m_chart->plotArea().left();
             }
             qreal DeclarativeChart::rightMargin()
             {
-                return m_chart->minimumMargins().right();
+                qWarning() << "ChartView.rightMargin is deprecated. Use minimumMargins and plotArea instead.";
+                return m_chart->plotArea().right();
             }
             void DeclarativeChart::zoom(qreal factor)

plugins/declarative/declarativechart.h +8 -2

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
+            class DeclarativeMargins;
             class DeclarativeChart : public QDeclarativeItem
             {
                 Q_OBJECT
                 Q_PROPERTY(qreal bottomMargin READ bottomMargin NOTIFY bottomMarginChanged)
                 Q_PROPERTY(qreal leftMargin READ leftMargin NOTIFY leftMarginChanged)
                 Q_PROPERTY(qreal rightMargin READ rightMargin NOTIFY rightMarginChanged)
+                Q_PROPERTY(DeclarativeMargins *minimumMargins READ minimumMargins REVISION 1)
                 Q_ENUMS(Animation)
                 Q_ENUMS(Theme)
                 Q_ENUMS(SeriesType)
                 qreal leftMargin();
                 qreal rightMargin();
                 void createDefaultAxes(QAbstractSeries* series);
+                DeclarativeMargins *minimumMargins() { return m_minMargins; }
             public:
                 Q_INVOKABLE QAbstractSeries *series(int index);
                 void rightMarginChanged(qreal margin);
             public Q_SLOTS:
-                void handleMarginsChanged(QRectF newMargins);
+            //    void handleMarginsChanged(QRectF newMargins);
+                void changeMinimumMargins(int top, int bottom, int left, int right);
                 void handleAxisXSet(QAbstractAxis *axis);
                 void handleAxisYSet(QAbstractAxis *axis);
                 // Extending QChart with DeclarativeChart is not possible because QObject does not support
                 // multi inheritance, so we now have a QChart as a member instead
                 QChart *m_chart;
-                QMargins m_chartMargins;
+                //QMargins m_chartMargins;
+                DeclarativeMargins *m_minMargins;
             };
             QTCOMMERCIALCHART_END_NAMESPACE

plugins/declarative/plugin.cpp +4 -1

             #include "qvpiemodelmapper.h"
             #include "qhbarmodelmapper.h"
             #include "qvbarmodelmapper.h"
+            #include "declarativemargins.h"
             #include <QAbstractItemModel>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                                                       QLatin1String("Trying to create uncreatable: QPieSeries. Use PieSeries instead."));
                     // QtCommercial.Chart 1.1
-                    qmlRegisterType<DeclarativeChart>(uri, 1, 1, "ChartView");
+                    qmlRegisterType<DeclarativeChart, 1>(uri, 1, 1, "ChartView");
                     qmlRegisterType<DeclarativeXYPoint>(uri, 1, 1, "XYPoint");
                     qmlRegisterType<DeclarativeScatterSeries, 1>(uri, 1, 1, "ScatterSeries");
                     qmlRegisterType<DeclarativeLineSeries, 1>(uri, 1, 1, "LineSeries");
                                                       QLatin1String("Trying to create uncreatable: BarsetBase."));
                     qmlRegisterUncreatableType<QPieSeries>(uri, 1, 1, "QPieSeries",
                                                       QLatin1String("Trying to create uncreatable: QPieSeries. Use PieSeries instead."));
+                    qmlRegisterUncreatableType<DeclarativeMargins>(uri, 1, 1, "Margins",
+                                                      QLatin1String("Trying to create uncreatable: Margins."));
                 }
             };

tests/qmlchartproperties/qml/qmlchartproperties/Chart.qml +4 -1

                 legend.onColorChanged:             console.log("legend.onColorChanged: " + color);
                 legend.onBorderColorChanged:       console.log("legend.onBorderColorChanged: " + color);
                 legend.onLabelColorChanged:        console.log("legend.onLabelColorChanged: " + color);
+                minimumMargins.onTopChanged:       console.log("chart.minimumMargins.onTopChanged: " + top);
+                minimumMargins.onBottomChanged:    console.log("chart.minimumMargins.onBottomChanged: " + bottom);
+                minimumMargins.onLeftChanged:      console.log("chart.minimumMargins.onLeftChanged: " + left);
+                minimumMargins.onRightChanged:     console.log("chart.minimumMargins.onRightChanged: " + right);
                 ValueAxis{
                     onColorChanged:               console.log("axisX.onColorChanged: " + color);

tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor1.qml +36 0

@@ -84,6 +84,42 Row {
84	text: "title color"	84	text: "title color"
85	onClicked: chart.titleColor = main.nextColor();	85	onClicked: chart.titleColor = main.nextColor();
86	}	86	}
		87	Button {
		88	text: "zoom -"
		89	onClicked: chart.zoom(0.5);
		90	}
		91	Button {
		92	text: "top min margin +"
		93	onClicked: chart.minimumMargins.top += 5;
		94	}
		95	Button {
		96	text: "top min margin -"
		97	onClicked: chart.minimumMargins.top -= 5;
		98	}
		99	Button {
		100	text: "bottom min margin +"
		101	onClicked: chart.minimumMargins.bottom += 5;
		102	}
		103	Button {
		104	text: "bottom min margin -"
		105	onClicked: chart.minimumMargins.bottom -= 5;
		106	}
		107	Button {
		108	text: "left min margin +"
		109	onClicked: chart.minimumMargins.left += 5;
		110	}
		111	Button {
		112	text: "left min margin -"
		113	onClicked: chart.minimumMargins.left -= 5;
		114	}
		115	Button {
		116	text: "right min margin +"
		117	onClicked: chart.minimumMargins.right += 5;
		118	}
		119	Button {
		120	text: "right min margin -"
		121	onClicked: chart.minimumMargins.right -= 5;
		122	}
87	}	123	}
88		124
89	FontEditor {	125	FontEditor {

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