HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r141:c4fe96eff980

Removes obsolete functions...

Michal Klocek -

r141:c4fe96eff980

parent child

Context file:

r141:c4fe96eff980

Collapse all files

src/axisitem_p.h 0 -5

             #ifndef AXISITEM_H_
             #define AXISITEM_H_
             #include "domain_p.h"
             #include "chartitem_p.h"
             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChartAxis;
             class AxisItem : public QObject, public ChartItem
             {
                 Q_OBJECT
             public:
                 enum AxisType{X_AXIS,Y_AXIS};
                 AxisItem(QChartAxis* axis,AxisType type = X_AXIS,QGraphicsItem* parent = 0);
                 ~AxisItem();
                 //from QGraphicsItem
                 QRectF boundingRect() const;
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget){};
             protected slots:
                 void handleAxisChanged();
                 void handleDomainChanged(const Domain& domain);
                 void handleGeometryChanged(const QRectF& size);
             protected:
                 void updateDomain();
             private:
                 void clear();
-            public: // from ChartItem
-                void setSize(const QSizeF &size){};
-                void setPlotDomain(const PlotDomain& data){};
             public:
                 void setLength(int length);
                 void setWidth(int width);
                 AxisType axisType() const {return m_type;};
             protected:
             private:
                 void createItems();
             private:
                 QChartAxis* m_axis;
                 AxisType m_type;
                 int m_ticks;
                 Domain m_domain;
                 QRectF m_rect;
                 QPainterPath m_path;
                 QList<QGraphicsLineItem*> m_grid;
                 QList<QGraphicsRectItem*> m_shades;
                 QList<QGraphicsSimpleTextItem*> m_labels;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif /* AXISITEM_H_ */

