##// END OF EJS Templates
Commented out problematic pie model mapper in declarative impl
Commented out problematic pie model mapper in declarative impl

File last commit:

r1208:2943560d5819
r1212:c66ff10c81c9
Show More
qbarseries.cpp
654 lines | 18.5 KiB | text/x-c | CppLexer
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
Naming convention change for barcharts. QBarChartSeries is now QBarSeries etc.
r338 #include "qbarseries.h"
Michal Klocek
Adds big fat pimpl to series classes...
r938 #include "qbarseries_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"
Michal Klocek
Adds big fat pimpl to series classes...
r938
Marek Rosa
Fixed: QAbstractItemModel could be forward declaration
r862 #include <QAbstractItemModel>
Marek Rosa
BarSeries - renamed internal model getter to modelInternal. Some smaller changes to other files to have in headers forward declarations for model related members instead of include
r877 #include <QModelIndex>
Marek Rosa
BarSeries Model mapper added
r1170 #include <QBarModelMapper>
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
r126
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
Naming convention change for barcharts. QBarChartSeries is now QBarSeries etc.
r338 \class QBarSeries
sauimone
Documentation for bar charts
r313 \brief part of QtCommercial chart API.
Tero Ahola
Documentation fixes....
r995 \mainclass
sauimone
Documentation for bar charts
r313
sauimone
Fixed category handling of barcharts. Now the categories can be undefined. Updated documentation.
r1208 QBarSeries represents a series of data shown as bars. The purpose of this class is to draw bars to
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 */
/*!
sauimone
barchart: removed mousebuttons from clicked signal. removed selected signal. unified internal signal naming in barset and barseries private
r1008 \fn void QBarSeries::clicked(QBarSet *barset, QString category)
Tero Ahola
Updated documentation, warnings from legend and area left
r973
sauimone
barchart: removed mousebuttons from clicked signal. removed selected signal. unified internal signal naming in barset and barseries private
r1008 The signal is emitted if the user clicks with a mouse on top of QBarSet \a barset of category \a category
Tero Ahola
Updated documentation, warnings from legend and area left
r973 contained by the series.
*/
sauimone
barchart: doc update for hover signals
r980 /*!
\fn void QBarSeries::hovered(QBarSet* barset, bool status)
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
Documentation for bar charts
r313 /*!
sauimone
Fixed category handling of barcharts. Now the categories can be undefined. Updated documentation.
r1208 Constructs empty QBarSeries.
sauimone
Naming convention change for barcharts. QBarChartSeries is now QBarSeries etc.
r338 QBarSeries is QObject which is a child of a \a parent.
sauimone
Documentation for bar charts
r313 */
sauimone
Fixed category handling of barcharts. Now the categories can be undefined. Updated documentation.
r1208 QBarSeries::QBarSeries(QObject *parent) :
QAbstractSeries(*new QBarSeriesPrivate(this),parent)
Michal Klocek
Adds big fat pimpl to series classes...
r938 {
}
sauimone
barchart: doc update for hover signals
r980 /*!
Destructs barseries and owned barsets.
*/
QBarSeries::~QBarSeries()
{
// NOTE: d_ptr destroyed by QObject
}
Tero Ahola
Updated documentation, warnings from legend and area left
r973 /*!
\internal
*/
QBarSeries::QBarSeries(QBarSeriesPrivate &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
barchart: doc update for hover signals
r980 /*!
Returns the type of series. Derived classes override this.
*/
Michal Klocek
Fixes to API , QSeriesType -> SeriesType , add missing getters
r1107 QAbstractSeries::SeriesType QBarSeries::type() const
sauimone
Improved bar chart series
r71 {
Tero Ahola
Renamed QSeries to QAbstractSeries
r988 return QAbstractSeries::SeriesTypeBar;
sauimone
Improved bar chart series
r71 }
sauimone
Fixed category handling of barcharts. Now the categories can be undefined. Updated documentation.
r1208 /*!
Sets the \a categories, which are used to to group the data.
*/
sauimone
separated categories from barseries constructor
r1112 void QBarSeries::setCategories(QBarCategories categories)
{
Q_D(QBarSeries);
d->setCategories(categories);
emit d->categoriesUpdated();
}
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
Renamed appendBarSet to append, removeBarSet to remove
r1194 bool QBarSeries::append(QBarSet *set)
sauimone
Barset and barcategory implememtation. Updated test application
r171 {
sauimone
barchart pimpl part 1
r934 Q_D(QBarSeries);
sauimone
more error tolerant barseries set/remove barset functions
r1121 if ((d->m_barSets.contains(set)) || (set == 0)) {
// Fail if set is already in list or set is null.
return false;
}
sauimone
barchart: removed old model
r1005 d->m_barSets.append(set);
sauimone
barchart: removed mousebuttons from clicked signal. removed selected signal. unified internal signal naming in barset and barseries private
r1008 QObject::connect(set->d_ptr.data(), SIGNAL(updatedBars()), d, SLOT(barsetChanged()));
Michal Klocek
Adds big fat pimpl to series classes...
r938 emit d->restructuredBars();
sauimone
more error tolerant barseries set/remove barset functions
r1121 return true;
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
Renamed appendBarSet to append, removeBarSet to remove
r1194 bool QBarSeries::remove(QBarSet *set)
sauimone
Barset and barcategory implememtation. Updated test application
r171 {
sauimone
barchart pimpl part 1
r934 Q_D(QBarSeries);
sauimone
more error tolerant barseries set/remove barset functions
r1121 if (!d->m_barSets.contains(set)) {
// Fail if set is not in list
return false;
sauimone
barchart: removed old model
r1005 }
sauimone
more error tolerant barseries set/remove barset functions
r1121 d->m_barSets.removeOne(set);
QObject::disconnect(set->d_ptr.data(), SIGNAL(updatedBars()), d, SLOT(barsetChanged()));
emit d->restructuredBars();
return true;
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
Renamed appendBarSet to append, removeBarSet to remove
r1194 bool QBarSeries::append(QList<QBarSet* > sets)
sauimone
percent barchart layout fix. signal fix
r850 {
sauimone
barchart pimpl part 1
r934 Q_D(QBarSeries);
sauimone
more error tolerant barseries set/remove barset functions
r1121 foreach (QBarSet* set, sets) {
if ((set == 0) || (d->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;
}
}
sauimone
barchart: removed mousebuttons from clicked signal. removed selected signal. unified internal signal naming in barset and barseries private
r1008 foreach (QBarSet* set, sets) {
d->m_barSets.append(set);
sauimone
updated barseries unit test. fixed found errors.
r1101 QObject::connect(set->d_ptr.data(), SIGNAL(updatedBars()), d, SLOT(barsetChanged()));
sauimone
percent barchart layout fix. signal fix
r850 }
Michal Klocek
Adds big fat pimpl to series classes...
r938 emit d->restructuredBars();
sauimone
more error tolerant barseries set/remove barset functions
r1121 return true;
sauimone
percent barchart layout fix. signal fix
r850 }
/*!
Michal Klocek
Krazy reported errors...
r974 Removes a list of barsets from series. Releases ownership of \a sets. Doesn't delete \a sets.
sauimone
percent barchart layout fix. signal fix
r850 */
sauimone
Renamed appendBarSet to append, removeBarSet to remove
r1194 bool QBarSeries::remove(QList<QBarSet* > sets)
sauimone
percent barchart layout fix. signal fix
r850 {
sauimone
barchart pimpl part 1
r934 Q_D(QBarSeries);
Michal Klocek
Adds big fat pimpl to series classes...
r938
sauimone
improved set/remove barset test cases. fixed errors
r1122 bool setsRemoved = false;
sauimone
barchart: removed mousebuttons from clicked signal. removed selected signal. unified internal signal naming in barset and barseries private
r1008 foreach (QBarSet* set, sets) {
if (d->m_barSets.contains(set)) {
d->m_barSets.removeOne(set);
sauimone
updated barseries unit test. fixed found errors.
r1101 QObject::disconnect(set->d_ptr.data(), SIGNAL(updatedBars()), d, SLOT(barsetChanged()));
sauimone
improved set/remove barset test cases. fixed errors
r1122 setsRemoved = true;
sauimone
barchart: removed old model
r1005 }
sauimone
percent barchart layout fix. signal fix
r850 }
sauimone
improved set/remove barset test cases. fixed errors
r1122
if (setsRemoved) {
emit d->restructuredBars();
}
return setsRemoved;
sauimone
removed barchartseriesbase. functionality is now in model
r172 }
sauimone
Documentation for bar charts
r313 /*!
Returns number of sets in series.
*/
sauimone
const to getters, renamed addBarset to appendBarset
r776 int QBarSeries::barsetCount() const
sauimone
Added pen & brush to QBarSet
r214 {
sauimone
barchart pimpl part 1
r934 Q_D(const QBarSeries);
sauimone
barchart: removed old model
r1005 return d->m_barSets.count();
sauimone
Added pen & brush to QBarSet
r214 }
sauimone
exposing countcategories to user from barchartseries
r323 /*!
Returns number of categories in series
*/
sauimone
const to getters, renamed addBarset to appendBarset
r776 int QBarSeries::categoryCount() const
sauimone
exposing countcategories to user from barchartseries
r323 {
sauimone
barchart pimpl part 1
r934 Q_D(const QBarSeries);
sauimone
Fixed category handling of barcharts. Now the categories can be undefined. Updated documentation.
r1208 return d->categoryCount();
sauimone
exposing countcategories to user from barchartseries
r323 }
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
const to getters, renamed addBarset to appendBarset
r776 QList<QBarSet*> QBarSeries::barSets() const
sauimone
Added pen & brush to QBarSet
r214 {
sauimone
barchart pimpl part 1
r934 Q_D(const QBarSeries);
sauimone
barchart: removed old model
r1005 return d->m_barSets;
sauimone
Added pen & brush to QBarSet
r214 }
Marek Rosa
Removed few commeneted out lines and documented few funtions
r879 /*!
\fn bool QBarSeries::setModel(QAbstractItemModel *model)
Sets the \a model to be used as a data source
*/
sauimone
warning are errors. fixed
r1168 void QBarSeries::setModel(QAbstractItemModel *model)
Marek Rosa
QXYSeries: model data orientation added. QBarSeries: some model data function placeholders
r527 {
Marek Rosa
BarSeries Model mapper added
r1170 Q_D(QBarSeries);
// disconnect signals from old model
if(d->m_model)
{
disconnect(d->m_model, 0, this, 0);
}
// set new model
if(model)
{
d->m_model = model;
// connect the signals
connect(d->m_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), d, SLOT(modelUpdated(QModelIndex,QModelIndex)));
connect(d->m_model, SIGNAL(rowsInserted(QModelIndex,int,int)), d, SLOT(modelDataAdded(QModelIndex,int,int)));
connect(d->m_model, SIGNAL(rowsRemoved(QModelIndex,int,int)), d, SLOT(modelDataRemoved(QModelIndex,int,int)));
connect(d->m_model, SIGNAL(columnsInserted(QModelIndex,int,int)), d, SLOT(modelDataAdded(QModelIndex,int,int)));
connect(d->m_model, SIGNAL(columnsRemoved(QModelIndex,int,int)), d, SLOT(modelDataRemoved(QModelIndex,int,int)));
if (d->m_mapper)
d->initializeDataFromModel();
}
else
{
d->m_model = 0;
}
Marek Rosa
QXYSeries: model data orientation added. QBarSeries: some model data function placeholders
r527 }
Marek Rosa
BarSeries Model mapper added
r1170 void QBarSeries::setModelMapper(QBarModelMapper *mapper)
{
Q_D(QBarSeries);
// disconnect signals from old mapper
if (d->m_mapper) {
QObject::disconnect(d->m_mapper, 0, this, 0);
}
if (mapper) {
d->m_mapper = mapper;
// connect the signal from the mapper
Marek Rosa
Fixes to barseries and pieseries model support. Started adding barseries model tests
r1184 connect(d->m_mapper, SIGNAL(updated()), d, SLOT(initializeDataFromModel()));
Marek Rosa
BarSeries Model mapper added
r1170
if (d->m_model)
d->initializeDataFromModel();
} else {
d->m_mapper = 0;
}
}
QBarModelMapper* QBarSeries::modelMapper() const
{
Q_D(const QBarSeries);
return d->m_mapper;
}
Marek Rosa
PieSeries: model now supports custom mapping.
r1056
Tero Ahola
Updated documentation, warnings from legend and area left
r973 /*!
Returns the bar categories of the series.
*/
Michal Klocek
Adds BarCategories typedef
r703 QBarCategories QBarSeries::categories() const
{
sauimone
barchart pimpl part 1
r934 Q_D(const QBarSeries);
sauimone
Fixed category handling of barcharts. Now the categories can be undefined. Updated documentation.
r1208 return d->categories();
Michal Klocek
Adds BarCategories typedef
r703 }
sauimone
fixed clipping in barcharts
r839 /*!
Sets the visibility of labels in series to \a visible
*/
sauimone
renamed barchart floating values with labels to be consistent with piechart
r820 void QBarSeries::setLabelsVisible(bool visible)
sauimone
values visibility handling changed in barchart
r813 {
foreach (QBarSet* s, barSets()) {
sauimone
renamed barchart floating values with labels to be consistent with piechart
r820 s->setLabelsVisible(visible);
sauimone
values visibility handling changed in barchart
r813 }
}
Michal Klocek
Adds big fat pimpl to series classes...
r938 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
sauimone
new series: groupedbarseries
r1167 QBarSeriesPrivate::QBarSeriesPrivate(QBarSeries *q) :
Tero Ahola
Renamed QSeries to QAbstractSeries
r988 QAbstractSeriesPrivate(q),
sauimone
new series: groupedbarseries
r1167 m_barMargin(0.05), // Default value is 5% of category width
Marek Rosa
BarSeries Model mapper added
r1170 m_mapper(0)
Michal Klocek
Adds big fat pimpl to series classes...
r938 {
}
sauimone
separated categories from barseries constructor
r1112 void QBarSeriesPrivate::setCategories(QBarCategories categories)
{
m_categories = categories;
}
sauimone
Fixed category handling of barcharts. Now the categories can be undefined. Updated documentation.
r1208 void QBarSeriesPrivate::insertCategory(int index, const QString category)
{
m_categories.insert(index, category);
emit categoriesUpdated();
}
void QBarSeriesPrivate::removeCategory(int index)
{
m_categories.removeAt(index);
emit categoriesUpdated();
}
int QBarSeriesPrivate::categoryCount() const
{
if (m_categories.count() > 0) {
return m_categories.count();
}
// 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;
}
QBarCategories QBarSeriesPrivate::categories() const
{
if (m_categories.count() > 0) {
return m_categories;
}
// No categories defined. retun list of indices.
QBarCategories categories;
int count = categoryCount();
for (int i = 0; i < count; i++) {
categories.append(QString::number(i));
}
return categories;
}
sauimone
new series: groupedbarseries
r1167 void QBarSeriesPrivate::setBarMargin(qreal margin)
{
if (margin > 1.0) {
margin = 1.0;
} else if (margin < 0.0) {
margin = 0.0;
}
m_barMargin = margin;
emit updatedBars();
}
qreal QBarSeriesPrivate::barMargin()
{
return m_barMargin;
}
sauimone
separated categories from barseries constructor
r1112
Michal Klocek
Adds big fat pimpl to series classes...
r938 QBarSet* QBarSeriesPrivate::barsetAt(int index)
{
sauimone
barchart: removed old model
r1005 return m_barSets.at(index);
Michal Klocek
Adds big fat pimpl to series classes...
r938 }
QString QBarSeriesPrivate::categoryName(int category)
{
sauimone
Fixed category handling of barcharts. Now the categories can be undefined. Updated documentation.
r1208 if ((category > 0) && (category < m_categories.count())) {
return m_categories.at(category);
}
return QString::number(category);
Michal Klocek
Adds big fat pimpl to series classes...
r938 }
qreal QBarSeriesPrivate::min()
{
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
new series: groupedbarseries
r1167 qreal temp = m_barSets.at(i)->at(j).y();
sauimone
barchart: removed old model
r1005 if (temp < min)
min = temp;
}
}
return min;
Michal Klocek
Adds big fat pimpl to series classes...
r938 }
qreal QBarSeriesPrivate::max()
{
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
new series: groupedbarseries
r1167 qreal temp = m_barSets.at(i)->at(j).y();
sauimone
barchart: removed old model
r1005 if (temp > max)
max = temp;
}
}
return max;
Michal Klocek
Adds big fat pimpl to series classes...
r938 }
qreal QBarSeriesPrivate::valueAt(int set, int category)
{
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
new series: groupedbarseries
r1167 return m_barSets.at(set)->at(category).y();
Michal Klocek
Adds big fat pimpl to series classes...
r938 }
qreal QBarSeriesPrivate::percentageAt(int set, int category)
{
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
new series: groupedbarseries
r1167 qreal value = m_barSets.at(set)->at(category).y();
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 }
qreal QBarSeriesPrivate::categorySum(int category)
{
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
new series: groupedbarseries
r1167 sum += m_barSets.at(set)->at(category).y();
sauimone
barchart: removed old model
r1005 }
return sum;
Michal Klocek
Adds big fat pimpl to series classes...
r938 }
qreal QBarSeriesPrivate::absoluteCategorySum(int category)
{
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
new series: groupedbarseries
r1167 sum += qAbs(m_barSets.at(set)->at(category).y());
sauimone
barchart: removed old model
r1005 }
return sum;
Michal Klocek
Adds big fat pimpl to series classes...
r938 }
qreal QBarSeriesPrivate::maxCategorySum()
{
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 }
Marek Rosa
BarSeries Model mapper added
r1170 void QBarSeriesPrivate::modelUpdated(QModelIndex topLeft, QModelIndex bottomRight)
{
Marek Rosa
Fixes to barseries and pieseries model support. Started adding barseries model tests
r1184 if (m_model == 0 || m_mapper == 0)
return;
Marek Rosa
BarSeries Model mapper added
r1170 for (int row = topLeft.row(); row <= bottomRight.row(); row++) {
for (int column = topLeft.column(); column <= bottomRight.column(); column++) {
if (m_mapper->orientation() == Qt::Vertical)
{
// model update is relevant to BarSeries if the change was made to the part of the model that was mapped to BarSeries
if ( row >= m_mapper->first() && (m_mapper->count() == - 1 || row < m_mapper->first() + m_mapper->count())) {
if (column >= m_mapper->mapBarBottom() && column <= m_mapper->mapBarTop())
barsetAt(column - m_mapper->mapBarBottom())->replace(row - m_mapper->first(), m_model->data(topLeft, Qt::DisplayRole).toDouble());
// if (column == m_mapper->mapCategories());// TODO:
}
}
else
{
// model update is relevant to BarSeries if the change was made to the part of the model that was mapped to BarSeries
if (column >= m_mapper->first() && (m_mapper->count() == - 1 || column < m_mapper->first() + m_mapper->count())) {
if (row >= m_mapper->mapBarBottom() && row <= m_mapper->mapBarTop())
barsetAt(row - m_mapper->mapBarBottom())->replace(column - m_mapper->first(), m_model->data(topLeft, Qt::DisplayRole).toDouble());
// if (row == m_mapper->mapCategories());// TODO:
}
}
}
}
}
Marek Rosa
PieSeries: model now supports custom mapping.
r1056
void QBarSeriesPrivate::modelDataAdded(QModelIndex parent, int start, int end)
{
Q_UNUSED(parent);
Q_UNUSED(start);
Q_UNUSED(end);
Marek Rosa
BarSeries Model mapper added
r1170 initializeDataFromModel();
Marek Rosa
PieSeries: model now supports custom mapping.
r1056 }
void QBarSeriesPrivate::modelDataRemoved(QModelIndex parent, int start, int end)
{
Q_UNUSED(parent);
Q_UNUSED(start);
Q_UNUSED(end);
Marek Rosa
BarSeries Model mapper added
r1170 initializeDataFromModel();
}
void QBarSeriesPrivate::initializeDataFromModel()
{
Q_Q(QBarSeries);
// create the initial bars
m_categories.clear();
m_barSets.clear();
Marek Rosa
Fixes to barseries and pieseries model support. Started adding barseries model tests
r1184
if (m_model == 0 || m_mapper == 0)
return;
// check if mappings are set
if (m_mapper->mapBarBottom() == -1 || m_mapper->mapBarTop() == -1 || m_mapper->mapCategories() == -1)
return;
Marek Rosa
BarSeries Model mapper added
r1170 // emit restructuredBars();
if (m_mapper->orientation() == Qt::Vertical) {
Marek Rosa
Fixes to barseries and pieseries model support. Started adding barseries model tests
r1184 if (m_mapCategories >= m_model->columnCount())
return;
Marek Rosa
BarSeries Model mapper added
r1170 int rowCount = 0;
if(m_mapper->count() == -1)
rowCount = m_model->rowCount() - m_mapper->first();
else
rowCount = qMin(m_mapper->count(), m_model->rowCount() - m_mapper->first());
for (int k = m_mapper->first(); k < m_mapper->first() + rowCount; k++) {
m_categories << m_model->data(m_model->index(k, m_mapper->mapCategories()), Qt::DisplayRole).toString();
}
Marek Rosa
Fixes to barseries and pieseries model support. Started adding barseries model tests
r1184 int lastAvailableBarSet = qMin(m_model->columnCount() - 1, m_mapper->mapBarTop());
for (int i = m_mapper->mapBarBottom(); i <= lastAvailableBarSet; i++) {
// for (int i = m_mapper->mapBarBottom(); i <= m_mapper->mapBarTop(); i++) {
Marek Rosa
BarSeries Model mapper added
r1170 QBarSet* barSet = new QBarSet(m_model->headerData(i, Qt::Horizontal, Qt::DisplayRole).toString());
for(int m = m_mapper->first(); m < m_mapper->first() + rowCount; m++)
*barSet << m_model->data(m_model->index(m, i), Qt::DisplayRole).toDouble();
sauimone
Renamed appendBarSet to append, removeBarSet to remove
r1194 q->append(barSet);
Marek Rosa
BarSeries Model mapper added
r1170 }
} else {
Marek Rosa
Fixes to barseries and pieseries model support. Started adding barseries model tests
r1184 if (m_mapCategories >= m_model->rowCount())
return;
Marek Rosa
BarSeries Model mapper added
r1170 int columnCount = 0;
if(m_mapper->count() == -1)
columnCount = m_model->columnCount() - m_mapper->first();
else
columnCount = qMin(m_mapper->count(), m_model->columnCount() - m_mapper->first());
for (int k = m_mapper->first(); k < m_mapper->first() + columnCount; k++) {
m_categories << m_model->data(m_model->index(m_mapper->mapCategories(), k), Qt::DisplayRole).toString();
}
Marek Rosa
Fixes to barseries and pieseries model support. Started adding barseries model tests
r1184 int lastAvailableBarSet = qMin(m_model->rowCount() - 1, m_mapper->mapBarTop());
for (int i = m_mapper->mapBarBottom(); i <= lastAvailableBarSet; i++) {
// for (int i = m_mapper->mapBarBottom(); i <= m_mapper->mapBarTop(); i++) {
Marek Rosa
BarSeries Model mapper added
r1170 QBarSet* barSet = new QBarSet(m_model->headerData(i, Qt::Vertical, Qt::DisplayRole).toString());
for(int m = m_mapper->first(); m < m_mapper->first() + columnCount; m++)
*barSet << m_model->data(m_model->index(i, m), Qt::DisplayRole).toDouble();
sauimone
Renamed appendBarSet to append, removeBarSet to remove
r1194 q->append(barSet);
Marek Rosa
BarSeries Model mapper added
r1170 }
}
emit restructuredBars();
// emit updatedBars();
}
Marek Rosa
PieSeries: model now supports custom mapping.
r1056
Michal Klocek
Adds big fat pimpl to series classes...
r938 void QBarSeriesPrivate::barsetChanged()
{
emit updatedBars();
}
sauimone
values visibility handling changed in barchart
r813
Michal Klocek
Refactor to use qseries private for implmentation interface...
r943 void QBarSeriesPrivate::scaleDomain(Domain& domain)
{
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
Fixed category handling of barcharts. Now the categories can be undefined. Updated documentation.
r1208 qreal x = categoryCount();
sauimone
barchart PIMPL part 2. Cleaning up leftovers in public api
r962 qreal y = max();
Michal Klocek
Refactor to use qseries private for implmentation interface...
r943 minX = qMin(minX, x);
minY = qMin(minY, y);
maxX = qMax(maxX, x);
maxY = qMax(maxY, y);
tickXCount = x+1;
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 }
Chart* QBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
{
Q_Q(QBarSeries);
BarChartItem* bar = new BarChartItem(q,presenter);
if(presenter->animationOptions().testFlag(QChart::SeriesAnimations)) {
presenter->animator()->addAnimation(bar);
}
presenter->chartTheme()->decorate(q, presenter->dataSet()->seriesIndex(q));
return bar;
}
Michal Klocek
Adds qlegend pimpl...
r950 QList<LegendMarker*> QBarSeriesPrivate::createLegendMarker(QLegend* legend)
{
Q_Q(QBarSeries);
QList<LegendMarker*> markers;
foreach(QBarSet* set, q->barSets()) {
BarLegendMarker* marker = new BarLegendMarker(q,set,legend);
markers << marker;
}
return markers;
}
sauimone
Naming convention change for barcharts. QBarChartSeries is now QBarSeries etc.
r338 #include "moc_qbarseries.cpp"
Michal Klocek
Adds big fat pimpl to series classes...
r938 #include "moc_qbarseries_p.cpp"
sauimone
Improved bar chart series
r71
sauimone
Integrating bar chart. Cleaned up old implementation. TODO: show this in test application. how?
r56 QTCOMMERCIALCHART_END_NAMESPACE