HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2691:0f386f5dd654

Add invokable clear() for QML bar category axis...

Titta Heikkala -

r2691:0f386f5dd654

parent child

Context file:

r2691:0f386f5dd654

doc/docconf/qcharts.qdocconf +2 -1

             examples.fileextensions = *.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml
             examples.imageextensions = *.png *.jpeg *.jpg *.gif *.mng
-            Cpp.ignoretokens        = QTCOMMERCIALCHART_EXPORT \
+            Cpp.ignoretokens        = Q_INVOKABLE \
+                                      QTCOMMERCIALCHART_EXPORT \
                                       QTCOMMERCIALCHART_END_NAMESPACE \
                                       QTCOMMERCIALCHART_BEGIN_NAMESPACE
             Cpp.ignoredirectives    = Q_DECLARE_HANDLE \

plugins/quick2/plugins.qmltypes +1 0

                         Parameter { name: "min"; type: "string" }
                         Parameter { name: "max"; type: "string" }
                     }
+                    Method { name: "clear" }
                 }
                 Component {
                     name: "QtCommercialChart::QBarModelMapper"

src/axis/barcategoryaxis/qbarcategoryaxis.cpp +6 -1

                 \brief The QBarCategoryAxis class is used for manipulating chart's axis.
                 \mainclass
-                BarCategoryAxis can be setup to show axis line with tick marks, grid lines and shades.
+                QBarCategoryAxis can be setup to show axis line with tick marks, grid lines and shades.
                 Categories are drawn between ticks. Note that you can use this also with lineseries too.
                 See the \l {Line and BarChart Example} {Line and BarChart Example} to learn how to do that.
             */
             /*!
+              \qmlmethod void BarCategoryAxis::clear()
+              Removes all categories. Sets the maximum and minimum of the axis's range to QString::null.
+            */
+            /*!
                 Constructs an axis object which is a child of \a parent.
             */
             QBarCategoryAxis::QBarCategoryAxis(QObject *parent):

src/axis/barcategoryaxis/qbarcategoryaxis.h +1 -1

                 void remove(const QString &category);
                 void insert(int index, const QString &category);
                 void replace(const QString &oldCategory, const QString &newCategory);
-                void clear();
+                Q_INVOKABLE void clear();
                 void setCategories(const QStringList &categories);
                 QStringList categories();
                 int count() const;

tests/auto/qml-qtquicktest/tst_barcategoryaxis.qml +11 0

@@ -64,6 +64,17 Rectangle {
64	compare(minChangedSpy.count, 1, "onMinChanged");	64	compare(minChangedSpy.count, 1, "onMinChanged");
65	compare(maxChangedSpy.count, 1, "onMaxChanged");	65	compare(maxChangedSpy.count, 1, "onMaxChanged");
66	}	66	}
		67
		68	function test_seriesAxisClear() {
		69	verify(barSeries1.axisX.min !== "", "barSeries1.axisX.min");
		70	verify(barSeries1.axisX.max !== "", "barSeries1.axisX.max");
		71	verify(barSeries1.axisX.count !== 0, "barSeries1.axisX.count"); // category count
		72	barSeries1.axisX.clear();
		73	verify(barSeries1.axisX.min === "", "barSeries1.axisX.min");
		74	verify(barSeries1.axisX.max === "", "barSeries1.axisX.max");
		75	verify(barSeries1.axisX.count === 0);
		76	}
		77
67	}	78	}
68		79
69	ChartView {	80	ChartView {

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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