##// 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.cpp
113 lines | 3.5 KiB | text/x-c | CppLexer
/ src / chartsqml2 / declarativeareaseries.cpp
/****************************************************************************
**
** 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
**
****************************************************************************/
#include "declarativeareaseries.h"
#include "declarativelineseries.h"
QT_CHARTS_BEGIN_NAMESPACE
DeclarativeAreaSeries::DeclarativeAreaSeries(QObject *parent) :
QAreaSeries(parent),
m_axes(new DeclarativeAxes(this))
{
connect(m_axes, SIGNAL(axisXChanged(QAbstractAxis*)), this, SIGNAL(axisXChanged(QAbstractAxis*)));
connect(m_axes, SIGNAL(axisYChanged(QAbstractAxis*)), this, SIGNAL(axisYChanged(QAbstractAxis*)));
connect(m_axes, SIGNAL(axisXTopChanged(QAbstractAxis*)), this, SIGNAL(axisXTopChanged(QAbstractAxis*)));
connect(m_axes, SIGNAL(axisYRightChanged(QAbstractAxis*)), this, SIGNAL(axisYRightChanged(QAbstractAxis*)));
connect(m_axes, SIGNAL(axisXChanged(QAbstractAxis*)), this, SIGNAL(axisAngularChanged(QAbstractAxis*)));
connect(m_axes, SIGNAL(axisYChanged(QAbstractAxis*)), this, SIGNAL(axisRadialChanged(QAbstractAxis*)));
connect(this, SIGNAL(brushChanged()), this, SLOT(handleBrushChanged()));
}
void DeclarativeAreaSeries::setUpperSeries(DeclarativeLineSeries *series)
{
QAreaSeries::setUpperSeries(series);
}
DeclarativeLineSeries *DeclarativeAreaSeries::upperSeries() const
{
return qobject_cast<DeclarativeLineSeries *>(QAreaSeries::upperSeries());
}
void DeclarativeAreaSeries::setLowerSeries(DeclarativeLineSeries *series)
{
QAreaSeries::setLowerSeries(series);
}
DeclarativeLineSeries *DeclarativeAreaSeries::lowerSeries() const
{
return qobject_cast<DeclarativeLineSeries *>(QAreaSeries::lowerSeries());
}
qreal DeclarativeAreaSeries::borderWidth() const
{
return pen().widthF();
}
void DeclarativeAreaSeries::setBorderWidth(qreal width)
{
if (width != pen().widthF()) {
QPen p = pen();
p.setWidthF(width);
setPen(p);
emit borderWidthChanged(width);
}
}
QString DeclarativeAreaSeries::brushFilename() const
{
return m_brushFilename;
}
void DeclarativeAreaSeries::setBrushFilename(const QString &brushFilename)
{
QImage brushImage(brushFilename);
if (QAreaSeries::brush().textureImage() != brushImage) {
QBrush brush = QAreaSeries::brush();
brush.setTextureImage(brushImage);
QAreaSeries::setBrush(brush);
m_brushFilename = brushFilename;
m_brushImage = brushImage;
emit brushFilenameChanged(brushFilename);
}
}
void DeclarativeAreaSeries::handleBrushChanged()
{
// If the texture image of the brush has changed along the brush
// the brush file name needs to be cleared.
if (!m_brushFilename.isEmpty() && QAreaSeries::brush().textureImage() != m_brushImage) {
m_brushFilename.clear();
emit brushFilenameChanged(QString(""));
}
}
void DeclarativeAreaSeries::setBrush(const QBrush &brush)
{
QAreaSeries::setBrush(brush);
emit brushChanged();
}
QBrush DeclarativeAreaSeries::brush() const
{
return QAreaSeries::brush();
}
#include "moc_declarativeareaseries.cpp"
QT_CHARTS_END_NAMESPACE