diff --git a/doc/src/qml.qdoc b/doc/src/qml.qdoc
index 15c4505..6682bcd 100644
--- a/doc/src/qml.qdoc
+++ b/doc/src/qml.qdoc
@@ -9,6 +9,7 @@
\endraw
*/
diff --git a/src/axis/chartaxis.cpp b/src/axis/chartaxis.cpp
index 612444d..b78a56b 100644
--- a/src/axis/chartaxis.cpp
+++ b/src/axis/chartaxis.cpp
@@ -310,7 +310,7 @@ void ChartAxis::handleAxisUpdated()
}
if (m_chartAxis->shadesVisible()) {
- setShadesOpacity(m_chartAxis->shadesOpacity());
+ setShadesOpacity(100);
} else {
setShadesOpacity(0);
}
diff --git a/src/axis/qaxis.cpp b/src/axis/qaxis.cpp
index 1ff2a98..33dba86 100644
--- a/src/axis/qaxis.cpp
+++ b/src/axis/qaxis.cpp
@@ -30,151 +30,217 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
\mainclass
There is only one x Axis, however there can be multiple y axes.
- Each chart series can be bound to exactly one Y axis and the share common X axis.
- Axis can be setup to show axis line with ticks, gird lines and shades.
+ Each chart series can be bound to exactly one Y axis and the shared common X axis.
+ Axis can be setup to show axis line with tick marks, grid lines and shades.
+*/
+
+/*!
+ \qmlclass Axis QAxis
+ \brief The Axis element is used for manipulating chart's axes
+ There is only one x Axis, however there can be multiple y axes on a ChartView.
+ Each chart series can be bound to exactly one Y axis and the shared common X axis.
+ Axis can be setup to show axis line with tick marks, grid lines and shades.
*/
/*!
\property QAxis::labelsVisible
-
+ Defines if axis labels are visible.
+*/
+/*!
+ \qmlproperty bool Axis::labelsVisible
Defines if axis labels are visible.
*/
/*!
\property QAxis::min
-
+ Defines the minimum value on the axis.
+*/
+/*!
+ \qmlproperty real Axis::min
Defines the minimum value on the axis.
*/
/*!
\property QAxis::max
-
+ Defines the maximum value on the axis.
+*/
+/*!
+ \qmlproperty real Axis::max
Defines the maximum value on the axis.
*/
/*!
- \fn bool QAxis::isAxisVisible() const
- \brief Returns if axis is visible
- \sa setAxisVisible()
+ \property QAxis::visible
+ The visibility of the axis.
+*/
+/*!
+ \qmlproperty bool Axis::visible
+ The visibility of the axis.
*/
/*!
- \fn QPen QAxis::axisPen() const
- \brief Returns pen used to draw axis and ticks.
- \sa setAxisPen()
+ \property QAxis::gridVisible
+ The visibility of the grid lines.
+*/
+/*!
+ \qmlproperty bool Axis::gridVisible
+ The visibility of the grid lines.
*/
+/*!
+ \property QAxis::color
+ The color of the axis and ticks.
+*/
+/*!
+ \qmlproperty color Axis::color
+ The color of the axis and ticks.
+*/
/*!
- \fn bool QAxis::isGridLineVisible() const
- \brief Returns if grid is visible
- \sa setGridLineVisible()
+ \property QAxis::labelsColor
+ The color of the axis labels.
+*/
+/*!
+ \qmlproperty color Axis::labelsColor
+ The color of the axis labels.
*/
/*!
- \fn QPen QAxis::gridLinePen() const
- \brief Returns pen used to draw grid.
- \sa setGridLinePen()
+ \property QAxis::labelsAngle
+ The angle of the axis labels in degrees.
+*/
+/*!
+ \qmlproperty int Axis::labelsAngle
+ The angle of the axis labels in degrees.
*/
/*!
- \fn QPen QAxis::labelsPen() const
- \brief Returns the pen used to labels.
- \sa setLabelsPen()
+ \property QAxis::shadesVisible
+ The visibility of the axis shades.
+*/
+/*!
+ \qmlproperty bool Axis::shadesVisible
+ The visibility of the axis shades.
*/
/*!
- \fn QBrush QAxis::labelsBrush() const
- \brief Returns brush used to draw labels.
- \sa setLabelsBrush()
+ \property QAxis::shadesColor
+ The fill (brush) color of the axis shades.
+*/
+/*!
+ \qmlproperty color Axis::shadesColor
+ The fill (brush) color of the axis shades.
*/
/*!
- \fn QFont QAxis::labelsFont() const
- \brief Returns font used to draw labels.
- \sa setLabelsFont()
+ \property QAxis::shadesBorderColor
+ The border (pen) color of the axis shades.
+*/
+/*!
+ \qmlproperty color Axis::shadesBorderColor
+ The border (pen) color of the axis shades.
*/
/*!
- \fn QFont QAxis::labelsAngle() const
- \brief Returns angle used to draw labels.
- \sa setLabelsAngle()
+ \property QAxis::ticksCount
+ The number of tick marks for the axis.
+*/
+/*!
+ \qmlproperty int Axis::ticksCount
+ The number of tick marks for the axis.
*/
/*!
- \fn bool QAxis::shadesVisible() const
- \brief Returns if shades are visible.
- \sa setShadesVisible()
+ \property QAxis::niceNumbersEnabled
+ Whether the nice numbers algorithm is enabled or not for the axis.
+*/
+/*!
+ \qmlproperty bool Axis::niceNumbersEnabled
+ Whether the nice numbers algorithm is enabled or not for the axis.
*/
/*!
- \fn qreal QAxis::shadesOpacity() const
- \brief Returns opacity of shades.
- */
+ \fn void QAxis::visibleChanged(bool)
+ Visiblity of the axis has changed to \a visible.
+*/
/*!
- \fn QPen QAxis::shadesPen() const
- \brief Returns pen used to draw shades.
- \sa setShadesPen()
+ \fn void QAxis::labelsVisibleChanged(bool)
+ Visiblity of the labels of the axis has changed to \a visible.
*/
/*!
- \fn QBrush QAxis::shadesBrush() const
- \brief Returns brush used to draw shades.
- \sa setShadesBrush()
+ \fn void QAxis::gridVisibleChanged(bool)
+ Visiblity of the grid lines of the axis has changed to \a visible.
+*/
+
+/*!
+ \fn void QAxis::minChanged(qreal min)
+ Axis emits signal when \a min of axis has changed.
+*/
+
+/*!
+ \fn void QAxis::maxChanged(qreal max)
+ Axis emits signal when \a max of axis has changed.
+*/
+
+/*!
+ \fn void QAxis::rangeChanged(qreal min, qreal max)
+ Axis emits signal when \a min or \a max of axis has changed.
*/
/*!
- \fn qreal QAxis::min() const
- \brief Returns minimum value on the axis.
- \sa setMin()
+ \fn QChartAxisCategories* QAxis::categories()
+ Returns pointer to the list of categories which correspond to the values on the axis.
*/
/*!
- \fn qreal QAxis::max() const
- \brief Returns maximim value on the axis.
- \sa setMax()
+ \fn void QAxis::colorChanged(QColor)
+ Emitted if the \a color of the axis is changed.
*/
/*!
- \fn void QAxis::minChanged(qreal min)
- \brief Axis emits signal when \a min of axis has changed.
+ \fn void QAxis::labelsColorChanged(QColor)
+ Emitted if the \a color of the axis labels is changed.
*/
/*!
- \fn void QAxis::maxChanged(qreal max)
- \brief Axis emits signal when \a max of axis has changed.
+ \fn void QAxis::labelsAngleChanged(int)
+ Emitted if the \a angle of the axis labels is changed.
*/
/*!
- \fn void QAxis::rangeChanged(qreal min, qreal max)
- \brief Axis emits signal when \a min or \a max of axis has changed.
+ \fn void QAxis::shadesVisibleChanged(bool)
+ Emitted if the visibility of the axis shades is changed to \a visible.
*/
/*!
- \fn int QAxis::ticksCount() const
- \brief Return number of ticks on the axis
- \sa setTicksCount()
+ \fn void QAxis::shadesColorChanged(QColor)
+ Emitted if the \a color of the axis shades is changed.
*/
/*!
- \fn QChartAxisCategories* QAxis::categories()
- \brief Returns pointer to the list of categories which correspond to the values on the axis.
+ \fn void QAxis::shadesBorderColorChanged(QColor)
+ Emitted if the border \a color of the axis shades is changed.
*/
/*!
- \fn void QAxis::ticksCountChanged(int count)
- \brief Emits the new \a count of ticks on the axis
- Signal is emitted when the number of the ticks on the axis has been changed to a different value.
- Parementer count\a count is the new number of ticks on the axis.
+ \fn void QAxis::ticksCountChanged(int count)
+ \brief Emits the new \a count of ticks on the axis
+ Signal is emitted when the number of the ticks on the axis has been changed to a different value.
+ Parementer count\a count is the new number of ticks on the axis.
*/
/*!
- Constructs new axis object which is a child of \a parent. Ownership is taken by
- QChart when axis added.
+ \fn void QAxis::niceNumbersEnabledChanged(bool)
+ Nice numbers algorithm was \a enabled or disabled.
*/
+/*!
+ Constructs new axis object which is a child of \a parent. Ownership is taken by
+ QChart when axis added.
+*/
QAxis::QAxis(QObject *parent) : QObject(parent),
d_ptr(new QAxisPrivate(this))
{
@@ -182,7 +248,7 @@ d_ptr(new QAxisPrivate(this))
}
/*!
- Destructor of the axis object. When axis is added to chart, chart object takes ownership.
+ Destructor of the axis object. When axis is added to chart, chart object takes ownership.
*/
QAxis::~QAxis()
@@ -200,11 +266,29 @@ void QAxis::setAxisPen(const QPen &pen)
}
}
+/*!
+ Returns pen used to draw axis and ticks.
+*/
QPen QAxis::axisPen() const
{
return d_ptr->m_axisPen;
}
+void QAxis::setAxisPenColor(QColor color)
+{
+ QPen p = d_ptr->m_axisPen;
+ if (p.color() != color) {
+ p.setColor(color);
+ setAxisPen(p);
+ emit colorChanged(color);
+ }
+}
+
+QColor QAxis::axisPenColor() const
+{
+ return d_ptr->m_axisPen.color();
+}
+
/*!
Sets if axis and ticks are \a visible.
*/
@@ -213,6 +297,7 @@ void QAxis::setAxisVisible(bool visible)
if (d_ptr->m_axisVisible != visible) {
d_ptr->m_axisVisible = visible;
emit d_ptr->updated();
+ emit visibleChanged(visible);
}
}
@@ -221,14 +306,12 @@ bool QAxis::isAxisVisible() const
return d_ptr->m_axisVisible;
}
-/*!
- Sets if grid line is \a visible.
- */
void QAxis::setGridLineVisible(bool visible)
{
if (d_ptr->m_gridLineVisible != visible) {
d_ptr->m_gridLineVisible = visible;
emit d_ptr->updated();
+ emit gridVisibleChanged(visible);
}
}
@@ -236,9 +319,10 @@ bool QAxis::isGridLineVisible() const
{
return d_ptr->m_gridLineVisible;
}
+
/*!
Sets \a pen used to draw grid line.
- */
+*/
void QAxis::setGridLinePen(const QPen &pen)
{
if (d_ptr->m_gridLinePen != pen) {
@@ -247,6 +331,9 @@ void QAxis::setGridLinePen(const QPen &pen)
}
}
+/*!
+ Returns pen used to draw grid.
+*/
QPen QAxis::gridLinePen() const
{
return d_ptr->m_gridLinePen;
@@ -257,6 +344,7 @@ void QAxis::setLabelsVisible(bool visible)
if (d_ptr->m_labelsVisible != visible) {
d_ptr->m_labelsVisible = visible;
emit d_ptr->updated();
+ emit labelsVisibleChanged(visible);
}
}
@@ -264,9 +352,10 @@ bool QAxis::labelsVisible() const
{
return d_ptr->m_labelsVisible;
}
+
/*!
Sets \a pen used to draw labels.
- */
+*/
void QAxis::setLabelsPen(const QPen &pen)
{
if (d_ptr->m_labelsPen != pen) {
@@ -275,6 +364,9 @@ void QAxis::setLabelsPen(const QPen &pen)
}
}
+/*!
+ Returns the pen used to labels.
+*/
QPen QAxis::labelsPen() const
{
return d_ptr->m_labelsPen;
@@ -291,6 +383,9 @@ void QAxis::setLabelsBrush(const QBrush &brush)
}
}
+/*!
+ Returns brush used to draw labels.
+*/
QBrush QAxis::labelsBrush() const
{
return d_ptr->m_labelsBrush;
@@ -298,7 +393,7 @@ QBrush QAxis::labelsBrush() const
/*!
Sets \a font used to draw labels.
- */
+*/
void QAxis::setLabelsFont(const QFont &font)
{
if (d_ptr->m_labelsFont != font) {
@@ -307,19 +402,20 @@ void QAxis::setLabelsFont(const QFont &font)
}
}
+/*!
+ Returns font used to draw labels.
+*/
QFont QAxis::labelsFont() const
{
return d_ptr->m_labelsFont;
}
-/*!
- Sets \a angle for all the labels on given axis.
- */
void QAxis::setLabelsAngle(int angle)
{
if (d_ptr->m_labelsAngle != angle) {
d_ptr->m_labelsAngle = angle;
emit d_ptr->updated();
+ emit labelsAngleChanged(angle);
}
}
@@ -328,14 +424,27 @@ int QAxis::labelsAngle() const
return d_ptr->m_labelsAngle;
}
-/*!
- Sets if shades are \a visible.
- */
+void QAxis::setLabelsColor(QColor color)
+{
+ QBrush b = d_ptr->m_labelsBrush;
+ if (b.color() != color) {
+ b.setColor(color);
+ setLabelsBrush(b);
+ emit labelsColorChanged(color);
+ }
+}
+
+QColor QAxis::labelsColor() const
+{
+ return d_ptr->m_labelsBrush.color();
+}
+
void QAxis::setShadesVisible(bool visible)
{
if (d_ptr->m_shadesVisible != visible) {
d_ptr->m_shadesVisible = visible;
emit d_ptr->updated();
+ emit shadesVisibleChanged(visible);
}
}
@@ -346,7 +455,7 @@ bool QAxis::shadesVisible() const
/*!
Sets \a pen used to draw shades.
- */
+*/
void QAxis::setShadesPen(const QPen &pen)
{
if (d_ptr->m_shadesPen != pen) {
@@ -355,6 +464,9 @@ void QAxis::setShadesPen(const QPen &pen)
}
}
+/*!
+ Returns pen used to draw shades.
+*/
QPen QAxis::shadesPen() const
{
return d_ptr->m_shadesPen;
@@ -362,34 +474,46 @@ QPen QAxis::shadesPen() const
/*!
Sets \a brush used to draw shades.
- */
+*/
void QAxis::setShadesBrush(const QBrush &brush)
{
if (d_ptr->m_shadesBrush != brush) {
d_ptr->m_shadesBrush = brush;
emit d_ptr->updated();
- }
+ emit shadesColorChanged(brush.color());
+ }
}
+/*!
+ \brief Returns brush used to draw shades.
+*/
QBrush QAxis::shadesBrush() const
{
return d_ptr->m_shadesBrush;
}
-/*!
- Sets \a opacity of the shades.
- */
-void QAxis::setShadesOpacity(qreal opacity)
+void QAxis::setShadesColor(QColor color)
{
- if (d_ptr->m_shadesOpacity != opacity) {
- d_ptr->m_shadesOpacity=opacity;
- emit d_ptr->updated();
- }
+ QBrush b = d_ptr->m_shadesBrush;
+ b.setColor(color);
+ setShadesBrush(b);
+}
+
+QColor QAxis::shadesColor() const
+{
+ return d_ptr->m_shadesBrush.color();
+}
+
+void QAxis::setShadesBorderColor(QColor color)
+{
+ QPen p = d_ptr->m_shadesPen;
+ p.setColor(color);
+ setShadesPen(p);
}
-qreal QAxis::shadesOpacity() const
+QColor QAxis::shadesBorderColor() const
{
- return d_ptr->m_shadesOpacity;
+ return d_ptr->m_shadesPen.color();
}
void QAxis::setMin(qreal min)
@@ -414,7 +538,7 @@ qreal QAxis::max() const
/*!
Sets range from \a min to \a max on the axis.
- */
+*/
void QAxis::setRange(qreal min, qreal max)
{
bool changed = false;
@@ -438,7 +562,7 @@ void QAxis::setRange(qreal min, qreal max)
/*!
Sets \a count for ticks on the axis.
- */
+*/
void QAxis::setTicksCount(int count)
{
if (d_ptr->m_ticksCount != count) {
@@ -448,6 +572,10 @@ void QAxis::setTicksCount(int count)
}
}
+/*!
+ \fn int QAxis::ticksCount() const
+ Return number of ticks on the axis
+*/
int QAxis::ticksCount() const
{
return d_ptr->m_ticksCount;
@@ -455,7 +583,7 @@ int QAxis::ticksCount() const
/*!
Sets axis, shades, labels and grid lines to be visible.
- */
+*/
void QAxis::show()
{
d_ptr->m_axisVisible=true;
@@ -467,7 +595,7 @@ void QAxis::show()
/*!
Sets axis, shades, labels and grid lines to not be visible.
- */
+*/
void QAxis::hide()
{
d_ptr->m_axisVisible = false;
@@ -477,20 +605,15 @@ void QAxis::hide()
emit d_ptr->updated();
}
-/*!
- Sets the nice numbers state to \a enable
-*/
void QAxis::setNiceNumbersEnabled(bool enable)
{
if (d_ptr->m_niceNumbers != enable){
d_ptr->m_niceNumbers = enable;
emit d_ptr->changed(d_ptr->m_min, d_ptr->m_max, d_ptr->m_ticksCount, d_ptr->m_niceNumbers);
+ emit niceNumbersEnabledChanged(enable);
}
}
-/*!
- Returns whether nice numbers are enabled or not.
-*/
bool QAxis::niceNumbersEnabled() const
{
return d_ptr->m_niceNumbers;
@@ -504,17 +627,18 @@ QAxisCategories* QAxis::categories()
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
QAxisPrivate::QAxisPrivate(QAxis* q):
-q_ptr(q),
-m_axisVisible(true),
-m_gridLineVisible(true),
-m_labelsVisible(true),
-m_labelsAngle(0),
-m_shadesVisible(false),
-m_shadesOpacity(1.0),
-m_min(0),
-m_max(0),
-m_ticksCount(5),
-m_niceNumbers(false)
+ q_ptr(q),
+ m_axisVisible(true),
+ m_gridLineVisible(true),
+ m_labelsVisible(true),
+ m_labelsAngle(0),
+ m_shadesVisible(false),
+ m_shadesBrush(Qt::SolidPattern),
+ m_shadesOpacity(1.0),
+ m_min(0),
+ m_max(0),
+ m_ticksCount(5),
+ m_niceNumbers(false)
{
}
@@ -530,7 +654,9 @@ void QAxisPrivate::handleAxisRangeChanged(qreal min, qreal max,int count)
q_ptr->setTicksCount(count);
}
+QTCOMMERCIALCHART_END_NAMESPACE
+
+QTCOMMERCIALCHART_USE_NAMESPACE
+
#include "moc_qaxis.cpp"
#include "moc_qaxis_p.cpp"
-
-QTCOMMERCIALCHART_END_NAMESPACE
diff --git a/src/axis/qaxis.h b/src/axis/qaxis.h
index 1e80c7c..a2651a4 100644
--- a/src/axis/qaxis.h
+++ b/src/axis/qaxis.h
@@ -33,9 +33,19 @@ class QAxisPrivate;
class QTCOMMERCIALCHART_EXPORT QAxis : public QObject
{
Q_OBJECT
- Q_PROPERTY(bool labelsVisible READ labelsVisible WRITE setLabelsVisible)
+ Q_PROPERTY(bool visible READ isAxisVisible WRITE setAxisVisible NOTIFY visibleChanged)
+ Q_PROPERTY(QColor color READ axisPenColor WRITE setAxisPenColor NOTIFY colorChanged)
+ Q_PROPERTY(bool labelsVisible READ labelsVisible WRITE setLabelsVisible NOTIFY labelsVisibleChanged)
+ Q_PROPERTY(int labelsAngle READ labelsAngle WRITE setLabelsAngle NOTIFY labelsAngleChanged)
+ Q_PROPERTY(QColor labelsColor READ labelsColor WRITE setLabelsColor NOTIFY labelsColorChanged)
+ Q_PROPERTY(bool gridVisible READ isGridLineVisible WRITE setGridLineVisible NOTIFY gridVisibleChanged)
+ Q_PROPERTY(bool shadesVisible READ shadesVisible WRITE setShadesVisible NOTIFY shadesVisibleChanged)
+ Q_PROPERTY(QColor shadesColor READ shadesColor WRITE setShadesColor NOTIFY shadesColorChanged)
+ Q_PROPERTY(QColor shadesBorderColor READ shadesBorderColor WRITE setShadesBorderColor NOTIFY shadesBorderColorChanged)
Q_PROPERTY(qreal min READ min WRITE setMin)
Q_PROPERTY(qreal max READ max WRITE setMax)
+ Q_PROPERTY(int ticksCount READ ticksCount WRITE setTicksCount NOTIFY ticksCountChanged)
+ Q_PROPERTY(bool niceNumbersEnabled READ niceNumbersEnabled WRITE setNiceNumbersEnabled NOTIFY niceNumbersEnabledChanged)
public:
@@ -47,6 +57,8 @@ public:
void setAxisVisible(bool visible = true);
void setAxisPen(const QPen &pen);
QPen axisPen() const;
+ void setAxisPenColor(QColor color);
+ QColor axisPenColor() const;
//grid handling
bool isGridLineVisible() const;
@@ -65,6 +77,8 @@ public:
QFont labelsFont() const;
void setLabelsAngle(int angle);
int labelsAngle() const;
+ void setLabelsColor(QColor color);
+ QColor labelsColor() const;
//shades handling
bool shadesVisible() const;
@@ -73,8 +87,10 @@ public:
QPen shadesPen() const;
void setShadesBrush(const QBrush &brush);
QBrush shadesBrush() const;
- void setShadesOpacity(qreal opacity);
- qreal shadesOpacity() const;
+ void setShadesColor(QColor color);
+ QColor shadesColor() const;
+ void setShadesBorderColor(QColor color);
+ QColor shadesBorderColor() const;
//range handling
void setMin(qreal min);
@@ -96,14 +112,24 @@ public:
void hide();
Q_SIGNALS:
+ void visibleChanged(bool visible);
+ void labelsVisibleChanged(bool visible);
+ void gridVisibleChanged(bool visible);
void minChanged(qreal min);
void maxChanged(qreal max);
void rangeChanged(qreal min, qreal max);
- void ticksCountChanged(int count);
+ void colorChanged(QColor color);
+ void labelsColorChanged(QColor color);
+ void labelsAngleChanged(int angle);
+ void shadesVisibleChanged(bool visible);
+ void shadesColorChanged(QColor color);
+ void shadesBorderColorChanged(QColor color);
+ void ticksCountChanged(int count);
+ void niceNumbersEnabledChanged(bool enabled);
private:
QScopedPointer d_ptr;
- Q_DISABLE_COPY(QAxis);
+ Q_DISABLE_COPY(QAxis)
friend class ChartDataSet;
friend class ChartAxis;
};
diff --git a/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor.qml b/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor.qml
index 60b57fe..069f274 100644
--- a/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor.qml
+++ b/tests/qmlchartproperties/qml/qmlchartproperties/ChartEditor.qml
@@ -29,7 +29,9 @@ Flow {
property variant series // TODO: rename to chart
onSeriesChanged: {
- legendConnections.target = series.legend
+ legendConnections.target = series.legend;
+ axisXConnections.target = series.axisX;
+ axisYConnections.target = series.axisY;
}
Connections {
@@ -50,6 +52,38 @@ Flow {
onVisibleChanged: console.log("legend.onVisibleChanged: " + series.legend.visible);
}
+ Connections {
+ id: axisXConnections
+ ignoreUnknownSignals: true
+ onColorChanged: console.log("axisX.onColorChanged: " + color);
+ onLabelsVisibleChanged: console.log("axisX.onLabelsVisibleChanged: " + visible);
+ onLabelsColorChanged: console.log("axisX.onLabelsColorChanged: " + color);
+ onLabelsAngleChanged: console.log("axisX.onLabelsAngleChanged: " + angle);
+ onVisibleChanged: console.log("axisX.onVisibleChanged: " + visible);
+ onGridVisibleChanged: console.log("axisX.onGridVisibleChanged: " + visible);
+ onShadesVisibleChanged: console.log("axisX.onShadesVisibleChanged: " + visible);
+ onShadesColorChanged: console.log("axisX.onShadesColorChanged: " + color);
+ onShadesBorderColorChanged: console.log("axisX.onShadesBorderColorChanged: " + color);
+ onNiceNumbersEnabledChanged: console.log("axisX.onNiceNumbersEnabledChanged: " + enabled);
+ onTicksCountChanged: console.log("axisX.onTicksCountChanged: " + count);
+ }
+
+ Connections {
+ id: axisYConnections
+ ignoreUnknownSignals: true
+ onColorChanged: console.log("axisY.onColorChanged: " + color);
+ onLabelsVisibleChanged: console.log("axisY.onLabelsVisibleChanged: " + visible);
+ onLabelsColorChanged: console.log("axisY.onLabelsColorChanged: " + color);
+ onLabelsAngleChanged: console.log("axisY.onLabelsAngleChanged: " + angle);
+ onVisibleChanged: console.log("axisY.onVisibleChanged: " + visible);
+ onGridVisibleChanged: console.log("axisY.onGridVisibleChanged: " + visible);
+ onShadesVisibleChanged: console.log("axisY.onShadesVisibleChanged: " + visible);
+ onShadesColorChanged: console.log("axisY.onShadesColorChanged: " + color);
+ onShadesBorderColorChanged: console.log("axisY.onShadesBorderColorChanged: " + color);
+ onNiceNumbersEnabledChanged: console.log("axisY.onNiceNumbersEnabledChanged: " + enabled);
+ onTicksCountChanged: console.log("axisY.onTicksCountChanged: " + count);
+ }
+
Button {
text: "visible"
onClicked: series.visible = !series.visible;
@@ -63,6 +97,22 @@ Flow {
onClicked: series.theme--;
}
Button {
+ text: "animation opt +"
+ onClicked: series.animationOptions++;
+ }
+ Button {
+ text: "animation opt -"
+ onClicked: series.animationOptions--;
+ }
+ Button {
+ text: "title color"
+ onClicked: series.titleColor = main.nextColor();
+ }
+ Button {
+ text: "background color"
+ onClicked: series.backgroundColor = main.nextColor();
+ }
+ Button {
text: "legend top"
onClicked: series.legend.alignment ^= Qt.AlignTop;
}
@@ -83,19 +133,107 @@ Flow {
onClicked: series.legend.visible = !series.legend.visible;
}
Button {
- text: "animation opt +"
- onClicked: series.animationOptions++;
+ text: "axis X nice nmb"
+ onClicked: series.axisX.niceNumbersEnabled = !series.axisX.niceNumbersEnabled;
}
Button {
- text: "animation opt -"
- onClicked: series.animationOptions--;
+ text: "axis X visible"
+ onClicked: series.axisX.visible = !series.axisX.visible;
}
Button {
- text: "title color"
- onClicked: series.titleColor = main.nextColor();
+ text: "axis X grid visible"
+ onClicked: series.axisX.gridVisible = !series.axisX.gridVisible;
}
Button {
- text: "background color"
- onClicked: series.backgroundColor = main.nextColor();
+ text: "axis X labels visible"
+ onClicked: series.axisX.labelsVisible = !series.axisX.labelsVisible;
+ }
+ Button {
+ text: "axis X color"
+ onClicked: series.axisX.color = main.nextColor();
+ }
+ Button {
+ text: "axis X labels color"
+ onClicked: series.axisX.labelsColor = main.nextColor();
+ }
+ Button {
+ text: "axis X labels angle +"
+ onClicked: series.axisX.labelsAngle += 5;
+ }
+ Button {
+ text: "axis X labels angle -"
+ onClicked: series.axisX.labelsAngle -= 5;
+ }
+ Button {
+ text: "axis X shades visible"
+ onClicked: series.axisX.shadesVisible = !series.axisX.shadesVisible;
+ }
+ Button {
+ text: "axis X shades color"
+ onClicked: series.axisX.shadesColor = main.nextColor();
+ }
+ Button {
+ text: "axis X shades bcolor"
+ onClicked: series.axisX.shadesBorderColor = main.nextColor();
+ }
+ Button {
+ text: "axis X ticks count +"
+ onClicked: series.axisX.ticksCount++;
+ }
+ Button {
+ text: "axis X ticks count -"
+ onClicked: series.axisX.ticksCount--;
+ }
+ Button {
+ text: "axis Y nice nmb"
+ onClicked: series.axisY.niceNumbersEnabled = !series.axisY.niceNumbersEnabled;
+ }
+ Button {
+ text: "axis Y visible"
+ onClicked: series.axisY.visible = !series.axisY.visible;
+ }
+ Button {
+ text: "axis Y grid visible"
+ onClicked: series.axisY.gridVisible = !series.axisY.gridVisible;
+ }
+ Button {
+ text: "axis Y labels visible"
+ onClicked: series.axisY.labelsVisible = !series.axisY.labelsVisible;
+ }
+ Button {
+ text: "axis Y color"
+ onClicked: series.axisY.color = main.nextColor();
+ }
+ Button {
+ text: "axis Y labels color"
+ onClicked: series.axisY.labelsColor = main.nextColor();
+ }
+ Button {
+ text: "axis Y labels angle +"
+ onClicked: series.axisY.labelsAngle += 5;
+ }
+ Button {
+ text: "axis Y labels angle -"
+ onClicked: series.axisY.labelsAngle -= 5;
+ }
+ Button {
+ text: "axis Y shades visible"
+ onClicked: series.axisY.shadesVisible = !series.axisY.shadesVisible;
+ }
+ Button {
+ text: "axis Y shades color"
+ onClicked: series.axisY.shadesColor = main.nextColor();
+ }
+ Button {
+ text: "axis Y shades bcolor"
+ onClicked: series.axisY.shadesBorderColor = main.nextColor();
+ }
+ Button {
+ text: "axis Y ticks count +"
+ onClicked: series.axisY.ticksCount++;
+ }
+ Button {
+ text: "axis Y ticks count -"
+ onClicked: series.axisY.ticksCount--;
}
}