##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Fix long label visibility...
Fix long label visibility The detection of overlapping items has been corrected. By default, item text is truncated thus only the ellipsis can overlap. Change-Id: I856f440184006b91c23e44d63ddef5b1796f38a1 Task-number: QTRD-3310 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Titta Heikkala - - Load All Authors

File last commit:

r2688:bdd8266c9c7d
r2706:11c2ee82f698
Show More
declarativeareaseries.cpp
115 lines | 3.6 KiB | text/x-c | CppLexer
/ plugins / declarative / declarativeareaseries.cpp
History | Source | Raw |Copy content |Copy permalink
Tero Ahola
Added area series to QML api
 r847 /****************************************************************************
**
Titta Heikkala
Update copyright year...
 r2688 ** Copyright (C) 2014 Digia Plc
Tero Ahola
Added area series to QML api
 r847 ** All rights reserved.
** For any questions to Digia, please use contact form at http://qt.digia.com
**
Miikka Heikkinen
Qt Commercial -> Qt Enterprise...
 r2574 ** This file is part of the Qt Enterprise Charts Add-on.
Tero Ahola
Added area series to QML api
 r847 **
** $QT_BEGIN_LICENSE$
Miikka Heikkinen
Qt Commercial -> Qt Enterprise...
 r2574 ** Licensees holding valid Qt Enterprise licenses may use this file in
** accordance with the Qt Enterprise License Agreement provided with the
Tero Ahola
Added area series to QML api
 r847 ** 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.digia.com
** $QT_END_LICENSE$
**
****************************************************************************/
#include "declarativeareaseries.h"
Tero Ahola
Removed unneeded includes from declarative plugin
 r1831 #include "declarativelineseries.h"
Tero Ahola
Added area series to QML api
 r847
QTCOMMERCIALCHART_BEGIN_NAMESPACE
DeclarativeAreaSeries::DeclarativeAreaSeries(QObject *parent) :
Tero Ahola
Refactored QML axis handling
 r1813 QAreaSeries(parent),
Tero Ahola
Added axisXTop and axisYRight properties to QML series APIs
 r2296 m_axes(new DeclarativeAxes(this))
Tero Ahola
Added area series to QML api
 r847 {
Tero Ahola
Added axisXTop and axisYRight properties to QML series APIs
 r2296 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*)));
Miikka Heikkinen
Add Polar chart support...
 r2483 connect(m_axes, SIGNAL(axisXChanged(QAbstractAxis*)), this, SIGNAL(axisAngularChanged(QAbstractAxis*)));
connect(m_axes, SIGNAL(axisYChanged(QAbstractAxis*)), this, SIGNAL(axisRadialChanged(QAbstractAxis*)));
Titta Heikkala
Add possibility to set brush image via QML API...
 r2681 connect(this, SIGNAL(brushChanged()), this, SLOT(handleBrushChanged()));
Tero Ahola
Added area series to QML api
 r847 }
Jani Honkonen
coding style fixes for plugins
 r2101 void DeclarativeAreaSeries::setUpperSeries(DeclarativeLineSeries *series)
Tero Ahola
Added area series to QML api
 r847 {
Tero Ahola
Separated series model stuff from data api in QML examples
 r1202 QAreaSeries::setUpperSeries(series);
Tero Ahola
Added area series to QML api
 r847 }
Jani Honkonen
coding style fixes for plugins
 r2101 DeclarativeLineSeries *DeclarativeAreaSeries::upperSeries() const
Tero Ahola
Now using only one declarative model
 r1169 {
Tero Ahola
Separated series model stuff from data api in QML examples
 r1202 return qobject_cast<DeclarativeLineSeries *>(QAreaSeries::upperSeries());
Tero Ahola
Now using only one declarative model
 r1169 }
Jani Honkonen
coding style fixes for plugins
 r2101 void DeclarativeAreaSeries::setLowerSeries(DeclarativeLineSeries *series)
Tero Ahola
Now using only one declarative model
 r1169 {
Tero Ahola
Separated series model stuff from data api in QML examples
 r1202 QAreaSeries::setLowerSeries(series);
Tero Ahola
Now using only one declarative model
 r1169 }
Jani Honkonen
coding style fixes for plugins
 r2101 DeclarativeLineSeries *DeclarativeAreaSeries::lowerSeries() const
Tero Ahola
Added area series to QML api
 r847 {
Tero Ahola
Separated series model stuff from data api in QML examples
 r1202 return qobject_cast<DeclarativeLineSeries *>(QAreaSeries::lowerSeries());
Tero Ahola
Added area series to QML api
 r847 }
Tero Ahola
Added missing QML properties to AreaSeries
 r1906 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);
}
}
Titta Heikkala
Add possibility to set brush image via QML API...
 r2681 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();
}
Tero Ahola
Added area series to QML api
 r847 #include "moc_declarativeareaseries.cpp"
QTCOMMERCIALCHART_END_NAMESPACE