HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r137:c3223f1ab305

Remove obsolete setBackgroundColor form QChart

Michal Klocek -

r137:c3223f1ab305

parent child

Context file:

r137:c3223f1ab305

Collapse all files

src/qchart.cpp +6 -27

             #include "qchart.h"
             #include "qchartseries.h"
             #include "qscatterseries.h"
             #include "qscatterseries_p.h"
             #include "qpieseries.h"
             #include "qpieseries_p.h"
             #include "qxychartseries.h"
             #include "qchartaxis.h"
             #include "barchartseries.h"
             #include "bargroup.h"
             #include "stackedbarchartseries.h"
             #include "stackedbargroup.h"
             #include "percentbarchartseries.h"
             #include "percentbargroup.h"
             #include "charttheme_p.h"
             #include "chartitem_p.h"
             #include "xylinechartitem_p.h"
             #include "plotdomain_p.h"
             #include "axisitem_p.h"
             #include "chartpresenter_p.h"
             #include "chartdataset_p.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(new AxisItem(AxisItem::X_AXIS, this)),
                 m_plotDataIndex(0),
                 m_marginSize(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_axisYItem << new AxisItem(AxisItem::Y_AXIS,this);
                 m_chartItems << m_axisXItem;
                 m_chartItems << m_axisYItem.at(0);
             }
             QChart::~QChart(){}
             void QChart::addSeries(QChartSeries* series)
             {
                 if(m_dataset) {
                     m_dataset->addSeries(series);
                     return;
                 }
                 Q_ASSERT(series);
                 Q_ASSERT(series->type() != QChartSeries::SeriesTypeInvalid);
                 // TODO: we should check the series not already added
                 m_chartSeries << series;
                 m_plotDataIndex = 0 ;
                 m_plotDomainList.resize(1);
                 PlotDomain& domain = m_plotDomainList[m_plotDataIndex];
                 switch(series->type())
                 {
                 case QChartSeries::SeriesTypeLine: {
                     QXYChartSeries* xyseries = static_cast<QXYChartSeries*>(series);
                     for (int i = 0 ; i < xyseries->count() ; i++) {
                         qreal x = xyseries->x(i);
                         qreal y = xyseries->y(i);
                         domain.m_minX = qMin(domain.m_minX,x);
                         domain.m_minY = qMin(domain.m_minY,y);
                         domain.m_maxX = qMax(domain.m_maxX,x);
                         domain.m_maxY = qMax(domain.m_maxY,y);
                     }
                     //XYLineChartItem* item = new XYLineChartItem(xyseries,0,this);
                     //m_chartItems << item;
                     // TODO:
                     //m_chartTheme->addObserver(xyseries);
                     break;
                 }
                 case QChartSeries::SeriesTypeBar: {
                     qDebug() << "barSeries added";
                     BarChartSeries* barSeries = static_cast<BarChartSeries*>(series);
                     BarGroup* barGroup = new BarGroup(*barSeries,this);
                     // Add some fugly colors for 5 fist series...
                     barGroup->addColor(QColor(255,0,0,128));
                     barGroup->addColor(QColor(255,255,0,128));
                     barGroup->addColor(QColor(0,255,0,128));
                     barGroup->addColor(QColor(0,0,255,128));
                     barGroup->addColor(QColor(255,128,0,128));
                     m_chartItems << barGroup;
                     childItems().append(barGroup);
                     qreal x = barSeries->countColumns();
                     qreal y = barSeries->max();
                     domain.m_minX = qMin(domain.m_minX,x);
                     domain.m_minY = qMin(domain.m_minY,y);
                     domain.m_maxX = qMax(domain.m_maxX,x);
                     domain.m_maxY = qMax(domain.m_maxY,y);
                     m_axisXItem->setVisible(false);
                     break;
                     }
                 case QChartSeries::SeriesTypeStackedBar: {
                     qDebug() << "barSeries added";
                     StackedBarChartSeries* stackedBarSeries = static_cast<StackedBarChartSeries*>(series);
                     StackedBarGroup* stackedBarGroup = new StackedBarGroup(*stackedBarSeries,this);
                     // Add some fugly colors for 5 fist series...
                     stackedBarGroup->addColor(QColor(255,0,0,128));
                     stackedBarGroup->addColor(QColor(255,255,0,128));
                     stackedBarGroup->addColor(QColor(0,255,0,128));
                     stackedBarGroup->addColor(QColor(0,0,255,128));
                     stackedBarGroup->addColor(QColor(255,128,0,128));
                     m_chartItems << stackedBarGroup;
                     childItems().append(stackedBarGroup);
                     qreal x = stackedBarSeries->countColumns();
                     qreal y = stackedBarSeries->maxColumnSum();
                     domain.m_minX = qMin(domain.m_minX,x);
                     domain.m_minY = qMin(domain.m_minY,y);
                     domain.m_maxX = qMax(domain.m_maxX,x);
                     domain.m_maxY = qMax(domain.m_maxY,y);
                     m_axisXItem->setVisible(false);
                     break;
                     }
                 case QChartSeries::SeriesTypePercentBar: {
                     qDebug() << "barSeries added";
                     PercentBarChartSeries* percentBarSeries = static_cast<PercentBarChartSeries*>(series);
                     PercentBarGroup* percentBarGroup = new PercentBarGroup(*percentBarSeries,this);
                     // Add some fugly colors for 5 fist series...
                     percentBarGroup->addColor(QColor(255,0,0,128));
                     percentBarGroup->addColor(QColor(255,255,0,128));
                     percentBarGroup->addColor(QColor(0,255,0,128));
                     percentBarGroup->addColor(QColor(0,0,255,128));
                     percentBarGroup->addColor(QColor(255,128,0,128));
                     m_chartItems << percentBarGroup;
                     childItems().append(percentBarGroup);
                     qreal x = percentBarSeries->countColumns();
                     domain.m_minX = qMin(domain.m_minX,x);
                     domain.m_minY = 0;
                     domain.m_maxX = qMax(domain.m_maxX,x);
                     domain.m_maxY = 100;
                     m_axisXItem->setVisible(false);
                     break;
                     }
                 case QChartSeries::SeriesTypeScatter: {
                     QScatterSeries *scatterSeries = qobject_cast<QScatterSeries *>(series);
                     scatterSeries->d->m_theme = m_chartTheme->themeForSeries();
                     scatterSeries->d->setParentItem(this);
                     scatterSeries->d->m_boundingRect = m_rect.adjusted(margin(),margin(), -margin(), -margin());
                     m_chartItems << scatterSeries->d;
                     m_chartTheme->addObserver(scatterSeries->d);
                     foreach (qreal x, scatterSeries->d->m_x) {
                         domain.m_minX = qMin(domain.m_minX, x);
                         domain.m_maxX = qMax(domain.m_maxX, x);
                     }
                     foreach (qreal y, scatterSeries->d->m_y) {
                         domain.m_minY = qMin(domain.m_minY, y);
                         domain.m_maxY = qMax(domain.m_maxY, y);
                     }
                     break;
                     }
                 case QChartSeries::SeriesTypePie: {
                     QPieSeries *pieSeries = qobject_cast<QPieSeries *>(series);
                     pieSeries->d->setParentItem(this);
                     m_chartItems << pieSeries->d;
                     pieSeries->d->m_chartTheme = m_chartTheme;
                     m_chartTheme->addObserver(pieSeries->d);
                     break;
                     }
                 default:
                     break;
                 }
                 // Update all the items to match the new visible area of the chart
                 foreach(ChartItem* i, m_chartItems)
                     i->setPlotDomain(m_plotDomainList.at(m_plotDataIndex));
             }
             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::setBackground(const QColor& startColor, const QColor& endColor, GradientOrientation orientation)
