##// END OF EJS Templates
made qabstractbarseries constructor protected. Updated tests
made qabstractbarseries constructor protected. Updated tests

File last commit:

r1586:9c6a61adadc9
r1587:60ca912b003e
Show More
stackedbarchartitem.cpp
101 lines | 3.4 KiB | text/x-c | CppLexer
/ src / barchart / stackedbarchartitem.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 "stackedbarchartitem_p.h"
sauimone
renamed bar.h to bar_p.h
r118 #include "bar_p.h"
sauimone
barchart PIMPL part 2. Cleaning up leftovers in public api
r962 #include "qbarset_p.h"
sauimone
renamed barseries files to abstractbarseries
r1586 #include "qabstractbarseries_p.h"
sauimone
Added pen & brush to QBarSet
r214 #include "qbarset.h"
sauimone
animations for stacked and percentbarchart
r1426 #include "chartanimator_p.h"
sauimone
added missing example files :)
r96
QTCOMMERCIALCHART_BEGIN_NAMESPACE
sauimone
QBarSeries to QAbstractBarSeries
r1584 StackedBarChartItem::StackedBarChartItem(QAbstractBarSeries *series, ChartPresenter *presenter) :
Tero Ahola
Code review: Fixed simple issues in Bar and Legend
r737 BarChartItem(series, presenter)
sauimone
added missing example files :)
r96 {
}
sauimone
animations to stacked and percent barchart
r694 QVector<QRectF> StackedBarChartItem::calculateLayout()
sauimone
added missing example files :)
r96 {
sauimone
animations to stacked and percent barchart
r694 QVector<QRectF> layout;
sauimone
removed categories from barseries. categories are now only on axis
r1321 // Use temporary qreals for accuracy
qreal categoryCount = m_series->d_func()->categoryCount();
Tero Ahola
Minor modifications to properties of abstract, area and bar series
r1462 qreal setCount = m_series->count();
sauimone
barchart visible property fix
r1322 bool barsVisible = m_series->isVisible();
Michal Klocek
Refactors barchart axis hadnling...
r679
sauimone
barchart domain fix
r674 // Domain:
Michal Klocek
Refactors barchart axis hadnling...
r679 qreal width = geometry().width();
sauimone
correct x-positioning for barcharts
r1228 qreal height = geometry().height();
qreal rangeY = m_domainMaxY - m_domainMinY;
qreal rangeX = m_domainMaxX - m_domainMinX;
qreal scaleY = (height / rangeY);
qreal scaleX = (width / rangeX);
sauimone
barmargin replaced with barwidth
r1425 qreal barWidth = scaleX * m_series->d_func()->barWidth();
Michal Klocek
Refactors barchart axis hadnling...
r679
sauimone
Fixed layout for barcharts
r473 int itemIndex(0);
sauimone
correct x-positioning for barcharts
r1228 for (int category = 0; category < categoryCount; category++) {
qreal yPos = height + rangeY * m_domainMinY + geometry().topLeft().y();
sauimone
fix in barmargin calculations
r1285 for (int set=0; set < setCount; set++) {
sauimone
Removed QPointF from QBarSet
r1580 QBarSetPrivate* barSet = m_series->d_func()->barsetAt(set)->d_ptr.data();
sauimone
Barchart value layout fix
r817
sauimone
Removed QPointF from QBarSet
r1580 qreal xPos = (barSet->m_values.at(category).x() - m_domainMinX) * scaleX + m_rect.left() - barWidth/2;
sauimone
correct x-positioning for barcharts
r1228
sauimone
Removed QPointF from QBarSet
r1580 qreal barHeight = barSet->m_values.at(category).y() * scaleY;
sauimone
minor code review fixes, part n
r763 Bar* bar = m_bars.at(itemIndex);
sauimone
Removed QPointF from QBarSet
r1580 bar->setPen(barSet->m_pen);
bar->setBrush(barSet->m_brush);
sauimone
barchart visible property fix
r1322 bar->setVisible(barsVisible);
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
removed barlabel. label visibility control is now per series instead of per set
r1246 QGraphicsSimpleTextItem* label = m_labels.at(itemIndex);
sauimone
Floating values to bar charts
r263
sauimone
Removed QPointF from QBarSet
r1580 if (!qFuzzyIsNull(barSet->m_values.at(category).y())) {
label->setText(QString::number(barSet->m_values.at(category).y()));
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);
sauimone
Removed QPointF from QBarSet
r1580 label->setFont(barSet->m_labelFont);
label->setBrush(barSet->m_labelBrush);
sauimone
Floating values to bar charts
r263 itemIndex++;
yPos -= barHeight;
}
sauimone
prototyping separators with stacked bars
r119 }
sauimone
Barchart value layout fix
r817
sauimone
animations to stacked and percent barchart
r694 return layout;
sauimone
added missing example files :)
r96 }
sauimone
animations for stacked and percentbarchart
r1426 void StackedBarChartItem::applyLayout(const QVector<QRectF> &layout)
{
if (animator()) {
animator()->updateLayout(this, m_layout, layout);
} else {
setLayout(layout);
update();
}
}
sauimone
combined barpresenterbase and barpresenter. renamed barchartpresenters to barchartitems
r666 #include "moc_stackedbarchartitem_p.cpp"
sauimone
moved tooltip to presenter
r288
sauimone
added missing example files :)
r96 QTCOMMERCIALCHART_END_NAMESPACE