diff --git a/src/barchart/bargroupbase.h b/src/barchart/bargroupbase.h index a337b49..0a81ffa 100644 --- a/src/barchart/bargroupbase.h +++ b/src/barchart/bargroupbase.h @@ -15,8 +15,7 @@ public: BarGroupBase(BarChartModel& model, QGraphicsItem *parent = 0); void setSeparatorsVisible(bool visible = true); -public: // From ChartItem -// void setSize(const QSizeF &size){}; +public: // From QGraphicsItem void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); @@ -39,9 +38,6 @@ protected slots: protected: // TODO: consider these. - //int mMin; // Min and max values of data. (updated when data is changed, used when drawing) - //int mMax; - int mHeight; // Layout spesific int mWidth; int mBarDefaultWidth; diff --git a/src/qchartseries.h b/src/qchartseries.h index dcf1a15..ef07c1e 100644 --- a/src/qchartseries.h +++ b/src/qchartseries.h @@ -32,16 +32,11 @@ public: // Pure virtual virtual QChartSeriesType type() const = 0; - virtual bool setData(QList /*data*/) { return false; } virtual bool setData(QList /*data*/) { return false; } virtual bool setData(QList /*x*/, QList /*y*/){ return false; } // Prototype for data model. TODO: remove the other setData methods and use something like this for now? - virtual bool setData(QAbstractItemModel* /*model*/) { return false; } - - // Methods for building a table for bar chart. Call repeatedly to add more than one series - virtual int addData(QList data) {return -1;} - virtual void removeData(int id) {} + virtual bool setModel(QAbstractItemModel* /*model*/) { return false; } }; QTCOMMERCIALCHART_END_NAMESPACE