HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r666:6018938e3db4

combined barpresenterbase and barpresenter. renamed barchartpresenters to barchartitems

sauimone -

r666:6018938e3db4

parent child

Context file:

r666:6018938e3db4

Collapse all files

src/barchart/barchart.pri +6 -8

             SOURCES += \
                 $$PWD/bar.cpp \
                 $$PWD/barchartmodel.cpp \
-                $$PWD/barpresenter.cpp \
+                $$PWD/barchartitem.cpp \
-                $$PWD/barpresenterbase.cpp \
+                $$PWD/percentbarchartitem.cpp \
-                $$PWD/percentbarpresenter.cpp \
                 $$PWD/qbarseries.cpp \
                 $$PWD/qbarset.cpp \
                 $$PWD/qpercentbarseries.cpp \
                 $$PWD/qstackedbarseries.cpp \
-                $$PWD/stackedbarpresenter.cpp \
+                $$PWD/stackedbarchartitem.cpp \
                 $$PWD/barvalue.cpp
             PRIVATE_HEADERS += \
                 $$PWD/bar_p.h \
                 $$PWD/barchartmodel_p.h \
-                $$PWD/barpresenter_p.h \
+                $$PWD/barchartitem_p.h \
-                $$PWD/barpresenterbase_p.h \
+                $$PWD/percentbarchartitem_p.h \
-                $$PWD/percentbarpresenter_p.h \
+                $$PWD/stackedbarchartitem_p.h \
-                $$PWD/stackedbarpresenter_p.h \
                 $$PWD/barvalue_p.h
             PUBLIC_HEADERS += \

src/barchart/barchartitem.cpp ~~src/barchart/barpresenterbase.cpp~~ renamed +86 -13

-            #include "barpresenterbase_p.h"
+            #include "barchartitem_p.h"
             #include "bar_p.h"
             #include "barvalue_p.h"
             #include "qbarset.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            BarPresenterBase::BarPresenterBase(QBarSeries *series, QChart *parent) :
+            BarChartItem::BarChartItem(QBarSeries *series, QChart *parent) :
                 ChartItem(parent),
                 mHeight(0),
                 mWidth(0),
                 mChart(parent)
             {
                 connect(series,SIGNAL(showToolTip(QPoint,QString)),this,SLOT(showToolTip(QPoint,QString)));
+                connect(series, SIGNAL(updatedBars()), this, SLOT(layoutChanged()));
                 setZValue(ChartPresenter::BarSeriesZValue);
                 initAxisLabels();
                 dataChanged();
             }
-            BarPresenterBase::~BarPresenterBase()
+            BarChartItem::~BarChartItem()
             {
                 disconnect(this,SLOT(showToolTip(QPoint,QString)));
             }
-            void BarPresenterBase::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+            void BarChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {
                 if (!mLayoutSet) {
-                    qDebug() << "BarPresenterBase::paint called without layout set. Aborting.";
+                    qDebug() << "BarChartItem::paint called without layout set. Aborting.";
                     return;
                 }
                 foreach(QGraphicsItem* i, childItems()) {
                 }
             }
-            QRectF BarPresenterBase::boundingRect() const
+            QRectF BarChartItem::boundingRect() const
             {
                 return QRectF(0, 0, mWidth, mHeight);
             }
-            void BarPresenterBase::dataChanged()
+            void BarChartItem::dataChanged()
             {
                 // TODO: performance optimizations. Do we really need to delete and create items every time data is changed or can we reuse them?
                 // Delete old bars
                 }
             }