-                if(!m_backgroundItem){
-                    m_backgroundItem = new QGraphicsRectItem(this);
-                    m_backgroundItem->setZValue(-1);
-                m_bacgroundOrinetation = orientation;
-                m_backgroundGradient.setColorAt(0.0, startColor);
-                m_backgroundGradient.setColorAt(1.0, endColor);
-                m_backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
-                if(orientation == VerticalGradientOrientation){
-                    m_backgroundGradient.setFinalStop(0,1);
-                }else{
-                    m_backgroundGradient.setFinalStop(1,0);
-                m_backgroundItem->setBrush(m_backgroundGradient);
-                m_backgroundItem->setPen(Qt::NoPen);
-                m_backgroundItem->update();
             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
             {
                 return m_marginSize;
             }
             void QChart::setMargin(int margin)
             {
                 m_marginSize = margin;
             }
             void QChart::setTheme(QChart::ChartThemeId theme)
             {
                 m_chartTheme->setTheme(theme);
-                setBackground(m_chartTheme->d->m_gradientStartColor,
-                              m_chartTheme->d->m_gradientEndColor,
+                QLinearGradient backgroundGradient;
-                              m_bacgroundOrinetation);
+                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)
             {
                 if(!rectangle.isValid()) return;
                 qreal margin = this->margin();
                 QRectF rect = rectangle.normalized();
                 rect.translate(-margin, -margin);
                 PlotDomain& oldDomain = m_plotDomainList[m_plotDataIndex];
                 PlotDomain domain = oldDomain.subDomain(rect,m_rect.width() - 2 * margin,m_rect.height() - 2 * margin);
                 m_plotDomainList.resize(m_plotDataIndex + 1);
                 m_plotDomainList<<domain;
                 m_plotDataIndex++;
                 foreach (ChartItem* item, m_chartItems)
                     item->setPlotDomain(m_plotDomainList[m_plotDataIndex]);
                 update();
             }
             void QChart::zoomIn()
             {
                 if (m_plotDataIndex < m_plotDomainList.count() - 1) {
                     m_plotDataIndex++;
                     foreach (ChartItem* item, m_chartItems)
                         item->setPlotDomain(m_plotDomainList[m_plotDataIndex]);
                     update();
                 } else {
                     QRectF rect = m_rect.adjusted(margin(),margin(), -margin(), -margin());
                     rect.setWidth(rect.width()/2);
                     rect.setHeight(rect.height()/2);
                     rect.moveCenter(m_rect.center());
                     zoomInToRect(rect);
                 }
             }
             void QChart::zoomOut()
             {
                 if (m_plotDataIndex > 0) {
                     m_plotDataIndex--;
                     foreach (ChartItem* item, m_chartItems)
                         item->setPlotDomain(m_plotDomainList[m_plotDataIndex]);
                     update();
                 }
             }
             void QChart::zoomReset()
             {
                 if (m_plotDataIndex > 0) {
                     m_plotDataIndex = 0;
                     foreach (ChartItem* item, m_chartItems)
                         item->setPlotDomain(m_plotDomainList[m_plotDataIndex]);
                     update();
                 }
             }
             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);
                 }
                 // resize and reposition childs
                 foreach (ChartItem *item, m_chartItems) {
                     item->setPos(rect.topLeft());
                     item->setSize(rect.size());
                 }
                 QGraphicsWidget::resizeEvent(event);
                 update();
             }
             #include "moc_qchart.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchart.h 0 -5

             #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 GradientOrientation {
                     HorizonatlGradientOrientation,
                     VerticalGradientOrientation
                 };
                 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());
