##// END OF EJS Templates
Reserve ordering of chart series internally....
Reserve ordering of chart series internally. This fixes for example issues with series colors being randomly messed up; an issue was most frequently seen in QML test app and on OSX after adding multiple series.

File last commit:

r820:2bd79611bb1d
r825:d850de289019
Show More
percentbarchartitem.cpp
86 lines | 2.9 KiB | text/x-c | CppLexer
/ src / barchart / percentbarchartitem.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
combined barpresenterbase and barpresenter. renamed barchartpresenters to barchartitems
r666 #include "percentbarchartitem_p.h"
sauimone
renamed bar.h to bar_p.h
r118 #include "bar_p.h"
sauimone
renamed barchart floating values with labels to be consistent with piechart
r820 #include "barlabel_p.h"
sauimone
Added pen & brush to QBarSet
r214 #include "qbarset.h"
sauimone
percent bar chart
r101 #include <QDebug>
QTCOMMERCIALCHART_BEGIN_NAMESPACE
Tero Ahola
Code review: Fixed simple issues in Bar and Legend
r737 PercentBarChartItem::PercentBarChartItem(QBarSeries *series, ChartPresenter *presenter) :
Michal Klocek
Refactors chartitem...
r677 BarChartItem(series, presenter)
sauimone
percent bar chart
r101 {
}
sauimone
animations to stacked and percent barchart
r694 QVector<QRectF> PercentBarChartItem::calculateLayout()
sauimone
percent bar chart
r101 {
sauimone
animations to stacked and percent barchart
r694 QVector<QRectF> layout;
sauimone
bug fix in bar charts. Crashed, if layout was set before data. Also integrated to test app.
r165
sauimone
Fixed layout for barcharts
r473 // Use temporary qreals for accurancy (we might get some compiler warnings... :)
Michal Klocek
Refactors barchart axis hadnling...
r679 qreal width = geometry().width();
qreal height = geometry().height();
sauimone
minor code review fixes, part n
r763 qreal categoryCount = m_series->categoryCount();
qreal barWidth = width / (m_series->categoryCount() * 2);
Tero Ahola
Code review: Fixed simple issues in Bar and Legend
r737 qreal xStep = width / categoryCount;
qreal xPos = xStep / 2 - barWidth / 2;
sauimone
percent bar chart
r101
sauimone
Fixed layout for barcharts
r473 int itemIndex(0);
Tero Ahola
Code review: Fixed simple issues in Bar and Legend
r737 for (int category = 0; category < categoryCount; category++) {
sauimone
minor code review fixes, part n
r763 qreal colSum = m_series->categorySum(category);
Michal Klocek
Refactors barchart axis hadnling...
r679 qreal scale = (height / colSum);
qreal yPos = height;
sauimone
minor code review fixes, part n
r763 for (int set=0; set < m_series->barsetCount(); set++) {
sauimone
Barchart value layout fix
r817 QBarSet* barSet = m_series->barsetAt(set);
qreal barHeight = barSet->valueAt(category) * scale;
sauimone
minor code review fixes, part n
r763 Bar* bar = m_bars.at(itemIndex);
sauimone
Barchart value layout fix
r817 bar->setPen(barSet->pen());
bar->setBrush(barSet->brush());
Tero Ahola
Code review: Fixed simple issues in Bar and Legend
r737 QRectF rect(xPos, yPos-barHeight, barWidth, barHeight);
sauimone
animations to stacked and percent barchart
r694 layout.append(rect);
sauimone
cleanup on barseries. removed old commented out separator code
r654
sauimone
renamed barchart floating values with labels to be consistent with piechart
r820 BarLabel* label = m_labels.at(itemIndex);
sauimone
Floating values to bar charts
r263
Jani Honkonen
Use qFuzzyIsNull to compare (in)equality of real values
r768 if (!qFuzzyIsNull(m_series->valueAt(set,category))) {
sauimone
minor code review fixes, part n
r763 int p = m_series->percentageAt(set,category) * 100;
sauimone
barcharts: added legend to model. added signals for hover events (for tooltip). updated examples
r280 QString vString(QString::number(p));
vString.truncate(3);
sauimone
updated barchart examples. minor fixes
r276 vString.append("%");
sauimone
renamed barchart floating values with labels to be consistent with piechart
r820 label->setText(vString);
sauimone
updated barchart examples. minor fixes
r276 } else {
sauimone
renamed barchart floating values with labels to be consistent with piechart
r820 label->setText(QString(""));
sauimone
updated barchart examples. minor fixes
r276 }
sauimone
Floating values to bar charts
r263
sauimone
renamed barchart floating values with labels to be consistent with piechart
r820 label->setPos(xPos + (rect.width()/2 - label->boundingRect().width()/2)
,yPos - barHeight/2 - label->boundingRect().height()/2);
// value->setFont(barSet->valueFont());
sauimone
Floating values to bar charts
r263 itemIndex++;
yPos -= barHeight;
}
xPos += xStep;
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
r126 }
sauimone
animations to stacked and percent barchart
r694 return layout;
sauimone
percent bar chart
r101 }
sauimone
combined barpresenterbase and barpresenter. renamed barchartpresenters to barchartitems
r666 #include "moc_percentbarchartitem_p.cpp"
sauimone
moved tooltip to presenter
r288
sauimone
percent bar chart
r101 QTCOMMERCIALCHART_END_NAMESPACE