-            void BarPresenterBase::initAxisLabels()
+            void BarChartItem::layoutChanged()
+            {
+                // Scale bars to new layout
+                // Layout for bars:
+                if (mSeries->barsetCount() <= 0) {
+                    qDebug() << "No sets in model!";
+                    return;
+                }
+                if (childItems().count() == 0) {
+                    qDebug() << "WARNING: BarChartitem::layoutChanged called before graphics items are created!";
+                    return;
+                }
+                // Use temporary qreals for accurancy (we might get some compiler warnings... :)
+                int categoryCount = mSeries->categoryCount();
+                int setCount = mSeries->barsetCount();
+                qreal tW = mWidth;
+                qreal tH = mHeight;
+                qreal tM = mSeries->max();
+                qreal scale = (tH/tM);
+                qreal tC = categoryCount + 1;
+                qreal categoryWidth = tW/tC;
+                mBarWidth = categoryWidth / (setCount+1);
+                int itemIndex(0);
+                for (int category=0; category < categoryCount; category++) {
+                    qreal xPos = categoryWidth * category + categoryWidth /2 + mBarWidth/2;
+                    qreal yPos = mHeight;
+                    for (int set = 0; set < setCount; set++) {
+                        qreal barHeight = mSeries->valueAt(set,category) * scale;
+                        Bar* bar = mBars.at(itemIndex);
+                        // TODO: width settable per bar?
+                        bar->resize(mBarWidth, barHeight);
+                        bar->setPen(mSeries->barsetAt(set)->pen());
+                        bar->setBrush(mSeries->barsetAt(set)->brush());
+                        bar->setPos(xPos, yPos-barHeight);
+                        itemIndex++;
+                        xPos += mBarWidth;
+                    }
+                }
+                // Position floating values
+                itemIndex = 0;
+                for (int category=0; category < mSeries->categoryCount(); category++) {
+                    qreal xPos = categoryWidth * category + categoryWidth/2 + mBarWidth;
+                    qreal yPos = mHeight;
+                    for (int set=0; set < mSeries->barsetCount(); set++) {
+                        qreal barHeight = mSeries->valueAt(set,category) * scale;
+                        BarValue* value = mFloatingValues.at(itemIndex);
+                        QBarSet* barSet = mSeries->barsetAt(set);
+                        value->resize(100,50);  // TODO: proper layout for this.
+                        value->setPos(xPos, yPos-barHeight/2);
+                        value->setPen(barSet->floatingValuePen());
+                        if (mSeries->valueAt(set,category) != 0) {
+                            value->setValueString(QString::number(mSeries->valueAt(set,category)));
+                        } else {
+                            value->setValueString(QString(""));
+                        }
+                        itemIndex++;
+                        xPos += mBarWidth;
+                    }
+                }
+                update();
+            }
+            void BarChartItem::initAxisLabels()
             {
                 int count = mSeries->categoryCount();
                 if (0 == count) {
             //handlers
-            void BarPresenterBase::handleModelChanged(int index)
+            void BarChartItem::handleModelChanged(int index)
             {
                 Q_UNUSED(index)
                 dataChanged();
             }
-            void BarPresenterBase::handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY)
+            void BarChartItem::handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY)
             {
                 // TODO:
                 Q_UNUSED(minX)
                 */
             }
-            void BarPresenterBase::handleGeometryChanged(const QRectF& rect)
+            void BarChartItem::handleGeometryChanged(const QRectF& rect)
             {
                 mWidth = rect.width();
                 mHeight = rect.height();
                 setPos(rect.topLeft());
             }
-            void BarPresenterBase::showToolTip(QPoint pos, QString tip)
+            void BarChartItem::showToolTip(QPoint pos, QString tip)
             {
                 // TODO: cool tooltip instead of default
                 QToolTip::showText(pos,tip);
             }
-            #include "moc_barpresenterbase_p.cpp"
+            #include "moc_barchartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/barchartitem_p.h ~~src/barchart/barpresenterbase_p.h~~ renamed +8 -9

-            #ifndef BARPRESENTERBASE_H
+            #ifndef BARCHARTITEM_H
-            #define BARPRESENTERBASE_H
+            #define BARCHARTITEM_H
             #include "chartitem_p.h"
             #include "qbarseries.h"
             class QChartAxisCategories;
             class QChart;