-                //Obsolete interface
-                void setBackground(const QColor& startColor, const QColor& endColor = Qt::white, GradientOrientation orientation = VerticalGradientOrientation);
                 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;
-                QLinearGradient m_backgroundGradient;
                 GradientOrientation m_bacgroundOrinetation;
                 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;
                 int m_marginSize;
                 ChartTheme *m_chartTheme;
                 ChartDataSet *m_dataset;
                 ChartPresenter *m_presenter;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/qchartview.cpp 0 -5

             #include "qchartview.h"
             #include "qchart.h"
             #include <QGraphicsView>
             #include <QGraphicsScene>
             #include <QRubberBand>
             #include <QResizeEvent>
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             QChartView::QChartView(QWidget *parent) :
                 QGraphicsView(parent),
                 m_scene(new QGraphicsScene()),
                 m_chart(new QChart()),
                 m_rubberBand(0),
                 m_verticalRubberBand(false),
                 m_horizonalRubberBand(false)
             {
             	setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
                 setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
                 setScene(m_scene);
                 m_chart->setMargin(50);
                 m_scene->addItem(m_chart);
                 setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
             }
             QChartView::~QChartView()
             {
             }
             void QChartView::resizeEvent(QResizeEvent *event)
             {
                 m_scene->setSceneRect(0,0,size().width(),size().height());
                 m_chart->resize(size());
                 QWidget::resizeEvent(event);
             }
             void QChartView::addSeries(QChartSeries* series)
             {
                 m_chart->addSeries(series);
             }
             QChartSeries* QChartView::createSeries(QChartSeries::QChartSeriesType type)
             {
                 return m_chart->createSeries(type);
             }
             void QChartView::zoomInToRect(const QRect& rectangle)
             {
                 m_chart->zoomInToRect(rectangle);
             }
             void QChartView::zoomIn()
             {
                 m_chart->zoomIn();
             }
             void QChartView::zoomOut()
             {
                 m_chart->zoomOut();
             }
             int QChartView::margin() const
             {
                 return m_chart->margin();
             }
             void QChartView::setTitle(const QString& title)
             {
                 m_chart->setTitle(title);
             }