src/chartitem_p.h 0 -8

             #ifndef CHARTITEM_H_
             #define CHARTITEM_H_
             #include "plotdomain_p.h"
             #include "domain_p.h"
             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartAnimationManager;
             class ChartItem : public QGraphicsItem
             {
                 enum ChartItemTypes{ AXIS_ITEM = UserType+1, XYLINE_ITEM};
             public:
                 ChartItem(QGraphicsItem* parent = 0):QGraphicsItem(parent){};
                 virtual ~ChartItem(){};
-                virtual void setSize(const QSizeF& size) = 0;
-                virtual void setPlotDomain(const PlotDomain& data) = 0;
-                //future interface
-                virtual void setDomain(const Domain& data){};
-                virtual void updateItem(){};
-                virtual ChartAnimationManager* animationManager(){ return 0;};
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif /* CHARTITEM_H_ */

src/qchart.cpp 0 -5

             #include "qchart.h"
             #include "qchartseries.h"
             #include "qscatterseries.h"
             #include "qscatterseries_p.h"
             #include "qpieseries.h"
             #include "qpieseries_p.h"
             #include "qchartaxis.h"
             #include "charttheme_p.h"
             #include "chartitem_p.h"
             #include "plotdomain_p.h"
             #include "axisitem_p.h"
             #include "chartpresenter_p.h"
             #include "chartdataset_p.h"
             //series
             #include "barchartseries.h"
             #include "stackedbarchartseries.h"
             #include "percentbarchartseries.h"
             #include "qxychartseries.h"
             #include <QGraphicsScene>
             #include <QGraphicsSceneResizeEvent>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             QChart::QChart(QGraphicsItem *parent, Qt::WindowFlags wFlags) : QGraphicsWidget(parent,wFlags),
                 m_backgroundItem(0),
                 m_titleItem(0),
                 m_axisXItem(0),
-                m_plotDataIndex(0),
                 m_chartTheme(new ChartTheme(this)),
                 //m_dataset(0),
                 m_dataset(new ChartDataSet(this)),
                 //m_presenter(0)
                 m_presenter(new ChartPresenter(this,m_dataset))
             {
                 // TODO: the default theme?
                 setTheme(QChart::ChartThemeDefault);
-                PlotDomain domain;
-                m_plotDomainList << domain;
                 //m_chartItems << m_axisXItem;
                 //m_chartItems << m_axisYItem.at(0);
             }
             QChart::~QChart(){}
             void QChart::addSeries(QChartSeries* series)
             {
                m_dataset->addSeries(series);
             }
             QChartSeries* QChart::createSeries(QChartSeries::QChartSeriesType type)
             {
                 // TODO: support also other types; not only scatter and pie
                 QChartSeries *series(0);
                 switch (type) {
                 case QChartSeries::SeriesTypeLine: {
                     series = QXYChartSeries::create();
                     break;
                 }
                 case QChartSeries::SeriesTypeBar: {
                     series = new BarChartSeries(this);
                     break;
                 }
                 case QChartSeries::SeriesTypeStackedBar: {
                     series = new StackedBarChartSeries(this);
                     break;
                 }
                 case QChartSeries::SeriesTypePercentBar: {
                     series = new PercentBarChartSeries(this);
                     break;
                 }
                 case QChartSeries::SeriesTypeScatter: {
                     series = new QScatterSeries(this);
                     break;
                 }
                 case QChartSeries::SeriesTypePie: {
                     series = new QPieSeries(this);
                     break;
                 }
                 default:
                     Q_ASSERT(false);
                     break;
                 }
                 addSeries(series);
                 return series;
             }
             void QChart::setChartBackgroundBrush(const QBrush& brush)
             {
                 if(!m_backgroundItem){
                     m_backgroundItem = new QGraphicsRectItem(this);
                     m_backgroundItem->setZValue(-1);
                 }
                 m_backgroundItem->setBrush(brush);
                 m_backgroundItem->update();
             }
             void QChart::setChartBackgroundPen(const QPen& pen)
             {
                 if(!m_backgroundItem){
                     m_backgroundItem = new QGraphicsRectItem(this);
                     m_backgroundItem->setZValue(-1);
                 }
                 m_backgroundItem->setPen(pen);
                 m_backgroundItem->update();
             }
             void QChart::setTitle(const QString& title,const QFont& font)
             {
                 if(!m_titleItem) m_titleItem = new QGraphicsTextItem(this);
                 m_titleItem->setPlainText(title);
                 m_titleItem->setFont(font);
             }
             int QChart::margin() const
             {
                 m_presenter->margin();
             }
             void QChart::setMargin(int margin)
             {
                m_presenter->setMargin(margin);
             }
             void QChart::setTheme(QChart::ChartThemeId theme)
             {
                 m_chartTheme->setTheme(theme);
                 QLinearGradient backgroundGradient;
                 backgroundGradient.setColorAt(0.0, m_chartTheme->d->m_gradientStartColor);
                 backgroundGradient.setColorAt(1.0, m_chartTheme->d->m_gradientEndColor);
                 backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
                 setChartBackgroundBrush(backgroundGradient);
                 // TODO: Move the controlling of the series presentations into private implementation of the
                 // series instead of QChart controlling themes for each
                 // In other words, the following should be used when creating xy series:
                 // m_chartTheme->addObserver(xyseries)
                 foreach (QChartSeries *series, m_chartSeries) {
                     if (series->type() == QChartSeries::SeriesTypeLine) {
                         QXYChartSeries *xyseries = static_cast<QXYChartSeries *>(series);
                         SeriesTheme seriesTheme = m_chartTheme->themeForSeries();
                         xyseries->setPen(seriesTheme.linePen);
                     }
                 }
                 update();
             }
             QChart::ChartThemeId QChart::theme()
             {
                 return (QChart::ChartThemeId) m_chartTheme->d->m_currentTheme;
             }
             void QChart::zoomInToRect(const QRectF& rectangle)
             {
                 m_presenter->zoomInToRect(rectangle);
             }
             void QChart::zoomIn()
             {
                 m_presenter->zoomIn();
             }
             void QChart::zoomOut()
             {
                 m_presenter->zoomOut();
             }
             void QChart::zoomReset()
             {
                 m_presenter->zoomReset();
             }
             void QChart::setAxisX(const QChartAxis& axis)
             {
                 setAxis(m_axisXItem,axis);
             }
             void QChart::setAxisY(const QChartAxis& axis)
             {
                 setAxis(m_axisYItem.at(0),axis);
             }
             void QChart::setAxisY(const QList<QChartAxis>& axis)
             {
                 //TODO not implemented
             }
             void QChart::setAxis(AxisItem *item, const QChartAxis& axis)
             {
                 item->setVisible(axis.isAxisVisible());
             }
             void QChart::resizeEvent(QGraphicsSceneResizeEvent *event)
             {
                 m_rect = QRectF(QPoint(0,0),event->newSize());
                 QRectF rect = m_rect.adjusted(margin(),margin(), -margin(), -margin());
                 // recalculate title position
                 if (m_titleItem) {
                     QPointF center = m_rect.center() -m_titleItem->boundingRect().center();
                     m_titleItem->setPos(center.x(),m_rect.top()/2 + margin()/2);
                 }
                 //recalculate background gradient
                 if (m_backgroundItem) {
                     m_backgroundItem->setRect(rect);
                 }
                 QGraphicsWidget::resizeEvent(event);
                 update();
             }
             #include "moc_qchart.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchart.h 0 -2

             #ifndef CHART_H
             #define CHART_H
             #include <qchartglobal.h>
             #include <qchartseries.h>
             #include <QGraphicsWidget>
             #include <QLinearGradient>
             #include <QFont>
             class QGraphicsSceneResizeEvent;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class AxisItem;
             class QChartSeries;
             class PlotDomain;
             class BarGroup;
             class QChartAxis;
             class ChartTheme;
             class ChartItem;
             class ChartDataSet;
             class ChartPresenter;
             // TODO: We don't need to have QChart tied to QGraphicsItem:
             //class QTCOMMERCIALCHART_EXPORT QChart
             //class QTCOMMERCIALCHART_EXPORT QChartGraphicsItem : public QGraphicsItem {
             // public: QChartGraphicsItem(QChart &chart);
             /*!
              * TODO: define the responsibilities
              */
             class QTCOMMERCIALCHART_EXPORT QChart : public QGraphicsWidget
             {
                 Q_OBJECT
             public:
                 enum ChartThemeId {
                     ChartThemeInvalid = -1,
                     /*! The default theme follows the GUI style of the Operating System */
                     ChartThemeDefault,
                     ChartThemeVanilla,
                     ChartThemeIcy,
                     ChartThemeGrayscale,
                     ChartThemeScientific,
                     ChartThemeUnnamed1
                 };
             public:
                 QChart(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0);
                 ~QChart();
                 void addSeries(QChartSeries* series);
                 //TODO: QChartSeries* createSeries(QSeriesData *data, QChartSeries::QChartSeriesType type);
                 // TODO: who owns the series now? maybe owned by chart and returned a reference instead...
                 QChartSeries* createSeries(QChartSeries::QChartSeriesType type);
                 void setMargin(int margin);
                 int margin() const;
                 void setTheme(QChart::ChartThemeId theme);
                 QChart::ChartThemeId theme();
                 void setTitle(const QString& title,const QFont& font = QFont());
                 void setChartBackgroundBrush(const QBrush& brush);
                 void setChartBackgroundPen(const QPen& pen);
                 void zoomInToRect(const QRectF& rectangle);
                 void zoomIn();
                 void zoomOut();
                 void zoomReset();
                 void setAxisX(const QChartAxis& axis);
                 void setAxisY(const QChartAxis& axis);
                 void setAxisY(const QList<QChartAxis>& axis);
             protected:
                 void resizeEvent(QGraphicsSceneResizeEvent *event);
             private:
                 void setAxis(AxisItem *item, const QChartAxis& axis);
             private:
                 Q_DISABLE_COPY(QChart)
                 QGraphicsRectItem* m_backgroundItem;
                 QGraphicsTextItem* m_titleItem;
                 AxisItem* m_axisXItem;
                 QList<AxisItem*> m_axisYItem;
                 QRectF m_rect;
                 QList<QChartSeries *> m_chartSeries;
                 QList<ChartItem *> m_chartItems;
-                QVector<PlotDomain> m_plotDomainList;
-                int m_plotDataIndex;
                 ChartTheme *m_chartTheme;
                 ChartDataSet *m_dataset;
                 ChartPresenter *m_presenter;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

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