##// END OF EJS Templates
Fix category axis label positioning....
Fix category axis label positioning. Labels are now centered on the visible portion of the category, if some part of the category is off-grid. If the label doesn't fit into the remaining part, it is not shown. Task-number: QTRD-1934 Reviewed-by: Mika Salmela

File last commit:

r2440:9df61547fec6
r2446:e5bdddebc98a
Show More
qchart.cpp
654 lines | 18.2 KiB | text/x-c | CppLexer
Michal Klocek
adds QChartView PIMPL, refactor public API
r746 /****************************************************************************
**
Miikka Heikkinen
Fixed the copyright year 2012 -> 2013
r2432 ** Copyright (C) 2013 Digia Plc
Michal Klocek
adds QChartView PIMPL, refactor public API
r746 ** All rights reserved.
** For any questions to Digia, please use contact form at http://qt.digia.com
**
** This file is part of the Qt Commercial Charts Add-on.
**
** $QT_BEGIN_LICENSE$
** Licensees holding valid Qt Commercial licenses may use this file in
** accordance with the Qt Commercial 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.digia.com
** $QT_END_LICENSE$
**
****************************************************************************/
Michal Klocek
adds missing files form previous commit
r12 #include "qchart.h"
Michal Klocek
Adds PIMPL to qchart
r740 #include "qchart_p.h"
Michal Klocek
Adds qlegend pimpl...
r950 #include "legendscroller_p.h"
#include "qlegend_p.h"
Michal Klocek
Changes QChartAxis -> QAxis
r1006 #include "chartbackground_p.h"
Michal Klocek
Refactors QAxis to QAbstractAxis...
r1541 #include "qabstractaxis.h"
Michal Klocek
Refactors layout:...
r2105 #include "chartlayout_p.h"
Michal Klocek
Refactors internals...
r2273 #include "charttheme_p.h"
#include "chartpresenter_p.h"
#include "chartdataset_p.h"
Tero Ahola
Integrated scatter type series...
r42 #include <QGraphicsScene>
Michal Klocek
Adds layout support for charts....
r115 #include <QGraphicsSceneResizeEvent>
Michal Klocek
adds missing files form previous commit
r12
Marek Rosa
Added some more documentation to QChart and QChartView
r277 QTCOMMERCIALCHART_BEGIN_NAMESPACE
/*!
Michal Klocek
Adds PIMPL to qchart
r740 \enum QChart::ChartTheme
Marek Rosa
Added some more documentation to QChart and QChartView
r277
Michal Klocek
Adds PIMPL to qchart
r740 This enum describes the theme used by the chart.
Marek Rosa
Added some more documentation to QChart and QChartView
r277
Tero Ahola
Removed default theme, now using light as the default
r853 \value ChartThemeLight The default theme
Michal Klocek
Adds PIMPL to qchart
r740 \value ChartThemeBlueCerulean
\value ChartThemeDark
\value ChartThemeBrownSand
\value ChartThemeBlueNcs
Tero Ahola
Added Icy Blue and High Contrast theme
r757 \value ChartThemeHighContrast
\value ChartThemeBlueIcy
Michal Klocek
Adds PIMPL to qchart
r740 */
Marek Rosa
Added some more documentation to QChart and QChartView
r277
Tero Ahola
QDoc for animation options in QChart
r302 /*!
Michal Klocek
Adds PIMPL to qchart
r740 \enum QChart::AnimationOption
Tero Ahola
QDoc for animation options in QChart
r302
Michal Klocek
Adds PIMPL to qchart
r740 For enabling/disabling animations. Defaults to NoAnimation.
Tero Ahola
QDoc for animation options in QChart
r302
Michal Klocek
Adds PIMPL to qchart
r740 \value NoAnimation
\value GridAxisAnimations
\value SeriesAnimations
\value AllAnimations
*/
Tero Ahola
QDoc for animation options in QChart
r302
Tero Ahola
Started documenting QChart
r264 /*!
Michal Klocek
Adds PIMPL to qchart
r740 \class QChart
\brief QtCommercial chart API.
Tero Ahola
Started documenting QChart
r264
Michal Klocek
Adds PIMPL to qchart
r740 QChart is a QGraphicsWidget that you can show in a QGraphicsScene. It manages the graphical
Jani Honkonen
Doc fixes
r1023 representation of different types of series and other chart related objects like
QAxis and QLegend. If you simply want to show a chart in a layout, you can use the
Michal Klocek
Adds PIMPL to qchart
r740 convenience class QChartView instead of QChart.
\sa QChartView
*/
Tero Ahola
Started documenting QChart
r264
Tero Ahola
Documented QChart properties
r1526 /*!
\property QChart::animationOptions
The animation \a options for the chart. Animations are enabled/disabled based on this setting.
*/
/*!
\property QChart::backgroundVisible
Whether the chart background is visible or not.
\sa setBackgroundBrush(), setBackgroundPen()
*/
/*!
\property QChart::dropShadowEnabled
If set to true, the background drop shadow effect is enabled. If set to false, it is disabled. Note that the drop
shadow effect depends on theme, which means the setting may be changed if you switch to another theme.
*/
/*!
sauimone
Updated QChart margins documentation
r1982 \property QChart::minimumMargins
Minimum margins between the plot area (axes) and the edge of the chart widget.
Tero Ahola
Documented QChart properties
r1526 */
Tero Ahola
Documented the new functionality in QChart
r2360 /*!
\property QChart::margins
Minimum between the plot area (axes) and the edge of the chart widget.
*/
Tero Ahola
Documented QChart properties
r1526 /*!
\property QChart::theme
Theme is a built-in collection of UI style related settings applied for all visual elements of a chart, like colors,
pens, brushes and fonts of series, axes, title and legend. \l {Chart themes demo} shows an example with a few
different themes.
Note: changing the theme will overwrite all customizations previously applied to the series.
*/
/*!
\property QChart::title
Title is the name (label) of a chart. It is shown as a headline on top of the chart.
*/
Tero Ahola
Started documenting QChart
r264 /*!
Michal Klocek
Adds PIMPL to qchart
r740 Constructs a chart object which is a child of a\a parent. Parameter \a wFlags is passed to the QGraphicsWidget constructor.
*/
Jani Honkonen
src folder: another massive victory for coding style police
r2131 QChart::QChart(QGraphicsItem *parent, Qt::WindowFlags wFlags)
: QGraphicsWidget(parent, wFlags),
Michal Klocek
Refactors internals...
r2273 d_ptr(new QChartPrivate(this))
Michal Klocek
adds missing files form previous commit
r12 {
Michal Klocek
Adds qlegend pimpl...
r950 d_ptr->m_legend = new LegendScroller(this);
Michal Klocek
Refactors internals...
r2273 setTheme(QChart::ChartThemeLight);
Michal Klocek
Refactors layout managment...
r1534 setLayout(d_ptr->m_presenter->layout());
Michal Klocek
adds missing files form previous commit
r12 }
Tero Ahola
Started documenting QChart
r264 /*!
Jani Honkonen
Doc fixes
r1023 Destroys the object and it's children, like series and axis objects added to it.
Michal Klocek
Adds PIMPL to qchart
r740 */
Tero Ahola
Started documenting QChart
r264 QChart::~QChart()
{
Michal Klocek
Refactors internals...
r2273 //start by deleting dataset, it will remove all series and axes
delete d_ptr->m_dataset;
d_ptr->m_dataset = 0;
Tero Ahola
Started documenting QChart
r264 }
Michal Klocek
adds missing files form previous commit
r12
Tero Ahola
Started documenting QChart
r264 /*!
sauimone
fixed documentation errors
r1575 Adds the \a series onto the chart and takes the ownership of the object.
Michal Klocek
Adds PIMPL to qchart
r740 If auto scaling is enabled, re-scales the axes the series is bound to (both the x axis and
the y axis).
Jani Honkonen
Add QChart::series() doc and tests
r1316
\sa removeSeries(), removeAllSeries()
Michal Klocek
Adds PIMPL to qchart
r740 */
Michal Klocek
Refactors QAxis to QAbstractAxis...
r1541 void QChart::addSeries(QAbstractSeries *series)
Michal Klocek
Refactors axis handling...
r223 {
Michal Klocek
Adds missing titleFont getter
r895 Q_ASSERT(series);
Michal Klocek
Refactors QAxis to QAbstractAxis...
r1541 d_ptr->m_dataset->addSeries(series);
Michal Klocek
Refactors axis handling...
r223 }
Tero Ahola
Integrated scatter type series...
r42
Marek Rosa
Added some documentation to QChart and QChartView
r274 /*!
Michal Klocek
Adds PIMPL to qchart
r740 Removes the \a series specified in a perameter from the QChartView.
It releses its ownership of the specified QChartSeries object.
It does not delete the pointed QChartSeries data object
\sa addSeries(), removeAllSeries()
*/
Tero Ahola
Renamed QSeries to QAbstractSeries
r988 void QChart::removeSeries(QAbstractSeries *series)
Michal Klocek
Refactors axis handling...
r223 {
Michal Klocek
Adds missing titleFont getter
r895 Q_ASSERT(series);
Michal Klocek
Adds PIMPL to qchart
r740 d_ptr->m_dataset->removeSeries(series);
Tero Ahola
Integrated scatter type series...
r42 }
Tero Ahola
Resizing of QGraphicItems now possible by resize signal from QChart
r48
Marek Rosa
Added some documentation to QChart and QChartView
r274 /*!
Michal Klocek
Adds PIMPL to qchart
r740 Removes all the QChartSeries that have been added to the QChartView
It also deletes the pointed QChartSeries data objects
\sa addSeries(), removeSeries()
*/
Michal Klocek
Adds RemoveAllSeries method to API
r258 void QChart::removeAllSeries()
{
Michal Klocek
Adds domains swap logic
r2284 foreach (QAbstractSeries *s , d_ptr->m_dataset->series()){
removeSeries(s);
delete s;
}
Michal Klocek
Adds RemoveAllSeries method to API
r258 }
Marek Rosa
QChart and QChartView now has some description for all the functions
r287 /*!
Michal Klocek
Adds PIMPL to qchart
r740 Sets the \a brush that is used for painting the background of the chart area.
*/
Jani Honkonen
src folder: another massive victory for coding style police
r2131 void QChart::setBackgroundBrush(const QBrush &brush)
Michal Klocek
Change background gradient to use ObjectBoundingMode...
r122 {
Michal Klocek
Refactors layout managment...
r1534 d_ptr->m_presenter->setBackgroundBrush(brush);
Michal Klocek
Change background gradient to use ObjectBoundingMode...
r122 }
Marek Rosa
Some more doc fixes and additions
r924 /*!
Gets the brush that is used for painting the background of the chart area.
*/
Michal Klocek
Adds force option to chartTheme...
r645 QBrush QChart::backgroundBrush() const
{
Michal Klocek
Refactors layout managment...
r1534 return d_ptr->m_presenter->backgroundBrush();
Michal Klocek
Adds force option to chartTheme...
r645 }
Marek Rosa
QChart and QChartView now has some description for all the functions
r287 /*!
Michal Klocek
Adds PIMPL to qchart
r740 Sets the \a pen that is used for painting the background of the chart area.
*/
Jani Honkonen
src folder: another massive victory for coding style police
r2131 void QChart::setBackgroundPen(const QPen &pen)
Michal Klocek
Change background gradient to use ObjectBoundingMode...
r122 {
Michal Klocek
Refactors layout managment...
r1534 d_ptr->m_presenter->setBackgroundPen(pen);
Michal Klocek
Change background gradient to use ObjectBoundingMode...
r122 }
Marek Rosa
Some more doc fixes and additions
r924 /*!
Gets the pen that is used for painting the background of the chart area.
*/
Michal Klocek
Adds force option to chartTheme...
r645 QPen QChart::backgroundPen() const
{
Michal Klocek
Refactors layout managment...
r1534 return d_ptr->m_presenter->backgroundPen();
Michal Klocek
Adds force option to chartTheme...
r645 }
Marek Rosa
Added some documentation to QChart and QChartView
r274 /*!
Michal Klocek
Adds PIMPL to qchart
r740 Sets the chart \a title. The description text that is drawn above the chart.
*/
Jani Honkonen
src folder: another massive victory for coding style police
r2131 void QChart::setTitle(const QString &title)
Michal Klocek
Add background to chart...
r69 {
Michal Klocek
Refactors layout managment...
r1534 d_ptr->m_presenter->setTitle(title);
Michal Klocek
Refactor animation to fit line,spline,scatter...
r476 }
/*!
Michal Klocek
Adds PIMPL to qchart
r740 Returns the chart title. The description text that is drawn above the chart.
*/
Michal Klocek
Adds force option to chartTheme...
r645 QString QChart::title() const
Michal Klocek
Refactor animation to fit line,spline,scatter...
r476 {
Michal Klocek
Refactors layout managment...
r1534 return d_ptr->m_presenter->title();
Michal Klocek
Adds font handling for chart's titile...
r192 }
Marek Rosa
Added some documentation to QChart and QChartView
r274 /*!
Marek Rosa
Some more doc fixes and additions
r924 Sets the \a font that is used for drawing the chart description text that is rendered above the chart.
Michal Klocek
Adds PIMPL to qchart
r740 */
Jani Honkonen
src folder: another massive victory for coding style police
r2131 void QChart::setTitleFont(const QFont &font)
Michal Klocek
Adds font handling for chart's titile...
r192 {
Michal Klocek
Refactors layout managment...
r1534 d_ptr->m_presenter->setTitleFont(font);
Michal Klocek
Add background to chart...
r69 }
Marek Rosa
Some more doc fixes and additions
r924 /*!
Gets the font that is used for drawing the chart description text that is rendered above the chart.
*/
Michal Klocek
Adds missing titleFont getter
r895 QFont QChart::titleFont() const
{
Michal Klocek
Refactors layout managment...
r1534 return d_ptr->m_presenter->titleFont();
Michal Klocek
Adds missing titleFont getter
r895 }
Tero Ahola
Chart title font color
r495 /*!
Michal Klocek
Adds PIMPL to qchart
r740 Sets the \a brush used for rendering the title text.
*/
Michal Klocek
Adds force option to chartTheme...
r645 void QChart::setTitleBrush(const QBrush &brush)
Tero Ahola
Chart title font color
r495 {
Michal Klocek
Refactors layout managment...
r1534 d_ptr->m_presenter->setTitleBrush(brush);
Tero Ahola
Chart title font color
r495 }
/*!
Michal Klocek
Adds PIMPL to qchart
r740 Returns the brush used for rendering the title text.
*/
Michal Klocek
Adds force option to chartTheme...
r645 QBrush QChart::titleBrush() const
Tero Ahola
Chart title font color
r495 {
Michal Klocek
Refactors layout managment...
r1534 return d_ptr->m_presenter->titleBrush();
Michal Klocek
Refactors axis handling...
r223 }
Michal Klocek
Adds PIMPL to qchart
r740 void QChart::setTheme(QChart::ChartTheme theme)
Tero Ahola
Draft implementation for setting color themes for a chart
r64 {
Michal Klocek
Refactors internals...
r2273 d_ptr->m_themeManager->setTheme(theme);
Tero Ahola
Draft implementation for setting color themes for a chart
r64 }
Michal Klocek
Adds PIMPL to qchart
r740 QChart::ChartTheme QChart::theme() const
Tero Ahola
Proof-of-concept for QML api...
r120 {
Michal Klocek
Refactors internals...
r2273 return d_ptr->m_themeManager->theme()->id();
Tero Ahola
Proof-of-concept for QML api...
r120 }
Marek Rosa
else clause added to QChartView mousePressEvent. Added some more docs to QChart and QChartView
r285 /*!
Michal Klocek
Adds PIMPL to qchart
r740 Zooms in the view by a factor of 2
*/
Michal Klocek
Refactors axis handling...
r223 void QChart::zoomIn()
Michal Klocek
Add zoom support...
r67 {
Michal Klocek
Refactors internals...
r2273 d_ptr->zoomIn(2.0);
Michal Klocek
Add zoom support...
r67 }
Marek Rosa
else clause added to QChartView mousePressEvent. Added some more docs to QChart and QChartView
r285 /*!
Michal Klocek
Adds PIMPL to qchart
r740 Zooms in the view to a maximum level at which \a rect is still fully visible.
*/
Jani Honkonen
src folder: another massive victory for coding style police
r2131 void QChart::zoomIn(const QRectF &rect)
Michal Klocek
Add zoom support...
r67 {
Marek Rosa
Mapping functions added to QChart. Callout example updated
r2344 d_ptr->zoomIn(rect);
Michal Klocek
Add zoom support...
r67 }
Marek Rosa
else clause added to QChartView mousePressEvent. Added some more docs to QChart and QChartView
r285 /*!
Michal Klocek
Adds PIMPL to qchart
r740 Restores the view zoom level to the previous one.
*/
Michal Klocek
Add zoom support...
r67 void QChart::zoomOut()
{
Michal Klocek
Refactors internals...
r2273 d_ptr->zoomOut(2.0);
Jani Honkonen
Add gestures support for zoomlinechart example...
r1187 }
/*!
Zooms in the view by a \a factor.
A factor over 1.0 zooms the view in and factor between 0.0 and 1.0 zooms out.
*/
void QChart::zoom(qreal factor)
{
Marek Rosa
Replaced qFuzzyIsNull with qFuzzyCompare. Once qchart test case still uses qFuzzyIsNull becasue it started failing when qFuzzyCompare was used
r2242 if (qFuzzyCompare(factor, 0))
Jani Honkonen
Add gestures support for zoomlinechart example...
r1187 return;
Marek Rosa
Added casting to qreal in qMin, qFuzzyCompare calls to fix build on arm
r1679 if (qFuzzyCompare(factor, (qreal)1.0))
Jani Honkonen
Add gestures support for zoomlinechart example...
r1187 return;
if (factor < 0)
return;
if (factor > 1.0)
Michal Klocek
Refactors internals...
r2273 d_ptr->zoomIn(factor);
Jani Honkonen
Add gestures support for zoomlinechart example...
r1187 else
Michal Klocek
Refactors internals...
r2273 d_ptr->zoomOut(1.0 / factor);
Michal Klocek
Add zoom support...
r67 }
Marek Rosa
Added some more documentation to QChart and QChartView
r277 /*!
Marek Rosa
Few QChart doc updates
r1633 Returns the pointer to the x axis object of the chart asociated with the specified \a series
Marek Rosa
Various docs fixes
r1638 If no series is provided then pointer to currently visible axis is provided
Michal Klocek
Adds PIMPL to qchart
r740 */
Jani Honkonen
src folder: another massive victory for coding style police
r2131 QAbstractAxis *QChart::axisX(QAbstractSeries *series) const
Michal Klocek
Adds more axis handling...
r176 {
Tero Ahola
Fixed a bug with QChart::axis getters with no series defined
r2384 QList<QAbstractAxis *> axisList = axes(Qt::Horizontal, series);
if (axisList.count())
return axisList[0];
return 0;
Michal Klocek
Adds more axis handling...
r176 }
Marek Rosa
Added some more documentation to QChart and QChartView
r277 /*!
Marek Rosa
Few QChart doc updates
r1633 Returns the pointer to the y axis object of the chart asociated with the specified \a series
Marek Rosa
Various docs fixes
r1638 If no series is provided then pointer to currently visible axis is provided
Michal Klocek
Adds PIMPL to qchart
r740 */
Jani Honkonen
src folder: another massive victory for coding style police
r2131 QAbstractAxis *QChart::axisY(QAbstractSeries *series) const
Michal Klocek
Adds more axis handling...
r176 {
Tero Ahola
Fixed a bug with QChart::axis getters with no series defined
r2384 QList<QAbstractAxis *> axisList = axes(Qt::Vertical, series);
if (axisList.count())
return axisList[0];
return 0;
Michal Klocek
Refactors internals...
r2273 }
Tero Ahola
Documented the new functionality in QChart
r2360 /*!
Tero Ahola
Fixed a bug with QChart::axis getters with no series defined
r2384 Returns the axes added for the \a series with \a orientation. If no series is provided, then all axes with the
specified orientation are returned.
Tero Ahola
Documented the new functionality in QChart
r2360 \sa addAxis(), createDefaultAxes()
*/
Michal Klocek
Refactors internals...
r2273 QList<QAbstractAxis *> QChart::axes(Qt::Orientations orientation, QAbstractSeries *series) const
{
QList<QAbstractAxis *> result ;
Tero Ahola
Added axisXTop and axisYRight properties to QML series APIs
r2296 if (series) {
foreach (QAbstractAxis *axis, series->attachedAxes()){
if (orientation.testFlag(axis->orientation()))
result << axis;
}
} else {
Tero Ahola
Fixed a bug with QChart::axis getters with no series defined
r2384 foreach (QAbstractAxis *axis, d_ptr->m_dataset->axes()){
if (orientation.testFlag(axis->orientation()) && !result.contains(axis))
result << axis;
Tero Ahola
Added axisXTop and axisYRight properties to QML series APIs
r2296 }
Michal Klocek
Refactors internals...
r2273 }
return result;
Michal Klocek
Refactora axis and line chart to use graphics items insted of painter.
r85 }
Marek Rosa
Few QChart doc updates
r1633 /*!
NOTICE: This function has to be called after series has been added to the chart if no customized axes are set to the chart. Otherwise axisX(), axisY() calls return NULL.
Creates the axes for the chart based on the series that has already been added to the chart.
Marek Rosa
Various docs fixes
r1638
\table
\header
\o Series type
\o X-axis
\o Y-axis
\row
\o QXYSeries
Marek Rosa
class QValuesAxis renamed to QValueAxis
r1804 \o QValueAxis
\o QValueAxis
Marek Rosa
Various docs fixes
r1638 \row
\o QBarSeries
Marek Rosa
QBarCategoriesAxis renamed to QBarCategoryAxis
r1809 \o QBarCategoryAxis
Marek Rosa
class QValuesAxis renamed to QValueAxis
r1804 \o QValueAxis
Marek Rosa
Various docs fixes
r1638 \row
\o QPieSeries
\o None
\o None
\endtable
Marek Rosa
Few QChart doc updates
r1633 If there are several QXYSeries derived series added to the chart and no other series type has been added then only one pair of axes is created.
If there are sevaral series added of different types then each series gets its own axes pair.
NOTICE: if there is more than one x and y axes created then no axis is drawn by default and one needs to choose explicitly which axis should be shown.
Axis specifix to the series can be later obtained from the chart by providing the series as the parameter of axisX(), axisY() function calls.
QPieSeries does not create any axes.
\sa axisX(), axisY(), setAxisX(), setAxisY()
*/
Michal Klocek
Refactor QChart API...
r1577 void QChart::createDefaultAxes()
{
Jani Honkonen
src folder: another massive victory for coding style police
r2131 d_ptr->m_dataset->createDefaultAxes();
Michal Klocek
Refactor QChart API...
r1577 }
sauimone
framework for legend
r524 /*!
Michal Klocek
Adds PIMPL to qchart
r740 Returns the legend object of the chart. Ownership stays in chart.
*/
Jani Honkonen
src folder: another massive victory for coding style police
r2131 QLegend *QChart::legend() const
sauimone
framework for legend
r524 {
sauimone
improved legend layout
r783 return d_ptr->m_legend;
sauimone
framework for legend
r524 }
Jani Honkonen
Fix BC: QChart::setMinimumMargins and QChart::minimumMargins are in v1.1.0 so they have to stay.
r2272 /*!
Sets the minimum \a margins between the plot area (axes) and the edge of the chart widget.
Deprecated. Use setMargins().
*/
void QChart::setMinimumMargins(const QMargins &margins)
{
qWarning() << "QChart::setMinimumMargins is deprecated. Use QChart::setMargins instead.";
d_ptr->m_presenter->layout()->setMargins(margins);
}
/*!
Returns the rect that contains information about margins (distance between chart widget edge and axes).
Individual margins can be obtained by calling left, top, right, bottom on the returned rect.
Deprecated. Use margins().
*/
QMargins QChart::minimumMargins() const
{
qWarning() << "QChart::minimumMargins is deprecated. Use QChart::margins instead.";
return d_ptr->m_presenter->layout()->margins();
}
Michal Klocek
Implements minimumMargins...
r1883 /*!
Sets the minimum \a margins between the plot area (axes) and the edge of the chart widget.
*/
Jani Honkonen
src folder: another massive victory for coding style police
r2131 void QChart::setMargins(const QMargins &margins)
Michal Klocek
Implements minimumMargins...
r1883 {
Michal Klocek
Refactors layout:...
r2105 d_ptr->m_presenter->layout()->setMargins(margins);
Michal Klocek
Implements minimumMargins...
r1883 }
Marek Rosa
Some more doc fixes and additions
r924 /*!
Returns the rect that contains information about margins (distance between chart widget edge and axes).
Individual margins can be obtained by calling left, top, right, bottom on the returned rect.
*/
Michal Klocek
Refactors layout...
r1965 QMargins QChart::margins() const
sauimone
legend pos to theme example, legend padding
r803 {
Michal Klocek
Refactors layout:...
r2105 return d_ptr->m_presenter->layout()->margins();
sauimone
legend pos to theme example, legend padding
r803 }
Marek Rosa
Docs fixes
r1657 /*!
Returns the the rect within which the drawing of the chart is done.
It does not include the area defines by margins.
*/
Michal Klocek
Adds plotArea()...
r1648 QRectF QChart::plotArea() const
{
Michal Klocek
Refactors internals...
r2273 return d_ptr->m_presenter->geometry();
Michal Klocek
Adds plotArea()...
r1648 }
Marek Rosa
QChart and QChartView now has some description for all the functions
r287 /*!
Michal Klocek
Refactors layout managment...
r1534 Sets animation \a options for the chart
Michal Klocek
Adds PIMPL to qchart
r740 */
Michal Klocek
Adds animation settings handling
r298 void QChart::setAnimationOptions(AnimationOptions options)
{
Michal Klocek
Adds PIMPL to qchart
r740 d_ptr->m_presenter->setAnimationOptions(options);
Michal Klocek
Adds animation settings handling
r298 }
QChart::AnimationOptions QChart::animationOptions() const
{
Michal Klocek
Adds PIMPL to qchart
r740 return d_ptr->m_presenter->animationOptions();
Michal Klocek
Adds animation settings handling
r298 }
Jani Honkonen
Add gestures support for zoomlinechart example...
r1187 /*!
sauimone
fixed documentation errors
r1575 Scrolls the visible area of the chart by the distance defined in the \a dx and \a dy.
Jani Honkonen
Add gestures support for zoomlinechart example...
r1187 */
Michal Klocek
Changes to qchart qabstractseries API
r1553 void QChart::scroll(qreal dx, qreal dy)
Jani Honkonen
Add gestures support for zoomlinechart example...
r1187 {
Michal Klocek
Refactors internals...
r2273 d_ptr->scroll(dx,dy);
Jani Honkonen
Add gestures support for zoomlinechart example...
r1187 }
Michal Klocek
Adds PIMPL to qchart
r740 void QChart::setBackgroundVisible(bool visible)
{
Michal Klocek
Refactors layout managment...
r1534 d_ptr->m_presenter->setBackgroundVisible(visible);
Michal Klocek
Adds PIMPL to qchart
r740 }
sauimone
Scrolling logic to legend
r716
Michal Klocek
Adds PIMPL to qchart
r740 bool QChart::isBackgroundVisible() const
{
Michal Klocek
Refactors layout managment...
r1534 return d_ptr->m_presenter->isBackgroundVisible();
sauimone
Scrolling logic to legend
r716 }
Tero Ahola
Minor modifications to properties of abstract, area and bar series
r1462 void QChart::setDropShadowEnabled(bool enabled)
Tero Ahola
Added drop shadow effect for light themes
r1001 {
Michal Klocek
Refactors layout managment...
r1534 d_ptr->m_presenter->setBackgroundDropShadowEnabled(enabled);
Tero Ahola
Added drop shadow effect for light themes
r1001 }
Tero Ahola
Minor modifications to properties of abstract, area and bar series
r1462 bool QChart::isDropShadowEnabled() const
Tero Ahola
Added drop shadow effect for light themes
r1001 {
Michal Klocek
Refactors layout managment...
r1534 return d_ptr->m_presenter->isBackgroundDropShadowEnabled();
Tero Ahola
Added drop shadow effect for light themes
r1001 }
Jani Honkonen
Add QChart::series() doc and tests
r1316 /*!
Returns all the series that are added to the chart.
\sa addSeries(), removeSeries(), removeAllSeries()
*/
Jani Honkonen
src folder: another massive victory for coding style police
r2131 QList<QAbstractSeries *> QChart::series() const
Michal Klocek
Fixes to API , QSeriesType -> SeriesType , add missing getters
r1107 {
return d_ptr->m_dataset->series();
}
Michal Klocek
Refactors layout managment...
r1534
Marek Rosa
Few QChart doc updates
r1633 /*!
Sets \a axis to the chart, which will control the presentation of the \a series
\sa axisX(), axisY(), setAxisY(), createDefaultAxes()
*/
Jani Honkonen
src folder: another massive victory for coding style police
r2131 void QChart::setAxisX(QAbstractAxis *axis , QAbstractSeries *series)
Michal Klocek
Refactors QAxis to QAbstractAxis...
r1541 {
Marek Rosa
Mapping functions added to QChart. Callout example updated
r2344 QList<QAbstractAxis*> list = axes(Qt::Horizontal,series);
Michal Klocek
Refactors internals...
r2273
Marek Rosa
Mapping functions added to QChart. Callout example updated
r2344 foreach(QAbstractAxis* a, list){
Michal Klocek
make setAxisX setAxisY functionality compatible
r2278 d_ptr->m_dataset->removeAxis(a);
delete a;
Marek Rosa
Mapping functions added to QChart. Callout example updated
r2344 }
Michal Klocek
Refactors internals...
r2273
Marek Rosa
Mapping functions added to QChart. Callout example updated
r2344 if(!d_ptr->m_dataset->axes().contains(axis))
d_ptr->m_dataset->addAxis(axis,Qt::AlignBottom);
d_ptr->m_dataset->attachAxis(series,axis);
Michal Klocek
Refactors QAxis to QAbstractAxis...
r1541 }
Marek Rosa
Few QChart doc updates
r1633 /*!
Sets \a axis to the chart, which will control the presentation of the \a series
\sa axisX(), axisY(), setAxisX(), createDefaultAxes()
*/
Jani Honkonen
src folder: another massive victory for coding style police
r2131 void QChart::setAxisY(QAbstractAxis *axis , QAbstractSeries *series)
Michal Klocek
Refactors QAxis to QAbstractAxis...
r1541 {
Michal Klocek
Refactors internals...
r2273 QList<QAbstractAxis*> list = axes(Qt::Vertical,series);
foreach(QAbstractAxis* a, list) {
Michal Klocek
make setAxisX setAxisY functionality compatible
r2278 d_ptr->m_dataset->removeAxis(a);
delete a;
Michal Klocek
Refactors internals...
r2273 }
if(!d_ptr->m_dataset->axes().contains(axis))
Marek Rosa
Mapping functions added to QChart. Callout example updated
r2344 d_ptr->m_dataset->addAxis(axis,Qt::AlignLeft);
Michal Klocek
Refactors internals...
r2273 d_ptr->m_dataset->attachAxis(series,axis);
}
Tero Ahola
Documented the new functionality in QChart
r2360 /*!
Adds \a axis to the chart with \a alignment. The chart takes the ownership of the axis.
\sa removeAxis(), createDefaultAxes(), QAbstractSeries::attachAxis()
*/
void QChart::addAxis(QAbstractAxis *axis, Qt::Alignment alignment)
Michal Klocek
Refactors internals...
r2273 {
Tero Ahola
Documented the new functionality in QChart
r2360 d_ptr->m_dataset->addAxis(axis, alignment);
Michal Klocek
Refactors internals...
r2273 }
Tero Ahola
Documented the new functionality in QChart
r2360 /*!
Removes \a axis from the chart. The ownership is returned to the caller.
\sa addAxis(), createDefaultAxes(), QAbstractSeries::detachAxis()
*/
Michal Klocek
Refactors internals...
r2273 void QChart::removeAxis(QAbstractAxis *axis)
{
Marek Rosa
Mapping functions added to QChart. Callout example updated
r2344 d_ptr->m_dataset->removeAxis(axis);
}
Marek Rosa
Documented mapToValue and mapToPostion methods in QChart
r2357 /*!
Returns the value in the \a series domain that coresponds to the charts widget point defines by \a position.
*/
Marek Rosa
Mapping functions added to QChart. Callout example updated
r2344 QPointF QChart::mapToValue(const QPointF &position, QAbstractSeries *series)
{
return d_ptr->m_dataset->mapToValue(position, series);
}
Marek Rosa
Documented mapToValue and mapToPostion methods in QChart
r2357 /*!
Returns the position on the charts widget that coresponds to the \a value in the \a series domain.
*/
Marek Rosa
Mapping functions added to QChart. Callout example updated
r2344 QPointF QChart::mapToPosition(const QPointF &value, QAbstractSeries *series)
{
return d_ptr->m_dataset->mapToPosition(value, series);
Michal Klocek
Refactors QAxis to QAbstractAxis...
r1541 }
Michal Klocek
Adds PIMPL to qchart
r740 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
Michal Klocek
Changes background item...
r639
Michal Klocek
Refactors internals...
r2273 QChartPrivate::QChartPrivate(QChart *q):
q_ptr(q),
Marek Rosa
Some more doc fixes and additions
r924 m_legend(0),
Michal Klocek
Refactors internals...
r2273 m_dataset(new ChartDataSet(q)),
m_presenter(new ChartPresenter(q)),
m_themeManager(new ChartThemeManager(q))
Michal Klocek
Changes background item...
r639 {
Michal Klocek
Refactors internals...
r2273 QObject::connect(m_dataset, SIGNAL(seriesAdded(QAbstractSeries*)), m_presenter, SLOT(handleSeriesAdded(QAbstractSeries*)));
QObject::connect(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries*)), m_presenter, SLOT(handleSeriesRemoved(QAbstractSeries*)));
QObject::connect(m_dataset, SIGNAL(axisAdded(QAbstractAxis*)), m_presenter, SLOT(handleAxisAdded(QAbstractAxis*)));
QObject::connect(m_dataset, SIGNAL(axisRemoved(QAbstractAxis*)), m_presenter, SLOT(handleAxisRemoved(QAbstractAxis*)));
QObject::connect(m_dataset, SIGNAL(seriesAdded(QAbstractSeries*)), m_themeManager, SLOT(handleSeriesAdded(QAbstractSeries*)));
QObject::connect(m_dataset, SIGNAL(seriesRemoved(QAbstractSeries*)), m_themeManager, SLOT(handleSeriesRemoved(QAbstractSeries*)));
QObject::connect(m_dataset, SIGNAL(axisAdded(QAbstractAxis*)), m_themeManager, SLOT(handleAxisAdded(QAbstractAxis*)));
QObject::connect(m_dataset, SIGNAL(axisRemoved(QAbstractAxis*)), m_themeManager, SLOT(handleAxisRemoved(QAbstractAxis*)));
Michal Klocek
Changes background item...
r639 }
Michal Klocek
Adds PIMPL to qchart
r740 QChartPrivate::~QChartPrivate()
Michal Klocek
Changes background item...
r639 {
Michal Klocek
Adds PIMPL to qchart
r740
Michal Klocek
Changes background item...
r639 }
Michal Klocek
Refactors internals...
r2273 void QChartPrivate::zoomIn(qreal factor)
Michal Klocek
Refactor , move dataset legend presentr connections to one place
r871 {
Michal Klocek
Refactors internals...
r2273 QRectF rect = m_presenter->geometry();
rect.setWidth(rect.width() / factor);
rect.setHeight(rect.height() / factor);
rect.moveCenter(m_presenter->geometry().center());
zoomIn(rect);
}
void QChartPrivate::zoomIn(const QRectF &rect)
{
if (!rect.isValid())
Marek Rosa
Mapping functions added to QChart. Callout example updated
r2344 return;
Michal Klocek
Refactors internals...
r2273
QRectF r = rect.normalized();
const QRectF geometry = m_presenter->geometry();
r.translate(-geometry.topLeft());
if (!r.isValid())
return;
QPointF zoomPoint(r.center().x() / geometry.width(), r.center().y() / geometry.height());
m_presenter->setState(ChartPresenter::ZoomInState,zoomPoint);
m_dataset->zoomInDomain(r);
m_presenter->setState(ChartPresenter::ShowState,QPointF());
}
void QChartPrivate::zoomOut(qreal factor)
{
const QRectF geometry = m_presenter->geometry();
QRectF r;
r.setSize(geometry.size() / factor);
r.moveCenter(QPointF(geometry.size().width()/2 ,geometry.size().height()/2));
if (!r.isValid())
return;
QPointF zoomPoint(r.center().x() / geometry.width(), r.center().y() / geometry.height());
m_presenter->setState(ChartPresenter::ZoomOutState,zoomPoint);
m_dataset->zoomOutDomain(r);
m_presenter->setState(ChartPresenter::ShowState,QPointF());
}
void QChartPrivate::scroll(qreal dx, qreal dy)
{
if (dx < 0) m_presenter->setState(ChartPresenter::ScrollLeftState,QPointF());
if (dx > 0) m_presenter->setState(ChartPresenter::ScrollRightState,QPointF());
if (dy < 0) m_presenter->setState(ChartPresenter::ScrollUpState,QPointF());
if (dy > 0) m_presenter->setState(ChartPresenter::ScrollDownState,QPointF());
m_dataset->scrollDomain(dx, dy);
m_presenter->setState(ChartPresenter::ShowState,QPointF());
Michal Klocek
Refactor , move dataset legend presentr connections to one place
r871 }
Tero Ahola
Draft implementation for setting color themes for a chart
r64 #include "moc_qchart.cpp"
Tero Ahola
Resizing of QGraphicItems now possible by resize signal from QChart
r48
Tero Ahola
Renamed to QtCommercialChart
r30 QTCOMMERCIALCHART_END_NAMESPACE