##// END OF EJS Templates
Revert "Fixes line uder grid issue"...
Revert "Fixes line uder grid issue" This reverts commit 3ea3ba4a33950ea7420e16913d228ed53fe566c3.

File last commit:

r183:45734e367adb
r191:0b54368f72bb
Show More
bargroupbase.cpp
137 lines | 3.3 KiB | text/x-c | CppLexer
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
r126 #include "bargroupbase.h"
#include "bar_p.h"
#include "barlabel_p.h"
#include "separator_p.h"
#include <QDebug>
QTCOMMERCIALCHART_BEGIN_NAMESPACE
sauimone
removed barchartseriesbase. functionality is now in model
r172 BarGroupBase::BarGroupBase(BarChartModel& model, QGraphicsItem *parent)
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
r126 : ChartItem(parent)
,mBarDefaultWidth(20) // TODO: remove hard coding, when we have layout code ready
,mLayoutSet(false)
,mLayoutDirty(true)
,mSeparatorsVisible(true)
sauimone
removed barchartseriesbase. functionality is now in model
r172 ,mModel(model)
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
r126 {
sauimone
added labels to series, intergrated with test app. minor hack to test app
r167 dataChanged();
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
r126 }
void BarGroupBase::setSeparatorsVisible(bool visible)
{
mSeparatorsVisible = visible;
}
void BarGroupBase::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
{
sauimone
bug fix in bar charts. Crashed, if layout was set before data. Also integrated to test app.
r165 // qDebug() << "BarGroupBase::paint" << childItems().count();
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
r126 if (!mLayoutSet) {
qDebug() << "BarGroupBase::paint called without layout set. Aborting.";
return;
}
sauimone
model delegate for bar series. updated examples
r161 // if (mLayoutDirty) {
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
r126 // Layout or data has changed. Need to redraw.
foreach(QGraphicsItem* i, childItems()) {
i->paint(painter,option,widget);
}
sauimone
model delegate for bar series. updated examples
r161 // }
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
r126 }
QRectF BarGroupBase::boundingRect() const
{
return QRectF(0,0,mWidth,mHeight);
}
sauimone
bug fix in bar charts. Crashed, if layout was set before data. Also integrated to test app.
r165
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
r126 void BarGroupBase::setBarWidth( int w )
{
mBarDefaultWidth = w;
}
sauimone
brush support for bargroups
r183 /*
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
r126 int BarGroupBase::addColor( QColor color )
{
sauimone
bug fix in bar charts. Crashed, if layout was set before data. Also integrated to test app.
r165 // qDebug() << "BarGroupBase::addColor";
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
r126 int colorIndex = mColors.count();
mColors.append(color);
return colorIndex;
}
sauimone
brush support for bargroups
r183 */
/*
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
r126 void BarGroupBase::resetColors()
{
sauimone
bug fix in bar charts. Crashed, if layout was set before data. Also integrated to test app.
r165 // qDebug() << "BarGroupBase::resetColors";
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
r126 mColors.clear();
}
sauimone
brush support for bargroups
r183 */
void BarGroupBase::resetBrushes()
{
mBrushes.clear();
}
void BarGroupBase::addBrush(QBrush brush)
{
mBrushes.append(brush);
}
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
r126
void BarGroupBase::dataChanged()
{
sauimone
removed barchartseriesbase. functionality is now in model
r172 // TODO: performance optimizations. Do we really need to delete and create items every time data is changed or can we reuse them?
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
r126
// Delete old bars
foreach (QGraphicsItem* item, childItems()) {
delete item;
}
// Create new graphic items for bars
sauimone
fixed bug in category implementation. model now owns the category and sets
r173 int totalItems = mModel.countTotalItems();
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
r126 for (int i=0; i<totalItems; i++) {
Bar *bar = new Bar(this);
childItems().append(bar);
}
sauimone
fixed bug in category implementation. model now owns the category and sets
r173 int count = mModel.countCategories();
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
r126 for (int i=0; i<count; i++) {
BarLabel* label = new BarLabel(this);
sauimone
removed barchartseriesbase. functionality is now in model
r172 label->set(mModel.label(i));
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
r126 childItems().append(label);
}
sauimone
fixed bug in category implementation. model now owns the category and sets
r173 count = mModel.countCategories() - 1; // There is one less separator than columns
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
r126 for (int i=0; i<count; i++) {
Separator* sep = new Separator(this);
sep->setColor(QColor(255,0,0,255)); // TODO: color for separations from theme
childItems().append(sep);
}
// TODO: if (autolayout) { layoutChanged() } or something
mLayoutDirty = true;
}
Michal Klocek
Refactored for MVP...
r139 //handlers
void BarGroupBase::handleModelChanged(int index)
{
sauimone
fixed bug in category implementation. model now owns the category and sets
r173 // qDebug() << "BarGroupBase::handleModelChanged" << index;
sauimone
model delegate for bar series. updated examples
r161 dataChanged();
Michal Klocek
Refactored for MVP...
r139 }
void BarGroupBase::handleDomainChanged(const Domain& domain)
{
sauimone
bug fix in bar charts. Crashed, if layout was set before data. Also integrated to test app.
r165 // qDebug() << "BarGroupBase::handleDomainChanged";
sauimone
added labels to series, intergrated with test app. minor hack to test app
r167 // TODO: Figure out the use case for this.
// Affects the size of visible item, so layout is changed.
// layoutChanged();
Michal Klocek
Refactored for MVP...
r139 }
void BarGroupBase::handleGeometryChanged(const QRectF& rect)
{
mWidth = rect.width();
mHeight = rect.height();
layoutChanged();
mLayoutSet = true;
setPos(rect.topLeft());
}
#include "moc_bargroupbase.cpp"
sauimone
refactored barcharts. layout to derived classess other funtionality to base class
r126 QTCOMMERCIALCHART_END_NAMESPACE