##// END OF EJS Templates
Fix category axis shades and labels...
Fix category axis shades and labels The shade is cropped to the grid rectangle when range is set so that category spans over grid. Also the label of a category outside range is hidden. Change-Id: I09bba2951bc230053bf62cb382021a438fdc2b95 Task-number: QTRD-3443 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>

File last commit:

r2740:377e4516d036
r2760:a803e4e9381b
Show More
declarativeareaseries.h
92 lines | 4.0 KiB | text/x-c | CLexer
/ src / chartsqml2 / declarativeareaseries.h
/****************************************************************************
**
** Copyright (C) 2014 Digia Plc
** All rights reserved.
** For any questions to Digia, please use contact form at http://qt.io
**
** This file is part of the Qt Charts module.
**
** Licensees holding valid commercial license for Qt may use this file in
** accordance with the Qt License Agreement provided with the Software
** or, alternatively, in accordance with the terms contained in a written
** agreement between you and Digia.
**
** If you have questions regarding the use of this file, please use
** contact form at http://qt.io
**
****************************************************************************/
#ifndef DECLARATIVEAREASERIES_H
#define DECLARATIVEAREASERIES_H
#include <QtCharts/QAreaSeries>
#include "declarativeaxes.h"
QT_CHARTS_BEGIN_NAMESPACE
class DeclarativeLineSeries;
class DeclarativeAreaSeries : public QAreaSeries
{
Q_OBJECT
Q_PROPERTY(DeclarativeLineSeries *upperSeries READ upperSeries WRITE setUpperSeries)
Q_PROPERTY(DeclarativeLineSeries *lowerSeries READ lowerSeries WRITE setLowerSeries)
Q_PROPERTY(QAbstractAxis *axisX READ axisX WRITE setAxisX NOTIFY axisXChanged REVISION 1)
Q_PROPERTY(QAbstractAxis *axisY READ axisY WRITE setAxisY NOTIFY axisYChanged REVISION 1)
Q_PROPERTY(QAbstractAxis *axisXTop READ axisXTop WRITE setAxisXTop NOTIFY axisXTopChanged REVISION 2)
Q_PROPERTY(QAbstractAxis *axisYRight READ axisYRight WRITE setAxisYRight NOTIFY axisYRightChanged REVISION 2)
Q_PROPERTY(QAbstractAxis *axisAngular READ axisAngular WRITE setAxisAngular NOTIFY axisAngularChanged REVISION 3)
Q_PROPERTY(QAbstractAxis *axisRadial READ axisRadial WRITE setAxisRadial NOTIFY axisRadialChanged REVISION 3)
Q_PROPERTY(qreal borderWidth READ borderWidth WRITE setBorderWidth NOTIFY borderWidthChanged REVISION 1)
Q_PROPERTY(QString brushFilename READ brushFilename WRITE setBrushFilename NOTIFY brushFilenameChanged REVISION 4)
Q_PROPERTY(QBrush brush READ brush WRITE setBrush NOTIFY brushChanged REVISION 4)
public:
explicit DeclarativeAreaSeries(QObject *parent = 0);
void setUpperSeries(DeclarativeLineSeries *series);
DeclarativeLineSeries *upperSeries() const;
void setLowerSeries(DeclarativeLineSeries *series);
DeclarativeLineSeries *lowerSeries() const;
QAbstractAxis *axisX() { return m_axes->axisX(); }
void setAxisX(QAbstractAxis *axis) { m_axes->setAxisX(axis); }
QAbstractAxis *axisY() { return m_axes->axisY(); }
void setAxisY(QAbstractAxis *axis) { m_axes->setAxisY(axis); }
QAbstractAxis *axisXTop() { return m_axes->axisXTop(); }
void setAxisXTop(QAbstractAxis *axis) { m_axes->setAxisXTop(axis); }
QAbstractAxis *axisYRight() { return m_axes->axisYRight(); }
void setAxisYRight(QAbstractAxis *axis) { m_axes->setAxisYRight(axis); }
QAbstractAxis *axisAngular() { return m_axes->axisX(); }
void setAxisAngular(QAbstractAxis *axis) { m_axes->setAxisX(axis); }
QAbstractAxis *axisRadial() { return m_axes->axisY(); }
void setAxisRadial(QAbstractAxis *axis) { m_axes->setAxisY(axis); }
qreal borderWidth() const;
void setBorderWidth(qreal borderWidth);
QString brushFilename() const;
void setBrushFilename(const QString &brushFilename);
void setBrush(const QBrush &brush);
QBrush brush() const;
Q_SIGNALS:
Q_REVISION(1) void axisXChanged(QAbstractAxis *axis);
Q_REVISION(1) void axisYChanged(QAbstractAxis *axis);
Q_REVISION(1) void borderWidthChanged(qreal width);
Q_REVISION(2) void axisXTopChanged(QAbstractAxis *axis);
Q_REVISION(2) void axisYRightChanged(QAbstractAxis *axis);
Q_REVISION(3) void axisAngularChanged(QAbstractAxis *axis);
Q_REVISION(3) void axisRadialChanged(QAbstractAxis *axis);
Q_REVISION(4) void brushChanged();
Q_REVISION(4) void brushFilenameChanged(const QString &brushFilename);
private Q_SLOTS:
void handleBrushChanged();
public:
DeclarativeAxes *m_axes;
private:
QString m_brushFilename;
QImage m_brushImage;
};
QT_CHARTS_END_NAMESPACE
#endif // DECLARATIVEAREASERIES_H