HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r276:d062a7f38647

updated barchart examples. minor fixes

sauimone -

r276:d062a7f38647

parent child

Context file:

r276:d062a7f38647

Expand all files

example/barchart/custombarset.cpp created 644 +8 0

@@ -0,0 +1,8
	1	#include "custombarset.h"
	2
	3	CustomBarSet::CustomBarSet(QObject *parent) :
	4	QBarSet(parent)
	5	{
	6	// Using signal to signal connection here.
	7	connect(this,SIGNAL(clicked()),this,SIGNAL(toggleFloatingValues()));
	8	}

example/barchart/custombarset.h created 644 +20 0

@@ -0,0 +1,20
	1	#ifndef CUSTOMBARSET_H
	2	#define CUSTOMBARSET_H
	3
	4	#include <qbarset.h>
	5
	6	QTCOMMERCIALCHART_USE_NAMESPACE
	7
	8	class CustomBarSet : public QBarSet
	9	{
	10	Q_OBJECT
	11	public:
	12	explicit CustomBarSet(QObject *parent = 0);
	13
	14	signals:
	15
	16	public slots:
	17
	18	};
	19
	20	#endif // CUSTOMBARSET_H

example/percentbarchart/custombarset.cpp created 644 +8 0

@@ -0,0 +1,8
	1	#include "custombarset.h"
	2
	3	CustomBarSet::CustomBarSet(QObject *parent) :
	4	QBarSet(parent)
	5	{
	6	// Using signal to signal connection here.
	7	connect(this,SIGNAL(clicked()),this,SIGNAL(toggleFloatingValues()));
	8	}

example/percentbarchart/custombarset.h created 644 +20 0

@@ -0,0 +1,20
	1	#ifndef CUSTOMBARSET_H
	2	#define CUSTOMBARSET_H
	3
	4	#include <qbarset.h>
	5
	6	QTCOMMERCIALCHART_USE_NAMESPACE
	7
	8	class CustomBarSet : public QBarSet
	9	{
	10	Q_OBJECT
	11	public:
	12	explicit CustomBarSet(QObject *parent = 0);
	13
	14	signals:
	15
	16	public slots:
	17
	18	};
	19
	20	#endif // CUSTOMBARSET_H

example/stackedbarchart/custombarset.cpp created 644 +8 0

@@ -0,0 +1,8
	1	#include "custombarset.h"
	2
	3	CustomBarSet::CustomBarSet(QObject *parent) :
	4	QBarSet(parent)
	5	{
	6	// Using signal to signal connection here.
	7	connect(this,SIGNAL(clicked()),this,SIGNAL(toggleFloatingValues()));
	8	}

example/stackedbarchart/custombarset.h created 644 +20 0

@@ -0,0 +1,20
	1	#ifndef CUSTOMBARSET_H
	2	#define CUSTOMBARSET_H
	3
	4	#include <qbarset.h>
	5
	6	QTCOMMERCIALCHART_USE_NAMESPACE
	7
	8	class CustomBarSet : public QBarSet
	9	{
	10	Q_OBJECT
	11	public:
	12	explicit CustomBarSet(QObject *parent = 0);
	13
	14	signals:
	15
	16	public slots:
	17
	18	};
	19
	20	#endif // CUSTOMBARSET_H

example/barchart/barchart.pro +4 -2

             !include( ../example.pri ) {
              error( "Couldn't find the example.pri file!" )
             }
             TARGET = barchart
             SOURCES += main.cpp \
-                chartwidget.cpp
+                chartwidget.cpp \
+                custombarset.cpp
             HEADERS += \
-                chartwidget.h
+                chartwidget.h \
+                custombarset.h

example/barchart/main.cpp +21 -17

             #include <QApplication>
             #include <QMainWindow>
-            #include <QStandardItemModel>
+            #include <qchartview.h>
             #include <qbarchartseries.h>
-            #include <qbarcategory.h>
             #include <qbarset.h>
