HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r114:a235f6009c27

added labels to barcharts

sauimone -

r114:a235f6009c27

parent child

Context file:

r114:a235f6009c27

Collapse all files

src/barchart/barlabel.cpp created 644 +42 0

@@ -0,0 +1,42
	1	#include "barlabel_p.h"
	2	#include <QPainter>
	3	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	4
	5	BarLabel::BarLabel(QGraphicsItem* parent) : ChartItem(parent)
	6	{
	7	}
	8
	9
	10	void BarLabel::set(QString label)
	11	{
	12	mLabel = label;
	13	}
	14
	15	void BarLabel::setPos(qreal x, qreal y)
	16	{
	17	mXpos = x;
	18	mYpos = y;
	19	}
	20
	21	void BarLabel::setSize(const QSize &size)
	22	{
	23	mSize = size;
	24	}
	25
	26	void BarLabel::setPlotDomain(const PlotDomain& data)
	27	{
	28	mDomain = data;
	29	}
	30
	31	void BarLabel::paint(QPainter painter, const QStyleOptionGraphicsItem option, QWidget *widget)
	32	{
	33	painter->drawText(boundingRect(),mLabel);
	34	}
	35
	36	QRectF BarLabel::boundingRect() const
	37	{
	38	QRectF r(mXpos, mYpos, mXpos + mSize.width(), mYpos + mSize.height());
	39	return r;
	40	}
	41
	42	QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/barlabel_p.h created 644 +36 0

@@ -0,0 +1,36
	1	#ifndef BARLABEL_H
	2	#define BARLABEL_H
	3
	4	#include "chartitem_p.h"
	5
	6	QTCOMMERCIALCHART_BEGIN_NAMESPACE
	7
	8	class BarLabel : public ChartItem
	9	{
	10	public:
	11	BarLabel(QGraphicsItem* parent = 0);
	12
	13	void set(QString label);
	14	void setPos(qreal x, qreal y);
	15
	16	// From ChartItem
	17	void setSize(const QSize &size);
	18	void setPlotDomain(const PlotDomain& data);
	19
	20	// From QGraphicsItem
	21	void paint(QPainter painter, const QStyleOptionGraphicsItem option, QWidget *widget);
	22	QRectF boundingRect() const;
	23
	24	private:
	25
	26	PlotDomain mDomain;
	27	QSize mSize;
	28	QString mLabel;
	29	qreal mXpos;
	30	qreal mYpos;
	31
	32	};
	33
	34	QTCOMMERCIALCHART_END_NAMESPACE
	35
	36	#endif // BARLABEL_H

src/barchart/bargroup.cpp +20 -2

             #include "bargroup.h"
             #include "bar.h"
+            #include "barlabel_p.h"
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                     // Layout or data has changed. Need to redraw.
                     foreach(QGraphicsItem* i, childItems()) {
                         i->paint(painter,option,widget);
+                    mLayoutDirty = false;
                     }
                 }
             }
                     childItems().append(bar);
                 }
+                // TODO: labels from series. This creates just some example labels
+                int count = mSeries.countColumns();
+                for (int i=0; i<count; i++) {
+                    BarLabel* label = new BarLabel(this);
+                    QString text("Label " + QString::number(i));
+                    label->set(text);
+                    childItems().append(label);
+                }
+                // TODO: if (autolayout) { layoutChanged() } or something
                 mLayoutDirty = true;
             }
                 qreal tC = columnCount+1;
                 qreal xStepPerSeries = (tW/tC);
-                qDebug() << "XSTEP:" << xStepPerSeries;
                 // Scaling.
                 int itemIndex(0);
+                int labelIndex = mSeries.countColumns() * mSeries.countRows();
                 for (int column=0; column < columnCount; column++) {
                     qreal xPos = xStepPerSeries * column + ((tW + mBarDefaultWidth*rowCount)/(columnCount*2));
                     qreal yPos = mHeight;
                         itemIndex++;
                         xPos += mBarDefaultWidth;
                     }
+                    // TODO: Layout for labels, remove magic number
+                    xPos = xStepPerSeries * column + ((tW + mBarDefaultWidth*rowCount)/(columnCount*2));
+                    BarLabel* label = reinterpret_cast<BarLabel*> (childItems().at(labelIndex));
+                    label->setPos(xPos, mHeight + 20);
+                    labelIndex++;
                 }
                 mLayoutDirty = true;