-            void QChartView::setBackground(const QColor& startColor, const QColor& endColor, QChart::GradientOrientation orientation)
-                m_chart->setBackground(startColor,endColor,orientation);
             void QChartView::setChartBackgroundBrush(const QBrush& brush)
             {
             	 m_chart->setChartBackgroundBrush(brush);
             }
             void QChartView::setChartBackgroundPen(const QPen& pen)
             {
             	 m_chart->setChartBackgroundPen(pen);
             }
             void QChartView::setRubberBandPolicy(const RubberBandPolicy policy)
             {
                 switch(policy){
                     case VerticalRubberBand:
                         m_verticalRubberBand = true;
                         m_horizonalRubberBand = false;
                         break;
                     case HorizonalRubberBand:
                         m_verticalRubberBand = false;
                         m_horizonalRubberBand = true;
                         break;
                     case RectangleRubberBand:
                         m_verticalRubberBand = true;
                         m_horizonalRubberBand = true;
                         break;
                     case NoRubberBand:
                     default:
                         delete m_rubberBand;
                         m_rubberBand=0;
                         m_horizonalRubberBand = false;
                         m_verticalRubberBand = false;
                         return;
                 }
                 m_rubberBand = new QRubberBand(QRubberBand::Rectangle, this);
                 m_rubberBand->setEnabled(true);
             }
             QChartView::RubberBandPolicy QChartView::rubberBandPolicy() const
             {
                 if(m_horizonalRubberBand && m_verticalRubberBand) return RectangleRubberBand;
                 if(m_horizonalRubberBand) return HorizonalRubberBand;
                 if(m_verticalRubberBand) return VerticalRubberBand;
                 return NoRubberBand;
             }
             void QChartView::mousePressEvent(QMouseEvent *event)
             {
                 if(m_rubberBand && m_rubberBand->isEnabled() && event->button() == Qt::LeftButton) {
                     int margin = m_chart->margin();
                     QRect rect(margin, margin, width() - 2 * margin, height() - 2 * margin);
                     if (rect.contains(event->pos())) {
                         m_rubberBandOrigin = event->pos();
                         m_rubberBand->setGeometry(QRect(m_rubberBandOrigin, QSize()));
                         m_rubberBand->show();
                         event->accept();
                     }
                 }
             }
             void QChartView::mouseMoveEvent(QMouseEvent *event)
             {
                 if(m_rubberBand && m_rubberBand->isVisible()){
                     int margin = m_chart->margin();
                     QRect rect(margin, margin, width() - 2 * margin, height() - 2 * margin);
                     int width = event->pos().x() - m_rubberBandOrigin.x();
                     int height = event->pos().y() - m_rubberBandOrigin.y();
                     if(!m_verticalRubberBand) {
                         m_rubberBandOrigin.setY(rect.top());
                         height = rect.height();
                     }
                     if(!m_horizonalRubberBand) {
                         m_rubberBandOrigin.setX(rect.left());
                         width= rect.width();
                     }
                     m_rubberBand->setGeometry(QRect(m_rubberBandOrigin.x(),m_rubberBandOrigin.y(), width,height).normalized());
                 } else {
                     QGraphicsView::mouseMoveEvent(event);
                 }
             }
             void QChartView::mouseReleaseEvent(QMouseEvent *event)
             {
                 if(m_rubberBand){
                 if (event->button() == Qt::LeftButton && m_rubberBand->isVisible()) {
                     m_rubberBand->hide();
                     QRect rect = m_rubberBand->geometry();
                     m_chart->zoomInToRect(rect);
                     event->accept();
                 }
                 if(event->button()==Qt::RightButton)
                     m_chart->zoomReset();
                 }else{
                     QGraphicsView::mouseReleaseEvent(event);
                 }
             }
             void QChartView::keyPressEvent(QKeyEvent *event)
             {
                 switch (event->key()) {
                 case Qt::Key_Plus:
                     zoomIn();
                     break;
                 case Qt::Key_Minus:
                     zoomOut();
                     break;
                 default:
                     QGraphicsView::keyPressEvent(event);
                     break;
                 }
             }
             void QChartView::setTheme(QChart::ChartThemeId theme)
             {
                 m_chart->setTheme(theme);
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/qchartview.h 0 -4

             #ifndef QCHARTWIDGET_H
             #define QCHARTWIDGET_H
             #include "qchartglobal.h"
             #include "qchartseries.h"
             #include "qchart.h"
             #include <QGraphicsView>
             class QGraphicsScene;
             class QRubberBand;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChart;
             class QTCOMMERCIALCHART_EXPORT QChartView : public QGraphicsView
             {
             public:
                 enum  RubberBandPolicy { NoRubberBand, VerticalRubberBand, HorizonalRubberBand, RectangleRubberBand };
                 explicit QChartView(QWidget *parent = 0);
                 ~QChartView();
                 //implement from QWidget
                 void resizeEvent(QResizeEvent *event);
                 void addSeries(QChartSeries* series);
                 // Convenience function
                 QChartSeries* createSeries(QChartSeries::QChartSeriesType type);
                 int margin() const;
                 void setTitle(const QString& title);
-                //Obsolete interface
-                void setBackground(const QColor& startColor, const QColor& endColor = Qt::white, QChart::GradientOrientation orientation = QChart::VerticalGradientOrientation);
                 void setChartBackgroundBrush(const QBrush& brush);
                 void setChartBackgroundPen(const QPen& pen);
                 void zoomInToRect(const QRect& rectangle);
                 void zoomIn();
                 void zoomOut();
                 void setRubberBandPolicy(const RubberBandPolicy );
                 RubberBandPolicy rubberBandPolicy() const;
                 void setTheme(QChart::ChartThemeId theme);
             protected:
                 void mousePressEvent(QMouseEvent *event);
                 void mouseMoveEvent(QMouseEvent *event);
                 void mouseReleaseEvent(QMouseEvent *event);
                 void keyPressEvent(QKeyEvent *event);
             private:
                 QGraphicsScene *m_scene;
                 QChart* m_chart;
                 QPoint m_rubberBandOrigin;
                 QRubberBand* m_rubberBand;
                 bool m_verticalRubberBand;
                 bool m_horizonalRubberBand;
                 Q_DISABLE_COPY(QChartView)
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QCHARTWIDGET_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