-            #include "chartwidget.h"
+            #include <qbarcategory.h>
+            #include "custombarset.h"
             QTCOMMERCIALCHART_USE_NAMESPACE
             int main(int argc, char *argv[])
             {
                 QApplication a(argc, argv);
                 QMainWindow window;
                 QBarCategory *category = new QBarCategory;
                 *category << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "June" << "Jul" << "Aug" << "Sep" << "Oct" << "Nov" << "Dec";
-                QBarChartSeries* series0 = new QBarChartSeries(category);
+                QBarChartSeries* series= new QBarChartSeries(category);
-                QBarSet *set0 = new QBarSet;
+                // We use custom set, which connects some signals. Could use QBarSet here if we don't need signals
-                QBarSet *set1 = new QBarSet;
+                CustomBarSet *set0 = new CustomBarSet;
-                QBarSet *set2 = new QBarSet;
+                CustomBarSet *set1 = new CustomBarSet;
-                QBarSet *set3 = new QBarSet;
+                CustomBarSet *set2 = new CustomBarSet;
-                QBarSet *set4 = new QBarSet;
+                CustomBarSet *set3 = new CustomBarSet;
+                CustomBarSet *set4 = new CustomBarSet;
                 // Create some test data to chart
                 *set0 << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 8 << 9 << 10 << 11 << 12;
                 *set1 << 5 << 0 << 0 << 4 << 0 << 7 << 8 << 9 << 9 << 0 << 4 << 2;
                 *set2 << 3 << 5 << 8 << 13 << 8 << 5 << 3 << 2 << 1 << 1 << 3 << 5;
                 *set3 << 5 << 6 << 7 << 3 << 4 << 5 << 8 << 9 << 10 << 5 << 2 << 7;
                 *set4 << 9 << 7 << 5 << 3 << 1 << 2 << 4 << 6 << 8 << 10 << 1 << 6;
-                series0->addBarSet(set0);
+                series->addBarSet(set0);
-                series0->addBarSet(set1);
+                series->addBarSet(set1);
-                series0->addBarSet(set2);
+                series->addBarSet(set2);
-                series0->addBarSet(set3);
+                series->addBarSet(set3);
-                series0->addBarSet(set4);
+                series->addBarSet(set4);
-                ChartWidget* chartWidget =  new ChartWidget(&window);
+                QChartView* chartView =  new QChartView(&window);
-                chartWidget->addSeries(series0);
+                chartView->addSeries(series);
+                chartView->setChartTitle("simple stacked barchart");
+                chartView->setChartTheme(QChart::ChartThemeIcy);
-                window.setCentralWidget(chartWidget);
+                window.setCentralWidget(chartView);
                 window.resize(400, 300);
                 window.show();
                 return a.exec();
             }

example/percentbarchart/main.cpp +21 -16

             #include <QApplication>
             #include <QMainWindow>
             #include <QStandardItemModel>
             #include <qpercentbarchartseries.h>
-            #include "chartwidget.h"
             #include <qbarcategory.h>
-            #include <qbarset.h>
+            #include <qchartview.h>
+            //#include <qbarset.h>
+            #include "custombarset.h"
             QTCOMMERCIALCHART_USE_NAMESPACE
             int main(int argc, char *argv[])
             {
                 QApplication a(argc, argv);
                 QMainWindow window;
                 QBarCategory *category = new QBarCategory;
                 *category << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "June" << "Jul" << "Aug" << "Sep" << "Oct" << "Nov" << "Dec";
-                QPercentBarChartSeries* series0 = new QPercentBarChartSeries(category);
+                QPercentBarChartSeries* series = new QPercentBarChartSeries(category);
-                QBarSet *set0 = new QBarSet;
+                // We use custom set, which connects some signals. Could use QBarSet here if we don't need signals
-                QBarSet *set1 = new QBarSet;
+                CustomBarSet *set0 = new CustomBarSet;
-                QBarSet *set2 = new QBarSet;
+                CustomBarSet *set1 = new CustomBarSet;
-                QBarSet *set3 = new QBarSet;
+                CustomBarSet *set2 = new CustomBarSet;
-                QBarSet *set4 = new QBarSet;
+                CustomBarSet *set3 = new CustomBarSet;
+                CustomBarSet *set4 = new CustomBarSet;
                 // Create some test data to chart
                 *set0 << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 8 << 9 << 10 << 11 << 12;
                 *set1 << 5 << 0 << 0 << 4 << 0 << 7 << 8 << 9 << 9 << 0 << 4 << 2;
                 *set2 << 3 << 5 << 8 << 13 << 8 << 5 << 3 << 2 << 1 << 1 << 3 << 5;
                 *set3 << 5 << 6 << 7 << 3 << 4 << 5 << 8 << 9 << 10 << 5 << 2 << 7;
                 *set4 << 9 << 7 << 5 << 3 << 1 << 2 << 4 << 6 << 8 << 10 << 1 << 6;
-                series0->addBarSet(set0);
+                series->addBarSet(set0);
-                series0->addBarSet(set1);
+                series->addBarSet(set1);
-                series0->addBarSet(set2);
+                series->addBarSet(set2);
-                series0->addBarSet(set3);
+                series->addBarSet(set3);
-                series0->addBarSet(set4);
+                series->addBarSet(set4);
-                ChartWidget* chartWidget =  new ChartWidget(&window);
+                QChartView* chartView =  new QChartView(&window);
-                chartWidget->addSeries(series0);
+                chartView->addSeries(series);
+                chartView->setChartTitle("simple percent barchart");
+                chartView->setChartTheme(QChart::ChartThemeIcy);
-                window.setCentralWidget(chartWidget);
+                window.setCentralWidget(chartView);
                 window.resize(400, 300);
                 window.show();
                 return a.exec();
             }