src/barchart/percentbargroup.cpp +20 -1

             #include "percentbargroup.h"
             #include "bar.h"
+            #include "barlabel_p.h"
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                     foreach(QGraphicsItem* i, childItems()) {
                         i->paint(painter,option,widget);
                     }
+                    mLayoutDirty = false;
                 }
             }
                     childItems().append(bar);
                 }
+                // TODO: labels from series. This creates just some example labels
+                int count = mSeries.countColumns();
+                for (int i=0; i<count; i++) {
+                    BarLabel* label = new BarLabel(this);
+                    QString text("Label " + QString::number(i));
+                    label->set(text);
+                    childItems().append(label);
+                }
+                // TODO: if (autolayout) { layoutChanged() } or something
                 mLayoutDirty = true;
             }
                 qreal tW = mWidth;
                 qreal tC = count+1;
                 qreal xStep = (tW/tC);
-                qreal xPos = ((tW/tC) + mBarDefaultWidth / 2);
+            //    qreal xPos = ((tW/tC) + mBarDefaultWidth / 2);
+                qreal xPos = ((tW/tC) - mBarDefaultWidth / 2);
+                int labelIndex = mSeries.countColumns() * mSeries.countRows();
                 for (int column = 0; column < mSeries.countColumns(); column++) {
                     qreal colSum = mSeries.columnSum(column);
                         itemIndex++;
                         yPos -= barHeight;
                     }
+                    // TODO: Layout for labels, remove magic number
+                    BarLabel* label = reinterpret_cast<BarLabel*> (childItems().at(labelIndex));
+                    label->setPos(xPos, mHeight + 20);
+                    labelIndex++;
                     xPos += xStep;
                 }
                 mLayoutDirty = true;

src/barchart/stackedbargroup.cpp +21 0

             #include "stackedbargroup.h"
             #include "bar.h"
+            #include "barlabel_p.h"
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                     foreach(QGraphicsItem* i, childItems()) {
                         i->paint(painter,option,widget);
                     }
+                    mLayoutDirty = false;
+                //TODO: draw labels.
                 }
             }
             QRectF StackedBarGroup::boundingRect() const
                     childItems().append(bar);
                 }
+                // TODO: labels from series. This creates just some example labels
+                int count = mSeries.countColumns();
+                for (int i=0; i<count; i++) {
+                    BarLabel* label = new BarLabel(this);
+                    QString text("Label " + QString::number(i));
+                    label->set(text);
+                    childItems().append(label);
+                }
+                // TODO: if (autolayout) { layoutChanged() } or something
                 mLayoutDirty = true;
             }
                 qreal tC = count+1;
                 qreal xStep = (tW/tC);
                 qreal xPos = ((tW/tC) - mBarDefaultWidth / 2);
+                int labelIndex = mSeries.countColumns() * mSeries.countRows();
                 for (int column = 0; column < mSeries.countColumns(); column++) {
                     qreal yPos = h;
                         itemIndex++;
                         yPos -= barHeight;
                     }
+                    // TODO: Layout for labels, remove magic number
+                    BarLabel* label = reinterpret_cast<BarLabel*> (childItems().at(labelIndex));
+                    label->setPos(xPos, mHeight + 20);
+                    labelIndex++;
                     xPos += xStep;
                 }
                 mLayoutDirty = true;
             }

src/barchart/stackedbargroup.h +2 0

             #include "charttheme_p.h"
             #include "chartitem_p.h"
+            #include "barlabel_p.h"
             #include "bar.h"
             #include "stackedbarchartseries.h"
             #include <QGraphicsItem>
                 QList<QColor> mColors;  // List of colors for series for now
                 ChartTheme* mTheme;
+            //    QList<BarLabel*> mLabels;
             };

src/src.pro +3 -1

                 barchart/stackedbargroup.cpp \
                 barchart/percentbarchartseries.cpp \
                 barchart/percentbargroup.cpp \
+                barchart/barlabel.cpp \
                 xylinechart/qxychartseries.cpp \
                 xylinechart/xylinechartitem.cpp \
                 plotdomain.cpp \
             PRIVATE_HEADERS += \
                 xylinechart/xylinechartitem_p.h \
-                plotdomain_p.h \
+                barchart/barlabel_p.h \
+                plotdomain_p.h \
                 qscatterseries_p.h \
                 qpieseries_p.h \
                 pieslice.h \

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