##// END OF EJS Templates
removed warning from chartthemes demo
removed warning from chartthemes demo

File last commit:

r1673:4673b2d6daea
r1675:592f4e5c298a
Show More
qabstractbarseries.cpp
737 lines | 21.0 KiB | text/x-c | CppLexer
/ src / barchart / qabstractbarseries.cpp
Jani Honkonen
Add license headers
r794 /****************************************************************************
**
** Copyright (C) 2012 Digia Plc
** 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$
**
****************************************************************************/
sauimone
renamed barseries files to abstractbarseries
r1586 #include "qabstractbarseries.h"
#include "qabstractbarseries_p.h"
sauimone
removed barchartseriesbase. functionality is now in model
r172 #include "qbarset.h"
Michal Klocek
Adds big fat pimpl to series classes...
r938 #include "qbarset_p.h"
Michal Klocek
Refactor to use qseries private for implmentation interface...
r943 #include "domain_p.h"
Michal Klocek
Adds qlegend pimpl...
r950 #include "legendmarker_p.h"
Michal Klocek
Refactor to use qseries private for implmentation interface...
r943 #include "chartdataset_p.h"
#include "charttheme_p.h"
#include "chartanimator_p.h"
sauimone
added createAxis methods to private series
r1545 #include "qvaluesaxis.h"
Michal Klocek
Refactor CategoriesAxis to BarCategoriesAxis part 2 of 2
r1613 #include "qbarcategoriesaxis.h"
Michal Klocek
Adds big fat pimpl to series classes...
r938
sauimone
Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?
r56 QTCOMMERCIALCHART_BEGIN_NAMESPACE
sauimone
Documentation for bar charts
r313 /*!
sauimone
renamed barseries files to abstractbarseries
r1586 \class QAbstractBarSeries
sauimone
better brief descriptions for barcharts
r1502 \brief Series for creating a bar chart
Tero Ahola
Documentation fixes....
r995 \mainclass
sauimone
Documentation for bar charts
r313
sauimone
renamed barseries files to abstractbarseries
r1586 QAbstractBarSeries represents a series of data shown as bars. The purpose of this class is to draw bars to
sauimone
Fixed category handling of barcharts. Now the categories can be undefined. Updated documentation.
r1208 the position defined by data. Single bar is defined by QPointF, where x value is the x-coordinate of the bar
and y-value is the height of the bar. The category names are ignored with this series and x-axis
shows the x-values.
sauimone
Documentation for bar charts
r313
Tero Ahola
Documentation fixes....
r995 See the \l {BarChart Example} {bar chart example} to learn how to create a simple bar chart.
\image examples_barchart.png
sauimone
Updated barchart documentation
r319
sauimone
replaced qbarcategory with qstringlist
r377 \sa QBarSet, QStackedBarSeries, QPercentBarSeries
sauimone
Documentation for bar charts
r313 */
Tero Ahola
Documenting QML bar series API
r1489 /*!
sauimone
changed barseries to abstractbarseries in documentation
r1590 \qmlclass AbstractBarSeries QAbstractBarSeries
Michal Klocek
Adds createDefaultAxes logic
r1588 \inherits QAbstractSeries
Tero Ahola
QML methods of series: several fixes and documentation
r1521
The following QML shows how to create a simple bar chart:
\snippet ../demos/qmlchart/qml/qmlchart/View6.qml 1
Tero Ahola
Documenting QML bar series API
r1489
\beginfloatleft
\image demos_qmlchart6.png
\endfloat
\clearfloat
*/
sauimone
Documentation for bar charts
r313
Marek Rosa
Docs update for BarSeries and BarSet
r1361 /*!
sauimone
renamed barseries files to abstractbarseries
r1586 \property QAbstractBarSeries::barWidth
Tero Ahola
Documenting QML bar series API
r1489 The width of the bars of the series. The unit of \a width is the unit of x-axis. The minimum width for bars
sauimone
barmargin replaced with barwidth
r1425 is zero and negative values are treated as zero. Setting the width to zero means that width of the bar on screen
is one pixel no matter what the scale of x-axis is. Bars wider than zero are scaled with x-axis.
sauimone
GroupedBarSeries to BarSeries
r1594 Note that with QBarSeries this value means the width of one group of bars instead of just one bar.
\sa QBarSeries
Marek Rosa
Docs update for BarSeries and BarSet
r1361 */
Tero Ahola
Documenting QML bar series API
r1489 /*!
sauimone
changed barseries to abstractbarseries in documentation
r1590 \qmlproperty real AbstractBarSeries::barWidth
Tero Ahola
Documenting QML bar series API
r1489 The width of the bars of the series. The unit of width is the unit of x-axis. The minimum width for bars
is zero and negative values are treated as zero. Setting the width to zero means that width of the bar on screen
is one pixel no matter what the scale of x-axis is. Bars wider than zero are scaled with x-axis.
sauimone
GroupedBarSeries to BarSeries
r1594 Note that with QBarSeries this value means the width of one group of bars instead of just one bar.
Tero Ahola
Documenting QML bar series API
r1489 */
Marek Rosa
Docs update for BarSeries and BarSet
r1361
/*!
sauimone
renamed barseries files to abstractbarseries
r1586 \property QAbstractBarSeries::count
Tero Ahola
Documenting QML bar series API
r1489 Holds the number of sets in series.
*/
/*!
sauimone
changed barseries to abstractbarseries in documentation
r1590 \qmlproperty int AbstractBarSeries::count
Tero Ahola
Documenting QML bar series API
r1489 Holds the number of sets in series.
Marek Rosa
Docs update for BarSeries and BarSet
r1361 */
/*!
sauimone
renamed barseries files to abstractbarseries
r1586 \property QAbstractBarSeries::labelsVisible
Tero Ahola
Documenting QML bar series API
r1489 Defines the visibility of the labels in series
*/
/*!
sauimone
changed barseries to abstractbarseries in documentation
r1590 \qmlproperty bool AbstractBarSeries::labelsVisible
Tero Ahola
Documenting QML bar series API
r1489 Defines the visibility of the labels in series
Marek Rosa
Docs update for BarSeries and BarSet
r1361 */
sauimone
Documentation for bar charts
r313 /*!
sauimone
renamed barseries files to abstractbarseries
r1586 \fn void QAbstractBarSeries::clicked(int index, QBarSet *barset)
sauimone
removed categories from barseries. categories are now only on axis
r1321 The signal is emitted if the user clicks with a mouse on top of QBarSet \a barset.
Clicked bar inside set is indexed by \a index
Tero Ahola
Updated documentation, warnings from legend and area left
r973 */
Tero Ahola
Documenting QML bar series API
r1489 /*!
sauimone
changed barseries to abstractbarseries in documentation
r1590 \qmlsignal AbstractBarSeries::onClicked(int index, BarSet barset)
Tero Ahola
Documenting QML bar series API
r1489 The signal is emitted if the user clicks with a mouse on top of BarSet.
Clicked bar inside set is indexed by \a index
*/
Tero Ahola
Updated documentation, warnings from legend and area left
r973
sauimone
barchart: doc update for hover signals
r980 /*!
sauimone
renamed barseries files to abstractbarseries
r1586 \fn void QAbstractBarSeries::hovered(bool status, QBarSet* barset)
sauimone
barchart: doc update for hover signals
r980
The signal is emitted if mouse is hovered on top of series.
Parameter \a barset is the pointer of barset, where hover happened.
Parameter \a status is true, if mouse entered on top of series, false if mouse left from top of series.
*/
Tero Ahola
Documenting QML bar series API
r1489 /*!
sauimone
changed barseries to abstractbarseries in documentation
r1590 \qmlsignal AbstractBarSeries::onHovered(bool status, BarSet barset)
Tero Ahola
Documenting QML bar series API
r1489
The signal is emitted if mouse is hovered on top of series.
Parameter \a barset is the pointer of barset, where hover happened.
Parameter \a status is true, if mouse entered on top of series, false if mouse left from top of series.
*/
sauimone
added missing documentation to barseries
r1460
/*!
sauimone
renamed barseries files to abstractbarseries
r1586 \fn void QAbstractBarSeries::countChanged()
Tero Ahola
Documenting QML bar series API
r1489 This signal is emitted when barset count has been changed, for example by append or remove.
*/
/*!
sauimone
changed barseries to abstractbarseries in documentation
r1590 \qmlsignal AbstractBarSeries::onCountChanged()
sauimone
added missing documentation to barseries
r1460 This signal is emitted when barset count has been changed, for example by append or remove.
*/
sauimone
barchart: doc update for hover signals
r980
Marek Rosa
Docs update for BarSeries and BarSet
r1361 /*!
sauimone
renamed barseries files to abstractbarseries
r1586 \fn void QAbstractBarSeries::labelsVisibleChanged()
Tero Ahola
Documenting QML bar series API
r1489 This signal is emitted when labels visibility have changed.
Marek Rosa
Added insert method to QBarSeries
r1362 \sa isLabelsVisible(), setLabelsVisible()
Marek Rosa
Docs update for BarSeries and BarSet
r1361 */
/*!
sauimone
renamed barseries files to abstractbarseries
r1586 \fn void QAbstractBarSeries::barsetsAdded(QList<QBarSet*> sets)
Marek Rosa
Docs update for BarSeries and BarSet
r1361 This signal is emitted when \a sets have been added to the series.
\sa append(), insert()
*/
Tero Ahola
QML BarSeries added/removed signals
r1506 /*!
sauimone
changed barseries to abstractbarseries in documentation
r1590 \qmlsignal AbstractBarSeries::onAdded(BarSet barset)
Tero Ahola
QML BarSeries added/removed signals
r1506 Emitted when \a barset has been added to the series.
*/
Marek Rosa
Docs update for BarSeries and BarSet
r1361
/*!
sauimone
renamed barseries files to abstractbarseries
r1586 \fn void QAbstractBarSeries::barsetsRemoved(QList<QBarSet*> sets)
Marek Rosa
Docs update for BarSeries and BarSet
r1361 This signal is emitted when \a sets have been removed from the series.
\sa remove()
*/
Tero Ahola
QML BarSeries added/removed signals
r1506 /*!
sauimone
changed barseries to abstractbarseries in documentation
r1590 \qmlsignal AbstractBarSeries::onRemoved(BarSet barset)
Tero Ahola
QML BarSeries added/removed signals
r1506 Emitted when \a barset has been removed from the series.
*/
Marek Rosa
Docs update for BarSeries and BarSet
r1361
Tero Ahola
QML methods of series: several fixes and documentation
r1521 /*!
sauimone
changed barseries to abstractbarseries in documentation
r1590 \qmlmethod BarSet AbstractBarSeries::at(int index)
Tero Ahola
QML methods of series: several fixes and documentation
r1521 Returns bar set at \a index. Returns null if the index is not valid.
*/
/*!
sauimone
changed barseries to abstractbarseries in documentation
r1590 \qmlmethod BarSet AbstractBarSeries::append(string label, VariantList values)
Tero Ahola
Renamed XyPoint to XYPoint
r1532 Adds a new bar set with \a label and \a values to \a index. Values can be a list of reals or a list of XYPoints.
Tero Ahola
QML methods of series: several fixes and documentation
r1521 For example:
\code
myBarSeries.append("set 1", [0, 0.2, 0.2, 0.5, 0.4, 1.5, 0.9]);
myBarSeries.append("set 2", [Qt.point(0, 1), Qt.point(2, 2.5), Qt.point(3.5, 2.2)]);
\endcode
*/
/*!
sauimone
changed barseries to abstractbarseries in documentation
r1590 \qmlmethod BarSet AbstractBarSeries::insert(int index, string label, VariantList values)
Tero Ahola
Renamed XyPoint to XYPoint
r1532 Inserts a new bar set with \a label and \a values to \a index. Values can be a list of reals or a list of XYPoints.
Tero Ahola
QML methods of series: several fixes and documentation
r1521 If index is zero or smaller, the new barset is prepended. If the index is count or bigger, the new barset is
appended.
sauimone
changed barseries to abstractbarseries in documentation
r1590 \sa AbstractBarSeries::append()
Tero Ahola
QML methods of series: several fixes and documentation
r1521 */
/*!
sauimone
changed barseries to abstractbarseries in documentation
r1590 \qmlmethod bool AbstractBarSeries::remove(BarSet barset)
Tero Ahola
QML methods of series: several fixes and documentation
r1521 Removes the barset from the series. Returns true if successfull, false otherwise.
*/
/*!
sauimone
changed barseries to abstractbarseries in documentation
r1590 \qmlmethod AbstractBarSeries::clear()
Tero Ahola
QML methods of series: several fixes and documentation
r1521 Removes all barsets from the series.
*/
sauimone
Documentation for bar charts
r313 /*!
sauimone
renamed barseries files to abstractbarseries
r1586 Constructs empty QAbstractBarSeries.
QAbstractBarSeries is QObject which is a child of a \a parent.
sauimone
Documentation for bar charts
r313 */
sauimone
QBarSeries to QAbstractBarSeries
r1584 QAbstractBarSeries::QAbstractBarSeries(QObject *parent) :
QAbstractSeries(*new QAbstractBarSeriesPrivate(this),parent)
Michal Klocek
Adds big fat pimpl to series classes...
r938 {
}
sauimone
barchart: doc update for hover signals
r980 /*!
sauimone
changed barseries to abstractbarseries in documentation
r1590 Destructs abstractbarseries and owned barsets.
sauimone
barchart: doc update for hover signals
r980 */
sauimone
QBarSeries to QAbstractBarSeries
r1584 QAbstractBarSeries::~QAbstractBarSeries()
sauimone
barchart: doc update for hover signals
r980 {
sauimone
QBarSeries to QAbstractBarSeries
r1584 Q_D(QAbstractBarSeries);
sauimone
legend detach example. Bug fixes to legend.
r1263 if(d->m_dataset){
d->m_dataset->removeSeries(this);
}
sauimone
barchart: doc update for hover signals
r980 }
Tero Ahola
Updated documentation, warnings from legend and area left
r973 /*!
\internal
*/
sauimone
QBarSeries to QAbstractBarSeries
r1584 QAbstractBarSeries::QAbstractBarSeries(QAbstractBarSeriesPrivate &d, QObject *parent) :
Tero Ahola
Renamed QSeries to QAbstractSeries
r988 QAbstractSeries(d,parent)
Michal Klocek
Refactor to use qseries private for implmentation interface...
r943 {
}
sauimone
updated documentation for barseries
r1493 /*!
Sets the width of the bars of the series. The unit of \a width is the unit of x-axis. The minimum width for bars
is zero and negative values are treated as zero. Setting the width to zero means that width of the bar on screen
is one pixel no matter what the scale of x-axis is. Bars wider than zero are scaled with x-axis.
sauimone
GroupedBarSeries to BarSeries
r1594 Note that with \link QBarSeries \endlink this value means the width of one group of bars instead of just one bar.
sauimone
updated documentation for barseries
r1493 */
sauimone
QBarSeries to QAbstractBarSeries
r1584 void QAbstractBarSeries::setBarWidth(qreal width)
sauimone
bar margin setter to series
r1283 {
sauimone
QBarSeries to QAbstractBarSeries
r1584 Q_D(QAbstractBarSeries);
sauimone
barmargin replaced with barwidth
r1425 d->setBarWidth(width);
sauimone
bar margin setter to series
r1283 }
sauimone
updated documentation for barseries
r1493 /*!
Returns the width of the bars of the series.
\sa setBarWidth()
*/
sauimone
QBarSeries to QAbstractBarSeries
r1584 qreal QAbstractBarSeries::barWidth() const
sauimone
visible property to barseries
r1284 {
sauimone
QBarSeries to QAbstractBarSeries
r1584 Q_D(const QAbstractBarSeries);
sauimone
barmargin replaced with barwidth
r1425 return d->barWidth();
sauimone
visible property to barseries
r1284 }
sauimone
Documentation for bar charts
r313 /*!
sauimone
Fixed category handling of barcharts. Now the categories can be undefined. Updated documentation.
r1208 Adds a set of bars to series. Takes ownership of \a set. If the set is null or is already in series, it won't be appended.
Returns true, if appending succeeded.
sauimone
Documentation for bar charts
r313 */
sauimone
QBarSeries to QAbstractBarSeries
r1584 bool QAbstractBarSeries::append(QBarSet *set)
sauimone
Barset and barcategory implememtation. Updated test application
r171 {
sauimone
QBarSeries to QAbstractBarSeries
r1584 Q_D(QAbstractBarSeries);
sauimone
barchart signals for properties and changes
r1353 bool success = d->append(set);
if (success) {
QList<QBarSet*> sets;
sets.append(set);
emit barsetsAdded(sets);
Tero Ahola
Minor modifications to properties of abstract, area and bar series
r1462 emit countChanged();
sauimone
barchart signals for properties and changes
r1353 }
return success;
sauimone
Barset and barcategory implememtation. Updated test application
r171 }
sauimone
Documentation for bar charts
r313 /*!
Michal Klocek
Krazy reported errors...
r974 Removes a set of bars from series. Releases ownership of \a set. Doesn't delete \a set.
sauimone
Fixed category handling of barcharts. Now the categories can be undefined. Updated documentation.
r1208 Returns true, if set was removed.
sauimone
Documentation for bar charts
r313 */
sauimone
QBarSeries to QAbstractBarSeries
r1584 bool QAbstractBarSeries::remove(QBarSet *set)
sauimone
Barset and barcategory implememtation. Updated test application
r171 {
sauimone
QBarSeries to QAbstractBarSeries
r1584 Q_D(QAbstractBarSeries);
sauimone
barchart signals for properties and changes
r1353 bool success = d->remove(set);
if (success) {
QList<QBarSet*> sets;
sets.append(set);
emit barsetsRemoved(sets);
Tero Ahola
Minor modifications to properties of abstract, area and bar series
r1462 emit countChanged();
sauimone
barchart signals for properties and changes
r1353 }
return success;
sauimone
percent barchart layout fix. signal fix
r850 }
/*!
Adds a list of barsets to series. Takes ownership of \a sets.
sauimone
Fixed category handling of barcharts. Now the categories can be undefined. Updated documentation.
r1208 Returns true, if all sets were appended succesfully. If any of the sets is null or is already appended to series,
nothing is appended and function returns false. If any of the sets is in list more than once, nothing is appended
and function returns false.
sauimone
percent barchart layout fix. signal fix
r850 */
sauimone
QBarSeries to QAbstractBarSeries
r1584 bool QAbstractBarSeries::append(QList<QBarSet* > sets)
sauimone
percent barchart layout fix. signal fix
r850 {
sauimone
QBarSeries to QAbstractBarSeries
r1584 Q_D(QAbstractBarSeries);
sauimone
barchart signals for properties and changes
r1353 bool success = d->append(sets);
if (success) {
emit barsetsAdded(sets);
Tero Ahola
Minor modifications to properties of abstract, area and bar series
r1462 emit countChanged();
sauimone
barchart signals for properties and changes
r1353 }
return success;
sauimone
percent barchart layout fix. signal fix
r850 }
Marek Rosa
Added insert method to QBarSeries
r1362 /*!
Insert a set of bars to series at \a index postion. Takes ownership of \a set. If the set is null or is already in series, it won't be appended.
Returns true, if inserting succeeded.
*/
sauimone
QBarSeries to QAbstractBarSeries
r1584 bool QAbstractBarSeries::insert(int index, QBarSet *set)
Marek Rosa
Added insert method to QBarSeries
r1362 {
sauimone
QBarSeries to QAbstractBarSeries
r1584 Q_D(QAbstractBarSeries);
Marek Rosa
Added insert method to QBarSeries
r1362 bool success = d->insert(index, set);
if (success) {
QList<QBarSet*> sets;
sets.append(set);
emit barsetsAdded(sets);
Tero Ahola
Minor modifications to properties of abstract, area and bar series
r1462 emit countChanged();
Marek Rosa
Added insert method to QBarSeries
r1362 }
return success;
}
Marek Rosa
Fixes to BarSeries and BarModelMapper
r1356 /*!
Removes all of the bar sets from the series
*/
sauimone
QBarSeries to QAbstractBarSeries
r1584 void QAbstractBarSeries::clear()
Marek Rosa
BarModelMapper: implemented model updated slots. Some more work needed with categories
r1295 {
sauimone
QBarSeries to QAbstractBarSeries
r1584 Q_D(QAbstractBarSeries);
Marek Rosa
Added some tests for BarModelMapper
r1364 QList<QBarSet *> sets = barSets();
bool success = d->remove(sets);
Marek Rosa
Minor fixes and started changing ReadMe
r1363 if (success) {
emit barsetsRemoved(sets);
Tero Ahola
Minor modifications to properties of abstract, area and bar series
r1462 emit countChanged();
Marek Rosa
Minor fixes and started changing ReadMe
r1363 }
Marek Rosa
BarModelMapper: implemented model updated slots. Some more work needed with categories
r1295 }
sauimone
Documentation for bar charts
r313 /*!
Returns number of sets in series.
*/
sauimone
QBarSeries to QAbstractBarSeries
r1584 int QAbstractBarSeries::count() const
sauimone
Added pen & brush to QBarSet
r214 {
sauimone
QBarSeries to QAbstractBarSeries
r1584 Q_D(const QAbstractBarSeries);
sauimone
barchart: removed old model
r1005 return d->m_barSets.count();
sauimone
Added pen & brush to QBarSet
r214 }
sauimone
Documentation for bar charts
r313 /*!
sauimone
review fix: Removed iterator from barseries. Remove const from brush and pen. Renamed setters for tooltip, floating values and separators
r357 Returns a list of sets in series. Keeps ownership of sets.
*/
sauimone
QBarSeries to QAbstractBarSeries
r1584 QList<QBarSet*> QAbstractBarSeries::barSets() const
sauimone
Added pen & brush to QBarSet
r214 {
sauimone
QBarSeries to QAbstractBarSeries
r1584 Q_D(const QAbstractBarSeries);
sauimone
barchart: removed old model
r1005 return d->m_barSets;
sauimone
Added pen & brush to QBarSet
r214 }
sauimone
fixed clipping in barcharts
r839 /*!
Sets the visibility of labels in series to \a visible
*/
sauimone
QBarSeries to QAbstractBarSeries
r1584 void QAbstractBarSeries::setLabelsVisible(bool visible)
sauimone
values visibility handling changed in barchart
r813 {
sauimone
QBarSeries to QAbstractBarSeries
r1584 Q_D(QAbstractBarSeries);
sauimone
removed barlabel. label visibility control is now per series instead of per set
r1246 if (d->m_labelsVisible != visible) {
sauimone
barchart signals for properties and changes
r1353 d->setLabelsVisible(visible);
emit labelsVisibleChanged();
sauimone
values visibility handling changed in barchart
r813 }
}
sauimone
minor doc update
r1299 /*!
Returns the visibility of labels
*/
sauimone
QBarSeries to QAbstractBarSeries
r1584 bool QAbstractBarSeries::isLabelsVisible() const
sauimone
removed barlabel. label visibility control is now per series instead of per set
r1246 {
sauimone
QBarSeries to QAbstractBarSeries
r1584 Q_D(const QAbstractBarSeries);
sauimone
removed barlabel. label visibility control is now per series instead of per set
r1246 return d->m_labelsVisible;
}
Michal Klocek
Adds big fat pimpl to series classes...
r938 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
sauimone
QBarSeries to QAbstractBarSeries
r1584 QAbstractBarSeriesPrivate::QAbstractBarSeriesPrivate(QAbstractBarSeries *q) :
Tero Ahola
Renamed QSeries to QAbstractSeries
r988 QAbstractSeriesPrivate(q),
sauimone
barmargin replaced with barwidth
r1425 m_barWidth(0.5), // Default value is 50% of category width
sauimone
visible property to barseries
r1284 m_labelsVisible(false),
m_visible(true)
Michal Klocek
Adds big fat pimpl to series classes...
r938 {
}
sauimone
QBarSeries to QAbstractBarSeries
r1584 int QAbstractBarSeriesPrivate::categoryCount() const
sauimone
Fixed category handling of barcharts. Now the categories can be undefined. Updated documentation.
r1208 {
// No categories defined. return count of longest set.
int count = 0;
for (int i=0; i<m_barSets.count(); i++) {
if (m_barSets.at(i)->count() > count) {
count = m_barSets.at(i)->count();
}
}
return count;
}
sauimone
QBarSeries to QAbstractBarSeries
r1584 void QAbstractBarSeriesPrivate::setBarWidth(qreal width)
sauimone
new series: groupedbarseries
r1167 {
sauimone
barmargin replaced with barwidth
r1425 if (width < 0.0) {
width = 0.0;
sauimone
new series: groupedbarseries
r1167 }
sauimone
barmargin replaced with barwidth
r1425 m_barWidth = width;
sauimone
new series: groupedbarseries
r1167 emit updatedBars();
}
sauimone
QBarSeries to QAbstractBarSeries
r1584 qreal QAbstractBarSeriesPrivate::barWidth() const
sauimone
new series: groupedbarseries
r1167 {
sauimone
barmargin replaced with barwidth
r1425 return m_barWidth;
sauimone
new series: groupedbarseries
r1167 }
sauimone
separated categories from barseries constructor
r1112
sauimone
QBarSeries to QAbstractBarSeries
r1584 QBarSet* QAbstractBarSeriesPrivate::barsetAt(int index)
Michal Klocek
Adds big fat pimpl to series classes...
r938 {
sauimone
barchart: removed old model
r1005 return m_barSets.at(index);
Michal Klocek
Adds big fat pimpl to series classes...
r938 }
sauimone
QBarSeries to QAbstractBarSeries
r1584 void QAbstractBarSeriesPrivate::setVisible(bool visible)
sauimone
visible property to barseries
r1284 {
sauimone
barchart signals for properties and changes
r1353 m_visible = visible;
emit updatedBars();
sauimone
visible property to barseries
r1284 }
sauimone
QBarSeries to QAbstractBarSeries
r1584 void QAbstractBarSeriesPrivate::setLabelsVisible(bool visible)
sauimone
visible property to barseries
r1284 {
sauimone
barchart signals for properties and changes
r1353 m_labelsVisible = visible;
emit labelsVisibleChanged(visible);
sauimone
visible property to barseries
r1284 }
sauimone
QBarSeries to QAbstractBarSeries
r1584 qreal QAbstractBarSeriesPrivate::min()
Michal Klocek
Adds big fat pimpl to series classes...
r938 {
sauimone
barchart: removed old model
r1005 if (m_barSets.count() <= 0) {
return 0;
}
qreal min = INT_MAX;
for (int i = 0; i < m_barSets.count(); i++) {
int categoryCount = m_barSets.at(i)->count();
for (int j = 0; j < categoryCount; j++) {
sauimone
Removed QPointF from QBarSet
r1580 qreal temp = m_barSets.at(i)->at(j);
sauimone
barchart: removed old model
r1005 if (temp < min)
min = temp;
}
}
return min;
Michal Klocek
Adds big fat pimpl to series classes...
r938 }
sauimone
QBarSeries to QAbstractBarSeries
r1584 qreal QAbstractBarSeriesPrivate::max()
Michal Klocek
Adds big fat pimpl to series classes...
r938 {
sauimone
barchart: removed old model
r1005 if (m_barSets.count() <= 0) {
return 0;
}
qreal max = INT_MIN;
for (int i = 0; i < m_barSets.count(); i++) {
int categoryCount = m_barSets.at(i)->count();
for (int j = 0; j < categoryCount; j++) {
sauimone
Removed QPointF from QBarSet
r1580 qreal temp = m_barSets.at(i)->at(j);
sauimone
barchart: removed old model
r1005 if (temp > max)
max = temp;
}
}
return max;
Michal Klocek
Adds big fat pimpl to series classes...
r938 }
sauimone
QBarSeries to QAbstractBarSeries
r1584 qreal QAbstractBarSeriesPrivate::valueAt(int set, int category)
Michal Klocek
Adds big fat pimpl to series classes...
r938 {
sauimone
barchart: removed old model
r1005 if ((set < 0) || (set >= m_barSets.count())) {
// No set, no value.
return 0;
} else if ((category < 0) || (category >= m_barSets.at(set)->count())) {
// No category, no value.
return 0;
}
sauimone
Removed QPointF from QBarSet
r1580 return m_barSets.at(set)->at(category);
Michal Klocek
Adds big fat pimpl to series classes...
r938 }
sauimone
QBarSeries to QAbstractBarSeries
r1584 qreal QAbstractBarSeriesPrivate::percentageAt(int set, int category)
Michal Klocek
Adds big fat pimpl to series classes...
r938 {
sauimone
barchart: removed old model
r1005 if ((set < 0) || (set >= m_barSets.count())) {
// No set, no value.
return 0;
} else if ((category < 0) || (category >= m_barSets.at(set)->count())) {
// No category, no value.
return 0;
}
sauimone
Removed QPointF from QBarSet
r1580 qreal value = m_barSets.at(set)->at(category);
sauimone
barchart: removed old model
r1005 qreal sum = categorySum(category);
if ( qFuzzyIsNull(sum) ) {
return 0;
}
return value / sum;
Michal Klocek
Adds big fat pimpl to series classes...
r938 }
sauimone
QBarSeries to QAbstractBarSeries
r1584 qreal QAbstractBarSeriesPrivate::categorySum(int category)
Michal Klocek
Adds big fat pimpl to series classes...
r938 {
sauimone
barchart: removed old model
r1005 qreal sum(0);
int count = m_barSets.count(); // Count sets
for (int set = 0; set < count; set++) {
if (category < m_barSets.at(set)->count())
sauimone
Removed QPointF from QBarSet
r1580 sum += m_barSets.at(set)->at(category);
sauimone
barchart: removed old model
r1005 }
return sum;
Michal Klocek
Adds big fat pimpl to series classes...
r938 }
sauimone
QBarSeries to QAbstractBarSeries
r1584 qreal QAbstractBarSeriesPrivate::absoluteCategorySum(int category)
Michal Klocek
Adds big fat pimpl to series classes...
r938 {
sauimone
barchart: removed old model
r1005 qreal sum(0);
int count = m_barSets.count(); // Count sets
for (int set = 0; set < count; set++) {
if (category < m_barSets.at(set)->count())
sauimone
Removed QPointF from QBarSet
r1580 sum += qAbs(m_barSets.at(set)->at(category));
sauimone
barchart: removed old model
r1005 }
return sum;
Michal Klocek
Adds big fat pimpl to series classes...
r938 }
sauimone
QBarSeries to QAbstractBarSeries
r1584 qreal QAbstractBarSeriesPrivate::maxCategorySum()
Michal Klocek
Adds big fat pimpl to series classes...
r938 {
sauimone
barchart: removed old model
r1005 qreal max = INT_MIN;
sauimone
Fixed category handling of barcharts. Now the categories can be undefined. Updated documentation.
r1208 int count = categoryCount();
sauimone
barchart: removed old model
r1005 for (int i = 0; i < count; i++) {
qreal sum = categorySum(i);
if (sum > max)
max = sum;
}
return max;
Michal Klocek
Adds big fat pimpl to series classes...
r938 }
sauimone
QBarSeries to QAbstractBarSeries
r1584 qreal QAbstractBarSeriesPrivate::minX()
sauimone
scaledomain fix for barchart
r1423 {
if (m_barSets.count() <= 0) {
return 0;
}
qreal min = INT_MAX;
for (int i = 0; i < m_barSets.count(); i++) {
int categoryCount = m_barSets.at(i)->count();
for (int j = 0; j < categoryCount; j++) {
sauimone
Removed QPointF from QBarSet
r1580 qreal temp = m_barSets.at(i)->d_ptr.data()->m_values.at(j).x();
sauimone
scaledomain fix for barchart
r1423 if (temp < min)
min = temp;
}
}
return min;
}
sauimone
QBarSeries to QAbstractBarSeries
r1584 qreal QAbstractBarSeriesPrivate::maxX()
sauimone
scaledomain fix for barchart
r1423 {
if (m_barSets.count() <= 0) {
return 0;
}
qreal max = INT_MIN;
for (int i = 0; i < m_barSets.count(); i++) {
int categoryCount = m_barSets.at(i)->count();
for (int j = 0; j < categoryCount; j++) {
sauimone
Removed QPointF from QBarSet
r1580 qreal temp = m_barSets.at(i)->d_ptr.data()->m_values.at(j).x();
sauimone
scaledomain fix for barchart
r1423 if (temp > max)
max = temp;
}
}
return max;
}
sauimone
QBarSeries to QAbstractBarSeries
r1584 void QAbstractBarSeriesPrivate::scaleDomain(Domain& domain)
Michal Klocek
Refactor to use qseries private for implmentation interface...
r943 {
qreal minX(domain.minX());
qreal minY(domain.minY());
qreal maxX(domain.maxX());
qreal maxY(domain.maxY());
int tickXCount(domain.tickXCount());
int tickYCount(domain.tickYCount());
sauimone
scaledomain fix for barchart
r1423 qreal seriesMinX = this->minX();
qreal seriesMaxX = this->maxX();
sauimone
barchart PIMPL part 2. Cleaning up leftovers in public api
r962 qreal y = max();
sauimone
scaledomain fix for barchart
r1423 minX = qMin(minX, seriesMinX - 0.5);
Michal Klocek
Refactor to use qseries private for implmentation interface...
r943 minY = qMin(minY, y);
sauimone
scaledomain fix for barchart
r1423 maxX = qMax(maxX, seriesMaxX + 0.5);
Michal Klocek
Refactor to use qseries private for implmentation interface...
r943 maxY = qMax(maxY, y);
sauimone
scaledomain fix for barchart
r1423 tickXCount = categoryCount()+1;
Michal Klocek
Refactor to use qseries private for implmentation interface...
r943
Michal Klocek
Refactor axis hadnling...
r1078 domain.setRange(minX,maxX,minY,maxY,tickXCount,tickYCount);
Michal Klocek
Refactor to use qseries private for implmentation interface...
r943 }
sauimone
QBarSeries to QAbstractBarSeries
r1584 Chart* QAbstractBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
Michal Klocek
Refactor to use qseries private for implmentation interface...
r943 {
sauimone
refactored baranimations
r1673 Q_UNUSED(presenter);
qWarning() << "QAbstractBarSeriesPrivate::createGraphics called";
return 0;
Michal Klocek
Refactor to use qseries private for implmentation interface...
r943 }
sauimone
QBarSeries to QAbstractBarSeries
r1584 QList<LegendMarker*> QAbstractBarSeriesPrivate::createLegendMarker(QLegend* legend)
Michal Klocek
Adds qlegend pimpl...
r950 {
sauimone
QBarSeries to QAbstractBarSeries
r1584 Q_Q(QAbstractBarSeries);
Michal Klocek
Adds qlegend pimpl...
r950 QList<LegendMarker*> markers;
foreach(QBarSet* set, q->barSets()) {
BarLegendMarker* marker = new BarLegendMarker(q,set,legend);
markers << marker;
}
return markers;
}
sauimone
QBarSeries to QAbstractBarSeries
r1584 bool QAbstractBarSeriesPrivate::append(QBarSet *set)
sauimone
legend detach example. Bug fixes to legend.
r1263 {
sauimone
QBarSeries to QAbstractBarSeries
r1584 Q_Q(QAbstractBarSeries);
sauimone
legend detach example. Bug fixes to legend.
r1263 if ((m_barSets.contains(set)) || (set == 0)) {
// Fail if set is already in list or set is null.
return false;
}
m_barSets.append(set);
sauimone
fixed crash in barseries with empty sets
r1339 QObject::connect(set->d_ptr.data(), SIGNAL(updatedBars()), this, SIGNAL(updatedBars()));
QObject::connect(set->d_ptr.data(), SIGNAL(restructuredBars()), this, SIGNAL(restructuredBars()));
sauimone
bugfix: notifying legend before barchartitem caused crash in some situations
r1437 emit restructuredBars(); // this notifies barchartitem
sauimone
legend detach example. Bug fixes to legend.
r1263 if (m_dataset) {
m_dataset->updateSeries(q); // this notifies legend
}
return true;
}
sauimone
QBarSeries to QAbstractBarSeries
r1584 bool QAbstractBarSeriesPrivate::remove(QBarSet *set)
sauimone
legend detach example. Bug fixes to legend.
r1263 {
sauimone
QBarSeries to QAbstractBarSeries
r1584 Q_Q(QAbstractBarSeries);
sauimone
legend detach example. Bug fixes to legend.
r1263 if (!m_barSets.contains(set)) {
// Fail if set is not in list
return false;
}
m_barSets.removeOne(set);
sauimone
fixed crash in barseries with empty sets
r1339 QObject::disconnect(set->d_ptr.data(), SIGNAL(updatedBars()), this, SIGNAL(updatedBars()));
QObject::disconnect(set->d_ptr.data(), SIGNAL(restructuredBars()), this, SIGNAL(restructuredBars()));
sauimone
bugfix: notifying legend before barchartitem caused crash in some situations
r1437 emit restructuredBars(); // this notifies barchartitem
sauimone
legend detach example. Bug fixes to legend.
r1263 if (m_dataset) {
m_dataset->updateSeries(q); // this notifies legend
}
return true;
}
sauimone
QBarSeries to QAbstractBarSeries
r1584 bool QAbstractBarSeriesPrivate::append(QList<QBarSet* > sets)
sauimone
legend detach example. Bug fixes to legend.
r1263 {
sauimone
QBarSeries to QAbstractBarSeries
r1584 Q_Q(QAbstractBarSeries);
sauimone
legend detach example. Bug fixes to legend.
r1263 foreach (QBarSet* set, sets) {
if ((set == 0) || (m_barSets.contains(set))) {
// Fail if any of the sets is null or is already appended.
return false;
}
if (sets.count(set) != 1) {
// Also fail if same set is more than once in given list.
return false;
}
}
foreach (QBarSet* set, sets) {
m_barSets.append(set);
sauimone
fixed crash in barseries with empty sets
r1339 QObject::connect(set->d_ptr.data(), SIGNAL(updatedBars()), this, SIGNAL(updatedBars()));
QObject::connect(set->d_ptr.data(), SIGNAL(restructuredBars()), this, SIGNAL(restructuredBars()));
sauimone
legend detach example. Bug fixes to legend.
r1263 }
sauimone
bugfix: notifying legend before barchartitem caused crash in some situations
r1437 emit restructuredBars(); // this notifies barchartitem
sauimone
legend detach example. Bug fixes to legend.
r1263 if (m_dataset) {
m_dataset->updateSeries(q); // this notifies legend
}
return true;
}
sauimone
QBarSeries to QAbstractBarSeries
r1584 bool QAbstractBarSeriesPrivate::remove(QList<QBarSet* > sets)
sauimone
legend detach example. Bug fixes to legend.
r1263 {
sauimone
QBarSeries to QAbstractBarSeries
r1584 Q_Q(QAbstractBarSeries);
sauimone
fix barseries remove return value with empty list
r1371 if (sets.count() == 0) {
return false;
}
sauimone
legend detach example. Bug fixes to legend.
r1263 foreach (QBarSet* set, sets) {
sauimone
barchart signals for properties and changes
r1353 if ((set == 0) || (!m_barSets.contains(set))) {
// Fail if any of the sets is null or is not in series
return false;
}
if (sets.count(set) != 1) {
// Also fail if same set is more than once in given list.
return false;
sauimone
legend detach example. Bug fixes to legend.
r1263 }
}
sauimone
barchart signals for properties and changes
r1353 foreach (QBarSet* set, sets) {
m_barSets.removeOne(set);
QObject::disconnect(set->d_ptr.data(), SIGNAL(updatedBars()), this, SIGNAL(updatedBars()));
QObject::disconnect(set->d_ptr.data(), SIGNAL(restructuredBars()), this, SIGNAL(restructuredBars()));
sauimone
legend detach example. Bug fixes to legend.
r1263 }
sauimone
barchart signals for properties and changes
r1353
sauimone
bugfix: notifying legend before barchartitem caused crash in some situations
r1437 emit restructuredBars(); // this notifies barchartitem
sauimone
barchart signals for properties and changes
r1353 if (m_dataset) {
m_dataset->updateSeries(q); // this notifies legend
}
return true;
sauimone
legend detach example. Bug fixes to legend.
r1263 }
sauimone
QBarSeries to QAbstractBarSeries
r1584 bool QAbstractBarSeriesPrivate::insert(int index, QBarSet *set)
Marek Rosa
Added insert method to QBarSeries
r1362 {
sauimone
QBarSeries to QAbstractBarSeries
r1584 Q_Q(QAbstractBarSeries);
Marek Rosa
Added insert method to QBarSeries
r1362 if ((m_barSets.contains(set)) || (set == 0)) {
// Fail if set is already in list or set is null.
return false;
}
m_barSets.insert(index, set);
QObject::connect(set->d_ptr.data(), SIGNAL(updatedBars()), this, SIGNAL(updatedBars()));
QObject::connect(set->d_ptr.data(), SIGNAL(restructuredBars()), this, SIGNAL(restructuredBars()));
sauimone
bugfix: notifying legend before barchartitem caused crash in some situations
r1437 emit restructuredBars(); // this notifies barchartitem
Marek Rosa
Added insert method to QBarSeries
r1362 if (m_dataset) {
m_dataset->updateSeries(q); // this notifies legend
}
return true;
}
Michal Klocek
Adds createDefaultAxes logic
r1588 void QAbstractBarSeriesPrivate::initializeAxisX(QAbstractAxis* axis)
{
Michal Klocek
Default numbering for empty categories in barseries
r1595 if(axis->type()==QAbstractAxis::AxisTypeCategories)
{
Michal Klocek
Refactor CategoriesAxis to BarCategoriesAxis part 1 of 2
r1612 QBarCategoriesAxis* cataxis = qobject_cast<QBarCategoriesAxis*>(axis);
Michal Klocek
Default numbering for empty categories in barseries
r1595 Q_ASSERT(cataxis);
QStringList categories;
for (int i(1); i < categoryCount()+1; i++)
categories << QString::number(i);
cataxis->append(categories);
}
Michal Klocek
Adds createDefaultAxes logic
r1588 }
void QAbstractBarSeriesPrivate::initializeAxisY(QAbstractAxis* axis)
{
Q_UNUSED(axis)
}
QAbstractAxis::AxisType QAbstractBarSeriesPrivate::defaultAxisXType() const
{
return QAbstractAxis::AxisTypeCategories;
}
QAbstractAxis::AxisType QAbstractBarSeriesPrivate::defaultAxisYType() const
{
return QAbstractAxis::AxisTypeValues;
}
sauimone
renamed barseries files to abstractbarseries
r1586 #include "moc_qabstractbarseries.cpp"
#include "moc_qabstractbarseries_p.cpp"
sauimone
Improved bar chart series
r71
Michal Klocek
Adds createDefaultAxes logic
r1588
sauimone
Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?
r56 QTCOMMERCIALCHART_END_NAMESPACE