example/percentbarchart/percentbarchart.pro +4 -2

             !include( ../example.pri ) {
              error( "Couldn't find the example.pri file!" )
             }
             TARGET = percentbarchart
             SOURCES += main.cpp \
-                chartwidget.cpp
+                chartwidget.cpp \
+                custombarset.cpp
             HEADERS += \
-                chartwidget.h
+                chartwidget.h \
+                custombarset.h

example/stackedbarchart/main.cpp +23 -19

             #include <QApplication>
             #include <QMainWindow>
-            #include <QStandardItemModel>
+            #include <qchartview.h>
             #include <qstackedbarchartseries.h>
-            #include "chartwidget.h"
             #include <qbarset.h>
             #include <qbarcategory.h>
+            #include "custombarset.h"
             QTCOMMERCIALCHART_USE_NAMESPACE
             int main(int argc, char *argv[])
             {
                 QApplication a(argc, argv);
                 QMainWindow window;
                 QBarCategory *category = new QBarCategory;
                 *category << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "June" << "Jul" << "Aug" << "Sep" << "Oct" << "Nov" << "Dec";
-                QStackedBarChartSeries* series0 = new QStackedBarChartSeries(category);
+                QStackedBarChartSeries* series = new QStackedBarChartSeries(category);
-                QBarSet *set0 = new QBarSet;
+                // We use custom set, which connects some signals. Could use QBarSet here if we don't need signals
-                QBarSet *set1 = new QBarSet;
+                CustomBarSet *set0 = new CustomBarSet;
-                QBarSet *set2 = new QBarSet;
+                CustomBarSet *set1 = new CustomBarSet;
-                QBarSet *set3 = new QBarSet;
+                CustomBarSet *set2 = new CustomBarSet;
-                QBarSet *set4 = new QBarSet;
+                CustomBarSet *set3 = new CustomBarSet;
+                CustomBarSet *set4 = new CustomBarSet;
                 // Create some test data to chart
                 *set0 << 1 << 2 << 3 << 4 << 5 << 6 << 7 << 8 << 9 << 10 << 11 << 12;
-            //    *set1 << 5 << 0 << 0 << 4 << 0 << 7 << 8 << 9 << 9 << 0 << 4 << 2;
+                *set1 << 5 << 0 << 0 << 4 << 0 << 7 << 8 << 9 << 9 << 0 << 4 << 2;
-            //    *set2 << 3 << 5 << 8 << 13 << 8 << 5 << 3 << 2 << 1 << 1 << 3 << 5;
+                *set2 << 3 << 5 << 8 << 13 << 8 << 5 << 3 << 2 << 1 << 1 << 3 << 5;
-            //    *set3 << 5 << 6 << 7 << 3 << 4 << 5 << 8 << 9 << 10 << 5 << 2 << 7;
+                *set3 << 5 << 6 << 7 << 3 << 4 << 5 << 8 << 9 << 10 << 5 << 2 << 7;
                 *set4 << 9 << 7 << 5 << 3 << 1 << 2 << 4 << 6 << 8 << 10 << 1 << 6;
-                series0->addBarSet(set0);
+                series->addBarSet(set0);
-            //    series0->addBarSet(set1);
+                series->addBarSet(set1);
-            //    series0->addBarSet(set2);
+                series->addBarSet(set2);
-            //    series0->addBarSet(set3);
+                series->addBarSet(set3);
-                series0->addBarSet(set4);
+                series->addBarSet(set4);
-                ChartWidget* chartWidget =  new ChartWidget(&window);
+                QChartView* chartView =  new QChartView(&window);
-                chartWidget->addSeries(series0);
+                chartView->addSeries(series);
+                chartView->setChartTitle("simple stacked barchart");
+                chartView->setChartTheme(QChart::ChartThemeIcy);
-                window.setCentralWidget(chartWidget);
+                window.setCentralWidget(chartView);
                 window.resize(400, 300);
                 window.show();
                 return a.exec();
             }

example/stackedbarchart/stackedbarchart.pro +4 -2

             !include( ../example.pri ) {
              error( "Couldn't find the example.pri file!" )
             }
             TARGET = stackedbarchart
             SOURCES += main.cpp \
-                chartwidget.cpp
+                chartwidget.cpp \
+                custombarset.cpp
             HEADERS += \
-                chartwidget.h
+                chartwidget.h \
+                custombarset.h