-            // Common implemantation of different presenters. Not to be instantiated.
+            // Common implemantation of different presenters.
-            // TODO: combine this with BarPresenter and derive other presenters from it?
+            class BarChartItem : public QObject, public ChartItem
-            class BarPresenterBase : public QObject, public ChartItem
             {
                 Q_OBJECT
             public:
-                BarPresenterBase(QBarSeries *series, QChart *parent = 0);
+                BarChartItem(QBarSeries *series, QChart *parent = 0);
-                virtual ~BarPresenterBase();
+                virtual ~BarChartItem();
             public:
                 // From QGraphicsItem
                 // TODO: Consider the domain for layoutChanged. May be use case, may not be. If it is, then the derived classes need to implement it
                 virtual void dataChanged();     // data of series has changed -> need to recalculate bar sizes
             private slots:
-                virtual void layoutChanged() = 0;   // layout has changed -> need to recalculate bar sizes
+                virtual void layoutChanged();   // layout has changed -> need to recalculate bar sizes
             protected:
                 void initAxisLabels();
             QTCOMMERCIALCHART_END_NAMESPACE
-            #endif // BARPRESENTERBASE_H
+            #endif // BARCHARTITEM_H

src/barchart/percentbarchartitem.cpp ~~src/barchart/percentbarpresenter.cpp~~ renamed +6 -6

-            #include "percentbarpresenter_p.h"
+            #include "percentbarchartitem_p.h"
             #include "bar_p.h"
             #include "barvalue_p.h"
             #include "qbarset.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            PercentBarPresenter::PercentBarPresenter(QBarSeries *series, QChart *parent) :
+            PercentBarChartItem::PercentBarChartItem(QBarSeries *series, QChart *parent) :
-                BarPresenterBase(series, parent)
+                BarChartItem(series, parent)
             {
             }
-            void PercentBarPresenter::layoutChanged()
+            void PercentBarChartItem::layoutChanged()
             {
                 // Scale bars to new layout
                 // Layout for bars:
                 }
                 if (childItems().count() == 0) {
-                    qDebug() << "WARNING: PercentBarPresenter::layoutChanged called before graphics items are created!";
+                    qDebug() << "WARNING: PercentBarChartItem::layoutChanged called before graphics items are created!";
                     return;
                 }
                 }
             }
-            #include "moc_percentbarpresenter_p.cpp"
+            #include "moc_percentbarchartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/percentbarchartitem_p.h ~~src/barchart/barpresenter_p.h~~ renamed +7 -9

-            #ifndef BARPRESENTER_H
+            #ifndef PERCENTBARCHARTITEM_H
-            #define BARPRESENTER_H
+            #define PERCENTBARCHARTITEM_H
-            #include "qchartglobal.h"
+            #include "barchartitem_p.h"
-            #include "barpresenterbase_p.h"
             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QBarSeries;
-            // Presenter for parallel bars. Grouping of bars is done on category basis.
+            class PercentBarChartItem : public BarChartItem
-            class BarPresenter : public BarPresenterBase
             {
                 Q_OBJECT
             public:
-                explicit BarPresenter(QBarSeries *series, QChart *parent = 0);
+                PercentBarChartItem(QBarSeries *series, QChart *parent = 0);
             private:
-                // From BarPresenterBase
                 void layoutChanged();   // layout has changed -> need to recalculate bar sizes
             private:
                 // Data
             };
             QTCOMMERCIALCHART_END_NAMESPACE
-            #endif // BARPRESENTER_H
+            #endif // PERCENTBARCHARTITEM_H

src/barchart/stackedbarchartitem.cpp ~~src/barchart/stackedbarpresenter.cpp~~ renamed +7 -7

-            #include "stackedbarpresenter_p.h"
+            #include "stackedbarchartitem_p.h"
             #include "bar_p.h"
             #include "barvalue_p.h"
             #include "qbarset.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            StackedBarPresenter::StackedBarPresenter(QBarSeries *series, QChart *parent) :
+            StackedBarChartItem::StackedBarChartItem(QBarSeries *series, QChart *parent) :
-                BarPresenterBase(series,parent)
+                BarChartItem(series,parent)
             {
             }
-            StackedBarPresenter::~StackedBarPresenter()
+            StackedBarChartItem::~StackedBarChartItem()
             {
             }
-            void StackedBarPresenter::layoutChanged()
+            void StackedBarChartItem::layoutChanged()
             {
                 // Scale bars to new layout
                 // Layout for bars:
                 }
                 if (childItems().count() == 0) {
-                    qDebug() << "WARNING: StackedBarPresenter::layoutChanged called before graphics items are created!";
+                    qDebug() << "WARNING: StackedBarChartItem::layoutChanged called before graphics items are created!";
                     return;
                 }
                 }
             }
-            #include "moc_stackedbarpresenter_p.cpp"
+            #include "moc_stackedbarchartitem_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/stackedbarchartitem_p.h ~~src/barchart/stackedbarpresenter_p.h~~ renamed +8 -8

