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

src/barchart/barpresenterbase.h +1 0

              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

src/barchart/qbarchartseries.h +1 -2

              class BarChartModel;
              // Container for series
-             // TODO: derive Stacked and percent bar charts from this?
              class QTCOMMERCIALCHART_EXPORT QBarChartSeries : public QChartSeries
              {
                  Q_OBJECT
              //public Q_SLOTS:
-             private:
+             protected:
                  BarChartModel* mModel;
              };

src/barchart/qpercentbarchartseries.cpp +4 -4

              QTCOMMERCIALCHART_BEGIN_NAMESPACE
              QPercentBarChartSeries::QPercentBarChartSeries(QBarCategory *category, QObject *parent)
-                 : QChartSeries(parent)
-                 ,mModel(new BarChartModel(category, this))
+                 : QBarChartSeries(category, parent)
+             //    ,mModel(new BarChartModel(category, this))
              {
              }
+             /*
              void QPercentBarChartSeries::addBarSet(QBarSet *set)
-             {
                  connect(this,SIGNAL(floatingValuesEnabled(bool)),set,SLOT(enableFloatingValues(bool)));
-             {
                  return *mModel;
-             }
+             */
              #include "moc_qpercentbarchartseries.cpp"

src/barchart/qpercentbarchartseries.h +5 -4

              #include <QList>
              #include <QAbstractItemModel>
-             #include "qchartseries.h"
+             #include "qbarchartseries.h"
              QTCOMMERCIALCHART_BEGIN_NAMESPACE
              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:
                  // 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();
              private:
                  BarChartModel* mModel;
+             */
              };
              QTCOMMERCIALCHART_END_NAMESPACE

src/barchart/qstackedbarchartseries.cpp +4 -4

              QTCOMMERCIALCHART_BEGIN_NAMESPACE
              QStackedBarChartSeries::QStackedBarChartSeries(QBarCategory *category, QObject *parent)
-                 : QChartSeries(parent)
-                 ,mModel(new BarChartModel(category, this))
+                 : QBarChartSeries(category, parent)
+             //    ,mModel(new BarChartModel(category, this))
              {
              }
+             /*
              void QStackedBarChartSeries::addBarSet(QBarSet *set)
-             {
                  connect(this,SIGNAL(floatingValuesEnabled(bool)),set,SLOT(enableFloatingValues(bool)));
-             {
                  return *mModel;
-             }
+             */
              #include "moc_qstackedbarchartseries.cpp"

src/barchart/qstackedbarchartseries.h +5 -3

              #include <QList>
              #include <QAbstractItemModel>
-             #include "qchartseries.h"
+             #include "qbarchartseries.h"
              QTCOMMERCIALCHART_BEGIN_NAMESPACE
              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:
                  // 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
              private:
                  BarChartModel* mModel;
+             */
              };
              QTCOMMERCIALCHART_END_NAMESPACE

General Comments 0

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

No TODOs yet

	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