src/barchart/bar.cpp +10 0

             #include "bar_p.h"
             #include <QDebug>
             #include <QPainter>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             Bar::Bar(QGraphicsItem *parent)
                 : QGraphicsObject(parent)
             {
                 setAcceptedMouseButtons(Qt::LeftButton);
             }
             void Bar::setSize(const QSizeF& size)
             {
                 mWidth = size.width();
                 mHeight = size.height();
             }
             void Bar::resize( qreal w, qreal h )
             {
                 mWidth = w;
                 mHeight = h;
             }
             void Bar::setColor( QColor col )
             {
                 mColor = col;
             }
             void Bar::setPos(qreal x, qreal y)
             {
                 mXpos = x;
                 mYpos = y;
             }
             void Bar::setPen(QPen pen)
             {
                 mPen = pen;
             }
             void Bar::setBrush(QBrush brush)
             {
                 mBrush = brush;
             }
             void Bar::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 if (0 == mHeight) {
                     return;
                 }
                 painter->setBrush(mBrush);
                 // This compensates for rounding errors. drawRect takes ints and cumulative error of pos + size may be over 1.
                 int x0 = mXpos;
                 int x1 = (mXpos + mWidth);
                 int w = x1-x0;
                 int y0 = mYpos;
                 int y1 = (mYpos + mHeight);
                 int h = y1-y0;
                 painter->drawRect(x0, y0 ,w ,h);
             }
             QRectF Bar::boundingRect() const
             {
                 QRectF r(mXpos, mYpos, mWidth, mHeight);
                 return r;
             }
             void Bar::mousePressEvent(QGraphicsSceneMouseEvent* /*event*/)
             {
                 emit clicked();
             }