-            #ifndef STACKEDBARPRESENTER_H
+            #ifndef STACKEDBARCHARTITEM_H
-            #define STACKEDBARPRESENTER_H
+            #define STACKEDBARCHARTITEM_H
-            #include "barpresenterbase_p.h"
+            #include "barchartitem_p.h"
             #include "qstackedbarseries.h"
             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class StackedBarPresenter : public BarPresenterBase
+            class StackedBarChartItem : public BarChartItem
             {
                 Q_OBJECT
             public:
-                StackedBarPresenter(QBarSeries *series, QChart *parent = 0);
+                StackedBarChartItem(QBarSeries *series, QChart *parent = 0);
-                ~StackedBarPresenter();
+                ~StackedBarChartItem();
             private:
-                // From BarPresenterBase
+                // From BarChartItem
                 void layoutChanged();   // layout has changed -> need to recalculate bar sizes
             private:
             QTCOMMERCIALCHART_END_NAMESPACE
-            #endif // STACKEDBARPRESENTER_H
+            #endif // STACKEDBARCHARTITEM_H

src/chartpresenter.cpp +6 -6

             //items
             #include "axisitem_p.h"
             #include "areachartitem_p.h"
-            #include "barpresenter_p.h"
+            #include "barchartitem_p.h"
-            #include "stackedbarpresenter_p.h"
+            #include "stackedbarchartitem_p.h"
-            #include "percentbarpresenter_p.h"
+            #include "percentbarchartitem_p.h"
             #include "linechartitem_p.h"
             #include "piechartitem_p.h"
             #include "scatterchartitem_p.h"
                 case QSeries::SeriesTypeBar: {
                     QBarSeries* barSeries = static_cast<QBarSeries*>(series);
-                    BarPresenter* bar = new BarPresenter(barSeries,m_chart);
+                    BarChartItem* bar = new BarChartItem(barSeries,m_chart);
                     if(m_options.testFlag(QChart::SeriesAnimations)) {
                      //  m_animator->addAnimation(bar);
                     }
                 case QSeries::SeriesTypeStackedBar: {
                     QStackedBarSeries* stackedBarSeries = static_cast<QStackedBarSeries*>(series);
-                    StackedBarPresenter* bar = new StackedBarPresenter(stackedBarSeries,m_chart);
+                    StackedBarChartItem* bar = new StackedBarChartItem(stackedBarSeries,m_chart);
                     if(m_options.testFlag(QChart::SeriesAnimations)) {
                      //  m_animator->addAnimation(bar);
                     }
                 case QSeries::SeriesTypePercentBar: {
                     QPercentBarSeries* percentBarSeries = static_cast<QPercentBarSeries*>(series);
-                    PercentBarPresenter* bar = new PercentBarPresenter(percentBarSeries,m_chart);
+                    PercentBarChartItem* bar = new PercentBarChartItem(percentBarSeries,m_chart);
                     if(m_options.testFlag(QChart::SeriesAnimations)) {
                      //  m_animator->addAnimation(bar);
                     }

src/charttheme.cpp +3 -3

             //items
             #include "axisitem_p.h"
-            #include "barpresenter_p.h"
+            #include "barchartitem_p.h"
-            #include "stackedbarpresenter_p.h"
+            #include "stackedbarchartitem_p.h"
-            #include "percentbarpresenter_p.h"
+            #include "percentbarchartitem_p.h"
             #include "linechartitem_p.h"
             #include "areachartitem_p.h"
             #include "scatterchartitem_p.h"

src/charttheme_p.h +3 -3

             class QSeries;
             class LineChartItem;
             class QLineSeries;
-            class BarPresenter;
+            class BarChartItem;
             class QBarSeries;
-            class StackedBarPresenter;
+            class StackedBarChartItem;
             class QStackedBarSeries;
             class QPercentBarSeries;
-            class PercentBarPresenter;
+            class PercentBarChartItem;
             class QScatterSeries;
             class ScatterChartItem;
             class PieChartItem;

src/qchart.h +1 -1

             class AxisItem;
             class QSeries;
             class PlotDomain;
-            class BarPresenter;
+            class BarChartItem;
             class QChartAxis;
             class ChartTheme;
             class ChartItem;

src/barchart/barpresenter.cpp removed 0 -89

NO CONTENT: file was removed

src/barchart/percentbarpresenter_p.h removed 0 -29

NO CONTENT: file was removed

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