##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

New bar calculate layout
New bar calculate layout
Marek Rosa - - Load All Authors

File last commit:

r2303:ebdfe8e2c2c9
r2303:ebdfe8e2c2c9
Show More
barchartitem.cpp
129 lines | 5.0 KiB | text/x-c | CppLexer
/ src / barchart / vertical / bar / barchartitem.cpp
History | Source | Raw |Copy content |Copy permalink
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 "barchartitem_p.h"
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
 r126 #include "bar_p.h"
sauimone
renamed barseries files to abstractbarseries
 r1586 #include "qabstractbarseries_p.h"
sauimone
refactoring internal barchart items
 r1674 #include "qbarset.h"
#include "qbarset_p.h"
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
 r126
QTCOMMERCIALCHART_BEGIN_NAMESPACE
Michal Klocek
Refactors internals...
 r2273 BarChartItem::BarChartItem(QAbstractBarSeries *series, QGraphicsItem* item) :
AbstractBarChartItem(series, item)
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
 r126 {
}
sauimone
bug fix in bar charts. Crashed, if layout was set before data. Also integrated to test app.
 r165
sauimone
barchart animation mechanics working. still some todo
 r681 QVector<QRectF> BarChartItem::calculateLayout()
sauimone
Animation framework for barchart.
 r671 {
sauimone
barchart animation mechanics working. still some todo
 r681 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();
Marek Rosa
New bar calculate layout
 r2303 // bool barsVisible = m_series->isVisible();
qreal barWidth = m_series->d_func()->barWidth();
// barWidth = 1.8;
sauimone
barchart animation mechanics working. still some todo
 r681
int itemIndex(0);
Marek Rosa
New bar calculate layout
 r2303 for(int category = 0; category < categoryCount; category++) {
sauimone
barchart animation mechanics working. still some todo
 r681 for (int set = 0; set < setCount; set++) {
Marek Rosa
New bar calculate layout
 r2303 qreal value = m_series->barSets().at(set)->at(category);
QRectF rect;
QPointF topLeft = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2 + (set)/(setCount) * barWidth, value));
QPointF bottomRight;
if (domain()->type() == AbstractDomain::XLogYDomain
|| domain()->type() == AbstractDomain::LogXLogYDomain)
bottomRight = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2 + (set + 1)/(setCount) * barWidth, domain()->minY()));
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 else
Marek Rosa
New bar calculate layout
 r2303 bottomRight = domain()->calculateGeometryPoint(QPointF(category - barWidth / 2 + (set + 1)/(setCount) * barWidth, 0));
rect.setTopLeft(topLeft);
rect.setBottomRight(bottomRight);
layout.append(rect);
sauimone
barchart animation mechanics working. still some todo
 r681
Jani Honkonen
more coding style fixes for src-folder...
 r2104 QGraphicsSimpleTextItem *label = m_labels.at(itemIndex);
Marek Rosa
New bar calculate layout
 r2303 label->setZValue(200);
itemIndex++;
if (!qFuzzyCompare(value, 0))
label->setText(QString::number(value));
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 else
sauimone
renamed barchart floating values with labels to be consistent with piechart
 r820 label->setText(QString(""));
sauimone
barchart animation mechanics working. still some todo
 r681
Marek Rosa
New bar calculate layout
 r2303 // label->setFont(m_series->barSets().at(set)->labelFont());
// label->setBrush(m_series->barSets().at(set)->labelBrush());
label->setBrush(Qt::black);
label->setPos(rect.center() - label->boundingRect().center());
sauimone
simple text item for barvalue
 r811
sauimone
barchart animation mechanics working. still some todo
 r681 }
}
Marek Rosa
New bar calculate layout
 r2303
// AbstractDomain:
// qreal width = geometry().width();
// qreal height = geometry().height();
// qreal rangeY = m_domainMaxY - m_domainMinY;
// qreal rangeX = m_domainMaxX - m_domainMinX;
// qreal scaleY = (height / rangeY);
// qreal scaleX = (width / rangeX);
// qreal rectWidth = (scaleX / setCount) * m_series->d_func()->barWidth();
// int itemIndex(0);
// for (int category = 0; category < categoryCount; category++) {
// qreal yPos = height + scaleY * m_domainMinY + geometry().top();
// for (int set = 0; set < setCount; set++) {
// QBarSetPrivate *barSet = m_series->d_func()->barsetAt(set)->d_ptr.data();
// qreal xPos = (barSet->pos(category) - m_domainMinX) * scaleX + geometry().left();
// xPos -= setCount * rectWidth / 2;
// xPos += set * rectWidth;barWidth / 2
// qreal rectHeight = barSet->value(category) * scaleY;
// Bar *bar = m_bars.at(itemIndex);
// QRectF rect(xPos, yPos - rectHeight, rectWidth, rectHeight);
// layout.append(rect);
// bar->setPen(barSet->m_pen);
// bar->setBrush(barSet->m_brush);
// if (qFuzzyIsNull(rectHeight))
// bar->setVisible(false);
// else
// bar->setVisible(barsVisible);
// QGraphicsSimpleTextItem *label = m_labels.at(itemIndex);
// if (!qFuzzyIsNull(barSet->value(category)))
// label->setText(QString::number(barSet->value(category)));
// else
// label->setText(QString(""));
// label->setPos(xPos + (rect.width() / 2 - label->boundingRect().width() / 2),
// yPos - rectHeight / 2 - label->boundingRect().height() / 2);
// label->setFont(barSet->m_labelFont);
// label->setBrush(barSet->m_labelBrush);
// itemIndex++;
// }
// }
sauimone
Animation framework for barchart.
 r671 return layout;
}
sauimone
combined barpresenterbase and barpresenter. renamed barchartpresenters to barchartitems
 r666 #include "moc_barchartitem_p.cpp"
Michal Klocek
Refactored for MVP...
 r139
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
 r126 QTCOMMERCIALCHART_END_NAMESPACE