+            void Bar::hoverEnterEvent(QGraphicsSceneHoverEvent* /*event*/)
+            {
+                emit hoverEntered();
+            }
+            void Bar::hoverLeaveEvent(QGraphicsSceneHoverEvent* /*event*/)
+            {
+                emit hoverLeaved();
+            }
             #include "moc_bar_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/bar_p.h +4 -1

             #ifndef BAR_H
             #define BAR_H
             #include "qchartglobal.h"
             #include <QGraphicsObject>
             #include <QPen>
             #include <QBrush>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             // Single bar item of chart
             class Bar : public QGraphicsObject
             {
                 Q_OBJECT
             public:
                 Bar(QGraphicsItem *parent=0);
             public: // from ChartItem
                 void setSize(const QSizeF &size);
                 // Layout Stuff
                 void resize(qreal w, qreal h);   // Size of bar.
                 void setPos(qreal x, qreal y);
                 void setPen(QPen pen);
                 void setBrush(QBrush brush);
                 void setColor( QColor col);     // deprecated
             public:
                 // From QGraphicsItem
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
                 QRectF boundingRect() const;
                 void mousePressEvent(QGraphicsSceneMouseEvent *event);
+                void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
+                void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
             Q_SIGNALS:
                 void clicked();
+                void hoverEntered();
+                void hoverLeaved();
             private:
                 qreal mHeight;
                 qreal mWidth;
                 qreal mXpos;
                 qreal mYpos;
                 QColor mColor;
                 QBrush mBrush;
                 QPen mPen;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // BAR_H

src/barchart/barpresenter.cpp +6 -3

             #include "barpresenter.h"
             #include "bar_p.h"
             #include "barlabel_p.h"
             #include "barvalue_p.h"
             #include "qbarset.h"
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             BarPresenter::BarPresenter(BarChartModel& model, QGraphicsItem *parent) :
                 BarPresenterBase(model,parent)
             {
                 mBarDefaultWidth = 15;
             }
             void BarPresenter::layoutChanged()
             {
                 // Scale bars to new layout
                 // Layout for bars:
                 if (mModel.countSets() <= 0) {
                     qDebug() << "No sets in model!";
                     return;
                 }
                 if (childItems().count() == 0) {
                     qDebug() << "WARNING: BarPresenter::layoutChanged called before graphics items are created!";
                     return;
                 }
                 // TODO: better way to auto-layout?
                 // Use reals for accurancy (we might get some compiler warnings... :)
                 int categoryCount = mModel.countCategories();
                 int setCount = mModel.countSets();
                 qreal tW = mWidth;
                 qreal tH = mHeight;
                 qreal tM = mModel.max();
                 qreal scale = (tH/tM);
                 qreal tC = categoryCount+1;
                 qreal xStepPerSet = (tW/tC);
                 // Scaling.
                 int itemIndex(0);
                 int labelIndex(0);
                 for (int category=0; category < categoryCount; category++) {
                     qreal xPos = xStepPerSet * category + ((tW + mBarDefaultWidth*setCount)/(categoryCount*2));
                     qreal yPos = mHeight;
                     for (int set = 0; set < setCount; set++) {
                         qreal barHeight = mModel.valueAt(set, category) * scale;
                         Bar* bar = mBars.at(itemIndex);
                         // TODO: width settable per bar?
                         bar->resize(mBarDefaultWidth, barHeight);
                         bar->setBrush(mModel.setAt(set)->brush());
                         bar->setPos(xPos, yPos-barHeight); // item*posStep+startPos + set * mBarDefaultWidth, mHeight);
                         itemIndex++;
                         xPos += mBarDefaultWidth;
                     }
                     // TODO: Layout for labels, remove magic number
                     xPos = xStepPerSet * category + ((tW + mBarDefaultWidth*setCount)/(categoryCount*2));
                     BarLabel* label = mLabels.at(labelIndex);
                     label->setPos(xPos, mHeight + 20);
                     labelIndex++;
                 }
                 // Position floating values
                 itemIndex = 0;
                 for (int category=0; category < mModel.countCategories(); category++) {
                     qreal xPos = xStepPerSet * category + ((tW + mBarDefaultWidth*setCount)/(categoryCount*2));
                     qreal yPos = mHeight;
                     for (int set=0; set < mModel.countSets(); set++) {
                         qreal barHeight = mModel.valueAt(set,category) * scale;
                         BarValue* value = mFloatingValues.at(itemIndex);
                         // TODO: remove hard coding, apply layout
                         value->resize(100,50);
-                        value->setPos(xPos + mBarDefaultWidth/2, yPos-barHeight/2);
+                        value->setPos(xPos, yPos-barHeight/2);
                         value->setPen(QPen(QColor(255,255,255,255)));
-                        QString vString(QString::number(mModel.valueAt(set,category)));
+                        if (mModel.valueAt(set,category) != 0) {
-                        value->setValueString(vString);
+                            value->setValueString(QString::number(mModel.valueAt(set,category)));
+                        } else {
+                            value->setValueString(QString(""));
+                        }
                         itemIndex++;
                         xPos += mBarDefaultWidth;
                     }
                 }
                 mLayoutDirty = true;
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/barpresenterbase.cpp +3 -1

             #include "barpresenterbase.h"
             #include "bar_p.h"
             #include "barvalue_p.h"
             #include "barlabel_p.h"
             #include "separator_p.h"
             #include "qbarset.h"
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             BarPresenterBase::BarPresenterBase(BarChartModel& model, QGraphicsItem *parent)
                 : ChartItem(parent)
                 ,mBarDefaultWidth(20) // TODO: remove hard coding, when we have layout code ready
                 ,mLayoutSet(false)
                 ,mLayoutDirty(true)
                 ,mSeparatorsVisible(false)
                 ,mModel(model)
             {
                 dataChanged();
             }
             void BarPresenterBase::setSeparatorsVisible(bool visible)
             {
                 mSeparatorsVisible = visible;
             }
             void BarPresenterBase::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 if (!mLayoutSet) {
                     qDebug() << "BarPresenterBase::paint called without layout set. Aborting.";
                     return;
                 }
             //    if (mLayoutDirty) {
                     // Layout or data has changed. Need to redraw.
                     foreach(QGraphicsItem* i, childItems()) {
                         i->paint(painter,option,widget);
                     }
             //    }
             }
             QRectF BarPresenterBase::boundingRect() const
             {
                 return QRectF(0,0,mWidth,mHeight);
             }
             void BarPresenterBase::setBarWidth( int w )
             {
                 mBarDefaultWidth = w;
             }
             void BarPresenterBase::dataChanged()
             {
                 // TODO: performance optimizations. Do we really need to delete and create items every time data is changed or can we reuse them?
                 qDebug() << "datachanged";
                 // Delete old bars
                 foreach (QGraphicsItem* item, childItems()) {
                     delete item;
                 }
                 mBars.clear();
                 mLabels.clear();
                 mSeparators.clear();
                 mFloatingValues.clear();
                 // Create new graphic items for bars
                 for (int c=0; c<mModel.countCategories(); c++) {
                     for (int s=0; s<mModel.countSets(); s++) {
                         QBarSet *set = mModel.setAt(s);
                         Bar *bar = new Bar(this);
                         childItems().append(bar);
                         mBars.append(bar);
                         connect(bar,SIGNAL(clicked()),set,SLOT(barClicked()));
+                        connect(bar,SIGNAL(hoverEntered()),set,SLOT(barHoverEntered()));
+                        connect(bar,SIGNAL(hoverLeaved()),set,SLOT(barHoverLeaved()));
                     }
                 }
                 // Create labels
                 int count = mModel.countCategories();
                 for (int i=0; i<count; i++) {
                     BarLabel* label = new BarLabel(this);
                     label->set(mModel.label(i));
                     childItems().append(label);
                     mLabels.append(label);
                 }
                 // Create separators
                 count = mModel.countCategories() - 1;   // There is one less separator than columns
                 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);
                     mSeparators.append(sep);
                 }
                 // Create floating values
                 for (int category=0; category<mModel.countCategories(); category++) {
                     for (int s=0; s<mModel.countSets(); s++) {
                         QBarSet *set = mModel.setAt(s);
                         BarValue *value = new BarValue(*set, this);
                         childItems().append(value);
                         mFloatingValues.append(value);
-                        connect(set,SIGNAL(clicked()),value,SLOT(toggleVisible()));
+                        connect(set,SIGNAL(toggleFloatingValues()),value,SLOT(toggleVisible()));
                     }
                 }
                 // TODO: if (autolayout) { layoutChanged() } or something
                 mLayoutDirty = true;
             }
             //handlers
             void BarPresenterBase::handleModelChanged(int index)
             {
             //    qDebug() << "BarPresenterBase::handleModelChanged" << index;
                 dataChanged();
             }
             void BarPresenterBase::handleDomainChanged(const Domain& domain)
             {
             //    qDebug() << "BarPresenterBase::handleDomainChanged";
                 // TODO: Figure out the use case for this.
                 // Affects the size of visible item, so layout is changed.
             //    layoutChanged();
             }
             void BarPresenterBase::handleGeometryChanged(const QRectF& rect)
             {
                 mWidth = rect.width();
                 mHeight = rect.height();
                 layoutChanged();
                 mLayoutSet = true;
                 setPos(rect.topLeft());
             }
             #include "moc_barpresenterbase.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/percentbarpresenter.cpp +8 -4

             #include "percentbarpresenter.h"
             #include "bar_p.h"
             #include "barlabel_p.h"
             #include "barvalue_p.h"
             #include "separator_p.h"
             #include "qbarset.h"
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             PercentBarPresenter::PercentBarPresenter(BarChartModel& model, QGraphicsItem *parent) :
                 BarPresenterBase(model, parent)
             {
             }
             void PercentBarPresenter::layoutChanged()
             {
                 // Scale bars to new layout
                 // Layout for bars:
                 if (mModel.countSets() <= 0) {
                     qDebug() << "No sets in model!";
                     // Nothing to do.
                     return;
                 }
                 if (childItems().count() == 0) {
                     qDebug() << "WARNING: PercentBarPresenter::layoutChanged called before graphics items are created!";
                     return;
                 }
                 // TODO: better way to auto-layout
                 // Use reals for accurancy (we might get some compiler warnings... :)
                 int count = mModel.countCategories();
                 int itemIndex(0);
                 int labelIndex(0);
                 qreal tW = mWidth;
                 qreal tC = count+1;
                 qreal xStep = (tW/tC);
                 qreal xPos = ((tW/tC) - mBarDefaultWidth / 2);
                 qreal h = mHeight;
                 for (int category = 0; category < mModel.countCategories(); category++) {
                     qreal colSum = mModel.categorySum(category);
                     qreal scale = (h / colSum);
                     qreal yPos = h;
                     for (int set=0; set < mModel.countSets(); set++) {
                         qreal barHeight = mModel.valueAt(set, category) * scale;
                         Bar* bar = mBars.at(itemIndex);
                         // TODO: width settable per bar?
                         bar->resize(mBarDefaultWidth, barHeight);
                         bar->setBrush(mModel.setAt(set)->brush());
                         bar->setPos(xPos, yPos-barHeight);
                         itemIndex++;
                         yPos -= barHeight;
                     }
                     // TODO: Layout for labels, remove magic number
                     BarLabel* label = mLabels.at(labelIndex);
                     label->setPos(xPos, mHeight + 20);
                     labelIndex++;
                     xPos += xStep;
                 }
                 // Position separators
                 xPos = xStep + xStep/2;
                 for (int s=0; s < mModel.countCategories() - 1; s++) {
                     Separator* sep = mSeparators.at(s);
                     sep->setPos(xPos,0);
                     sep->setSize(QSizeF(1,mHeight));
                     xPos += xStep;
                 }
                 // Position floating values
                 itemIndex = 0;
                 xPos = ((tW/tC) - mBarDefaultWidth / 2);
                 for (int category=0; category < mModel.countCategories(); category++) {
                     qreal yPos = h;
                     qreal colSum = mModel.categorySum(category);
                     qreal scale = (h / colSum);
                     for (int set=0; set < mModel.countSets(); set++) {
                         qreal barHeight = mModel.valueAt(set,category) * scale;
                         BarValue* value = mFloatingValues.at(itemIndex);
                         // TODO: remove hard coding, apply layout
-                        value->setPos(xPos + mBarDefaultWidth/2, yPos-barHeight/2);
+                        value->setPos(xPos, yPos-barHeight/2);
                         value->setPen(QPen(QColor(255,255,255,255)));
-                        QString vString(QString::number(mModel.percentageAt(set,category) * 100));
+                        if (mModel.valueAt(set,category) != 0) {
-                        vString.append("%");
+                            QString vString(QString::number(mModel.percentageAt(set,category) * 100));
-                        value->setValueString(vString);
+                            vString.append("%");
+                            value->setValueString(vString);
+                        } else {
+                            value->setValueString(QString(""));
+                        }
                         itemIndex++;
                         yPos -= barHeight;
                     }
                     xPos += xStep;
                 }
                 mLayoutDirty = true;
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qbarset.cpp +14 -1

             #include "qbarset.h"
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            QBarSet::QBarSet()
+            QBarSet::QBarSet(QObject *parent)
+                : QObject(parent)
             {
                 mFloatingValuesVisible = false;
             }
             void QBarSet::setName(QString name)
             {
                 mName = name;
             }
             QString QBarSet::name()
             {
                 return mName;
             }
             QBarSet& QBarSet::operator << (const qreal &value)
             {
                 mValues.append(value);
                 return *this;
             }
             int QBarSet::count()
             {
                 return mValues.count();
             }
             qreal QBarSet::valueAt(int index)
             {
                 return mValues.at(index);
             }
             void QBarSet::setValue(int index, qreal value)
             {
                 mValues.replace(index,value);
             }
             void QBarSet::setPen(const QPen& pen)
             {
                 mPen = pen;
             }
             const QPen& QBarSet::pen() const
             {
                 return mPen;
             }
             void QBarSet::setBrush(const QBrush& brush)
             {
                 mBrush = brush;
             }
             const QBrush& QBarSet::brush() const
             {
                 return mBrush;
             }
             bool QBarSet::isFloatingValuesVisible()
             {
                 return mFloatingValuesVisible;
             }
             void QBarSet::barClicked()
             {
                 qDebug() << "QBarset::barClicked" << this;
                 // Some bar of this set has been clicked
                 // TODO: What happens then?
                 emit clicked();     // Notify that set has been clicked
             }
+            void QBarSet::barHoverEntered()
+            {
+                qDebug() << "QBarset::barHoverEntered" << this;
+                emit hoverEnter();
+            }
+            void QBarSet::barHoverLeaved()
+            {
+                qDebug() << "QBarset::barHoverLeaved" << this;
+                emit hoverLeave();
+            }
             #include "moc_qbarset.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qbarset.h +5 -4

             #ifndef QBARSET_H
             #define QBARSET_H
-            #include "qchartglobal.h"
+            #include <qchartglobal.h>
             #include <QPen>
             #include <QBrush>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QTCOMMERCIALCHART_EXPORT QBarSet : public QObject
             {
                 Q_OBJECT
             public:
-                QBarSet();
+                QBarSet(QObject *parent = 0);
                 void setName(QString name);
                 QString name();
                 QBarSet& operator << (const qreal &value);  // appends new value to set
                 int count();                                // count of values in set
                 qreal valueAt(int index);                   // for modifying individual values
                 void setValue(int index, qreal value);      //
                 void setPen(const QPen& pen);
                 const QPen& pen() const;
                 void setBrush(const QBrush& brush);
                 const QBrush& brush() const;
                 bool isFloatingValuesVisible();
             Q_SIGNALS:
                 void clicked();
-            /*
                 void hoverEnter();
                 void hoverLeave();
-            */
+                void toggleFloatingValues();
             public Q_SLOTS:
                 void barClicked();
+                void barHoverEntered();
+                void barHoverLeaved();
             private:
                 QString mName;
                 QList<qreal> mValues;
                 QPen mPen;
                 QBrush mBrush;
                 bool mFloatingValuesVisible;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QBARSET_H

src/barchart/qstackedbarchartseries.h +1 -1

             #ifndef STACKEDBARCHARTSERIES_H
             #define STACKEDBARCHARTSERIES_H
             #include <QList>
             #include <QAbstractItemModel>
             #include "qchartseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QBarCategory;
             class QBarSet;
             class BarChartModel;
             class QTCOMMERCIALCHART_EXPORT QStackedBarChartSeries : public QChartSeries
             {
                 Q_OBJECT
             public:
                 QStackedBarChartSeries(QBarCategory *category, QObject* parent=0);
                 // from QChartSeries
                 virtual QChartSeriesType type() const { return QChartSeries::SeriesTypeStackedBar; }
+                // Set handling
                 void addBarSet(QBarSet *set);       // Takes ownership
                 void removeBarSet(QBarSet *set);    // Also deletes the set, if set is owned.
                 int countSets();
                 QBarSet* nextSet(bool first=false);     // Returns first set, if called with true
-                //TODO:
                 //QList<QString> legend();  // Returns legend of series (ie. names of all sets in series)
                 // TODO: Functions below this are not part of api and will be moved
                 // to private implementation, when we start using it (not part of api)
                 int countCategories();
                 qreal min();
                 qreal max();
                 qreal valueAt(int set, int category);
                 qreal maxCategorySum();
                 BarChartModel& model();
             signals:
                 void changed(int index);
             public Q_SLOTS:
             private:
                 BarChartModel* mModel;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // STACKEDBARCHARTSERIES_H

src/barchart/stackedbarpresenter.cpp +6 -3

             #include "stackedbarpresenter.h"
             #include "bar_p.h"
             #include "barlabel_p.h"
             #include "barvalue_p.h"
             #include "separator_p.h"
             #include "qbarset.h"
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             StackedBarPresenter::StackedBarPresenter(BarChartModel& model, QGraphicsItem *parent) :
                 BarPresenterBase(model,parent)
             {
             }
             void StackedBarPresenter::layoutChanged()
             {
                 // Scale bars to new layout
                 // Layout for bars:
                 if (mModel.countSets() <= 0) {
                     qDebug() << "No sets in model!";
                     // Nothing to do.
                     return;
                 }
                 if (mModel.countCategories() == 0) {
                     qDebug() << "No categories in model!";
                     // Nothing to do
                     return;
                 }
                 if (childItems().count() == 0) {
                     qDebug() << "WARNING: StackedBarPresenter::layoutChanged called before graphics items are created!";
                     return;
                 }
                 // TODO: better way to auto-layout
                 // Use reals for accurancy (we might get some compiler warnings... :)
                 // TODO: use temp variable for category count...
                 qreal maxSum = mModel.maxCategorySum();
                 qreal h = mHeight;
                 qreal scale = (h / maxSum);
                 int itemIndex(0);
                 int labelIndex(0);
                 qreal tW = mWidth;
                 qreal tC = mModel.countCategories() + 1;
                 qreal xStep = (tW/tC);
                 qreal xPos = ((tW/tC) - mBarDefaultWidth / 2);
                 for (int category = 0; category < mModel.countCategories(); category++) {
                     qreal yPos = h;
                     for (int set=0; set < mModel.countSets(); set++) {
                         qreal barHeight = mModel.valueAt(set, category) * scale;
                         Bar* bar = mBars.at(itemIndex);
                         bar->resize(mBarDefaultWidth, barHeight);
                         bar->setBrush(mModel.setAt(set)->brush());
                         bar->setPos(xPos, yPos-barHeight);
                         itemIndex++;
                         yPos -= barHeight;
                     }
                     // TODO: Layout for labels, remove magic number
                     BarLabel* label = mLabels.at(labelIndex);
                     label->setPos(xPos, mHeight + 20);
                     labelIndex++;
                     xPos += xStep;
                 }
                 // Position separators
                 xPos = xStep + xStep/2;
                 for (int s=0; s < mModel.countCategories() - 1; s++) {
                     Separator* sep = mSeparators.at(s);
                     sep->setPos(xPos,0);
                     sep->setSize(QSizeF(1,mHeight));
                     xPos += xStep;
                 }
                 // Position floating values
                 itemIndex = 0;
                 xPos = ((tW/tC) - mBarDefaultWidth / 2);
                 for (int category=0; category < mModel.countCategories(); category++) {
                     qreal yPos = h;
                     for (int set=0; set < mModel.countSets(); set++) {
                         qreal barHeight = mModel.valueAt(set,category) * scale;
                         BarValue* value = mFloatingValues.at(itemIndex);
                         // TODO: remove hard coding, apply layout
                         value->resize(100,50);
-                        value->setPos(xPos + mBarDefaultWidth/2, yPos-barHeight/2);
+                        value->setPos(xPos, yPos-barHeight/2);
                         value->setPen(QPen(QColor(255,255,255,255)));
-                        QString vString(QString::number(mModel.valueAt(set,category)));
+                        if (mModel.valueAt(set,category) != 0) {
-                        value->setValueString(vString);
+                            value->setValueString(QString::number(mModel.valueAt(set,category)));
+                        } else {
+                            value->setValueString(QString(""));
+                        }
                         itemIndex++;
                         yPos -= barHeight;
                     }
                     xPos += xStep;
                 }
                 mLayoutDirty = true;
             }
             QTCOMMERCIALCHART_END_NAMESPACE

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages