HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r281:d81c37855aff

refactoring. QStackedBarSeries and QPercentBarSeries are now derived from QBarSeries.

sauimone -

r281:d81c37855aff

parent child

Context file:

r281:d81c37855aff

Collapse all files

src/barchart/barpresenterbase.h +1 0

             #ifndef BARPRESENTERBASE_H
             #define BARPRESENTERBASE_H
             #include "chartitem_p.h"
             #include "barchartmodel_p.h"
             #include <QPen>
             #include <QBrush>
             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class Bar;
             class BarLabel;
             class Separator;
             class BarValue;
             // Common implemantation of different presenters. Not to be instantiated.
+            // TODO: combine this with BarPresenter and derive others from it?
             class BarPresenterBase : public QObject, public ChartItem
             {
                 Q_OBJECT
             public:
                 BarPresenterBase(BarChartModel& model, QGraphicsItem *parent = 0);
                 void setSeparatorsVisible(bool visible = true);
             public:
                 // From QGraphicsItem
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
                 QRectF boundingRect() const;
                 // TODO: these may change with layout awarness.
                 void setBarWidth( int w );
                 void setPen(QPen pen);
                 QPen pen();
                 void setBrush(QBrush brush);
                 QBrush brush();
                 // 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
                 virtual void layoutChanged() = 0;   // layout has changed -> need to recalculate bar sizes
             protected slots:
                 void handleModelChanged(int index);
                 void handleDomainChanged(const Domain& domain);
                 void handleGeometryChanged(const QRectF& size);
                 void barHoverEntered(QGraphicsSceneHoverEvent *event);  // Internal.
                 void barHoverLeaved(QGraphicsSceneHoverEvent *event);
             protected:
                 // TODO: consider these.
                 int mHeight;        // Layout spesific
                 int mWidth;
                 int mBarDefaultWidth;
                 bool mLayoutSet;    // True, if component has been laid out.
                 bool mLayoutDirty;
                 bool mSeparatorsVisible;
                 BarChartModel& mModel;
                 // Not owned.
                 QList<Bar*> mBars;
                 QList<BarLabel*> mLabels;
                 QList<Separator*> mSeparators;
                 QList<BarValue*> mFloatingValues;
                 QPen mPen;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // BARPRESENTERBASE_H

src/barchart/qbarchartseries.h +1 -2

             #ifndef BARCHARTSERIES_H
             #define BARCHARTSERIES_H
             #include <QList>
             #include <QAbstractItemModel>
             #include "qchartseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QBarCategory;
             class QBarSet;
             class BarChartModel;
             // Container for series
-            // TODO: derive Stacked and percent bar charts from this?
             class QTCOMMERCIALCHART_EXPORT QBarChartSeries : public QChartSeries
             {
                 Q_OBJECT
             public:
                 QBarChartSeries(QBarCategory *category, QObject* parent=0);
                 virtual QChartSeriesType type() const { return QChartSeries::SeriesTypeBar; }
                 void addBarSet(QBarSet *set);               // Takes ownership of set
                 void removeBarSet(QBarSet *set);            // Releases ownership, doesn't delete set
                 int countSets();
                 QBarSet* nextSet(bool getFirst=false);     // Returns first set, if called with true
                 QList<QString> legend();  // Returns legend of series (ie. names of all sets in series)
                 // Disabled by default. Call these to change behavior.
                 void enableFloatingValues(bool enabled=true);
                 void enableHoverNames(bool enabled=true);
                 // 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);
                 // TODO: these to private implementation.
                 void floatingValuesEnabled(bool enabled);
                 void hoverNamesEnabled(bool enabled);
             //public Q_SLOTS:
-            private:
+            protected:
                 BarChartModel* mModel;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // BARCHARTSERIES_H

src/barchart/qpercentbarchartseries.cpp +4 -4

             #include <limits.h>
             #include <QDebug>
             #include "qpercentbarchartseries.h"
             #include "qbarset.h"
             #include "qbarcategory.h"
             #include "barchartmodel_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             QPercentBarChartSeries::QPercentBarChartSeries(QBarCategory *category, QObject *parent)
-                : QChartSeries(parent)
+                : QBarChartSeries(category, parent)
-                ,mModel(new BarChartModel(category, this))
+            //    ,mModel(new BarChartModel(category, this))
             {
             }
+            /*
             void QPercentBarChartSeries::addBarSet(QBarSet *set)
             {
                 connect(this,SIGNAL(floatingValuesEnabled(bool)),set,SLOT(enableFloatingValues(bool)));
                 connect(this,SIGNAL(hoverNamesEnabled(bool)),set,SLOT(enableHoverNames(bool)));
                 mModel->addBarSet(set);
             }
             void QPercentBarChartSeries::removeBarSet(QBarSet *set)
             {
                 disconnect(set,SLOT(enableFloatingValues(bool)));
                 disconnect(set,SLOT(enableHoverNames(bool)));
                 mModel->removeBarSet(set);
             }
             int QPercentBarChartSeries::countSets()
             {
                 return mModel->countSets();
             }
             QBarSet* QPercentBarChartSeries::nextSet(bool getFirst)
             {
                 return mModel->nextSet(getFirst);
             }
             QList<QString> QPercentBarChartSeries::legend()
             {
                 return mModel->legend();
             }
             int QPercentBarChartSeries::countCategories()
             {
                 return mModel->countCategories();
             }
             qreal QPercentBarChartSeries::min()
             {
                 return mModel->min();
             }
             qreal QPercentBarChartSeries::max()
             {
                 return mModel->max();
             }
             qreal QPercentBarChartSeries::valueAt(int set, int category)
             {
                 return mModel->valueAt(set,category);
             }
             qreal QPercentBarChartSeries::maxCategorySum()
             {
                 return mModel->maxCategorySum();
             }
             BarChartModel& QPercentBarChartSeries::model()
             {
                 return *mModel;
             }
+            */
             #include "moc_qpercentbarchartseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qpercentbarchartseries.h +5 -4

             #ifndef PERCENTBARCHARTSERIES_H
             #define PERCENTBARCHARTSERIES_H
             #include <QList>
             #include <QAbstractItemModel>
-            #include "qchartseries.h"
+            #include "qbarchartseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QBarCategory;
             class QBarSet;
             class BarChartModel;
-            class QTCOMMERCIALCHART_EXPORT QPercentBarChartSeries : public QChartSeries
+            //class QTCOMMERCIALCHART_EXPORT QPercentBarChartSeries : public QChartSeries
+            class QTCOMMERCIALCHART_EXPORT QPercentBarChartSeries : public QBarChartSeries
             {
                 Q_OBJECT
             public:
                 QPercentBarChartSeries(QBarCategory *category, QObject* parent=0);
                 // from BarChartSeriesBase
                 virtual QChartSeriesType type() const { return QChartSeries::SeriesTypePercentBar; }
+            /*
                 void addBarSet(QBarSet *set);       // Takes ownership
                 void removeBarSet(QBarSet *set);    // Releases ownership, doesn't delete set
                 int countSets();
                 QBarSet* nextSet(bool first=false);     // Returns first set, if called with true
                 QList<QString> legend();  // Returns legend of series (ie. names of all sets in series)
                 // Disabled by default. Call these to change behavior.
                 void enableFloatingValues(bool enabled=true);
                 void enableHoverNames(bool enabled=true);
                 // 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 // PERCENTBARCHARTSERIES_H

src/barchart/qstackedbarchartseries.cpp +4 -4

             #include <limits.h>
             #include <QDebug>
             #include "qstackedbarchartseries.h"
             #include "qbarcategory.h"
             #include "qbarset.h"
             #include "barchartmodel_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             QStackedBarChartSeries::QStackedBarChartSeries(QBarCategory *category, QObject *parent)
-                : QChartSeries(parent)
+                : QBarChartSeries(category, parent)
-                ,mModel(new BarChartModel(category, this))
+            //    ,mModel(new BarChartModel(category, this))
             {
             }
+            /*
             void QStackedBarChartSeries::addBarSet(QBarSet *set)
             {
                 connect(this,SIGNAL(floatingValuesEnabled(bool)),set,SLOT(enableFloatingValues(bool)));
                 connect(this,SIGNAL(hoverNamesEnabled(bool)),set,SLOT(enableHoverNames(bool)));
                 mModel->addBarSet(set);
             }
             void QStackedBarChartSeries::removeBarSet(QBarSet *set)
             {
                 disconnect(set,SLOT(enableFloatingValues(bool)));
                 disconnect(set,SLOT(enableHoverNames(bool)));
                 mModel->removeBarSet(set);
             }
             int QStackedBarChartSeries::countSets()
             {
                 return mModel->countSets();
             }
             QBarSet* QStackedBarChartSeries::nextSet(bool getFirst)
             {
                 return mModel->nextSet(getFirst);
             }
             QList<QString> QStackedBarChartSeries::legend()
             {
                 return mModel->legend();
             }
             int QStackedBarChartSeries::countCategories()
             {
                 return mModel->countCategories();
             }
             qreal QStackedBarChartSeries::min()
             {
                 return mModel->min();
             }
             qreal QStackedBarChartSeries::max()
             {
                 return mModel->max();
             }
             qreal QStackedBarChartSeries::valueAt(int set, int category)
             {
                 return mModel->valueAt(set,category);
             }
             qreal QStackedBarChartSeries::maxCategorySum()
             {
                 return mModel->maxCategorySum();
             }
             BarChartModel& QStackedBarChartSeries::model()
             {
                 return *mModel;
             }
+            */
             #include "moc_qstackedbarchartseries.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qstackedbarchartseries.h +5 -3

             #ifndef STACKEDBARCHARTSERIES_H
             #define STACKEDBARCHARTSERIES_H
             #include <QList>
             #include <QAbstractItemModel>
-            #include "qchartseries.h"
+            #include "qbarchartseries.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QBarCategory;
             class QBarSet;
             class BarChartModel;
-            class QTCOMMERCIALCHART_EXPORT QStackedBarChartSeries : public QChartSeries
+            //class QTCOMMERCIALCHART_EXPORT QStackedBarChartSeries : public QChartSeries
+            class QTCOMMERCIALCHART_EXPORT QStackedBarChartSeries : public QBarChartSeries
             {
                 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);    // Releases ownership, doesn't delete set
                 int countSets();
                 QBarSet* nextSet(bool first=false);     // Returns first set, if called with true
                 QList<QString> legend();  // Returns legend of series (ie. names of all sets in series)
                 // Disabled by default. Call these to change behavior.
                 void enableFloatingValues(bool enabled=true);
                 void enableHoverNames(bool enabled=true);
                 // 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

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