HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r460:c1b7acf3f56f

Renamed SplinePresenter to SplineChartItem

Marek Rosa -

r460:c1b7acf3f56f

parent child

Context file:

r460:c1b7acf3f56f

Collapse all files

example/splinechart/splinewidget.cpp +3 -9

                  chart->addSeries(series);
                  chart->setChartTitle("Spline chart example");
-             //    chart->setMinimumSize(800,600);
-             //    chart->axisX()->setRange(0, 1500);
-             //    chart->axisX()->setMax(1500);
-             //    chart->axisY()->setRange(0, 400);
-                     chart->axisX()->setMax(1500);
-             //        chart->
+                 chart->axisX()->setMax(1500);
+                 chart->axisY()->setMax(500);
                  chart->setMinimumSize(800,600);
                  //! [3]
              void SplineWidget::addNewPoint()
              {
                  if (series->count() > 0)
-                     series->add(QPointF(series->x(series->count() - 1) + 20 + qrand()%40, qAbs(series->y(series->count() - 1) - 50 + qrand()%100)));
+                     series->add(QPointF(series->x(series->count() - 1) + 40 + qrand()%40, qAbs(series->y(series->count() - 1) - 50 + qrand()%100)));
                  else
                      series->add(QPointF(50, 50 + qrand()%50));
              }

src/chartpresenter.cpp +2 -2

              #include "linechartanimationitem_p.h"
              #include "piepresenter_p.h"
              #include "scatterpresenter_p.h"
-             #include "splinepresenter_p.h"
+             #include "splinechartitem_p.h"
              QTCOMMERCIALCHART_BEGIN_NAMESPACE
                  case QSeries::SeriesTypeSpline: {
                      QSplineSeries* splineSeries = qobject_cast<QSplineSeries*>(series);
-                     SplinePresenter* splinePresenter = new SplinePresenter(splineSeries, m_chart);
+                     SplineChartItem* splinePresenter = new SplineChartItem(splineSeries, m_chart);
                      QObject::connect(this, SIGNAL(geometryChanged(const QRectF&)), splinePresenter, SLOT(handleGeometryChanged(const QRectF&)));
                      QObject::connect(domain,SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),splinePresenter,SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
                      //initialize

src/charttheme.cpp +5 -5

              #include "areachartitem_p.h"
              #include "scatterpresenter_p.h"
              #include "piepresenter_p.h"
-             #include "splinepresenter_p.h"
+             #include "splinechartitem_p.h"
              //themes
              #include "chartthemevanilla_p.h"
                  axis->setShadesOpacity(0.5);
              }
-             void ChartTheme::decorate(SplinePresenter* presenter, QSplineSeries* series, int count)
+             void ChartTheme::decorate(SplineChartItem* item, QSplineSeries* series, int count)
              {
-                 Q_ASSERT(presenter);
+                 Q_ASSERT(item);
                  Q_ASSERT(series);
                  QPen pen;
                  if(pen != series->pen()){
-                     presenter->setPen(series->pen());
+                     item->setPen(series->pen());
                      return;
                  }
                  pen.setColor(m_seriesColor.at(count%m_seriesColor.size()));
                  pen.setWidthF(series->pen().widthF());
-                 presenter->setPen(pen);
+                 item->setPen(pen);
              //    QColor color = m_seriesColor.at(count % m_seriesColor.size());
                  // TODO: define alpha in the theme? or in the series?

src/charttheme_p.h +2 -2

              class ScatterPresenter;
              class PiePresenter;
              class QPieSeries;
-             class SplinePresenter;
+             class SplineChartItem;
              class QSplineSeries;
              class AreaChartItem;
              class QAreaSeries;
                  void decorate(ScatterPresenter* presenter, QScatterSeries* series, int count);
                  void decorate(PiePresenter* item, QPieSeries* series, int count);
                  void decorate(QChartAxis* axis,AxisItem* item);
-                 void decorate(SplinePresenter* presenter, QSplineSeries* series, int count);
+                 void decorate(SplineChartItem* presenter, QSplineSeries* series, int count);
              protected:
                  QChart::ChartTheme m_id;

src/splinechart/splinechart.pri +2 -2

              SOURCES += \
                  $$PWD/qsplineseries.cpp \
-                 $$PWD/splinepresenter.cpp
+                 $$PWD/splinechartitem.cpp
              PRIVATE_HEADERS += \
-                 $$PWD/splinepresenter_p.h
+                 $$PWD/splinechartitem_p.h
              PUBLIC_HEADERS += \
                  $$PWD/qsplineseries.h

src/splinechart/splinechartitem.cpp ~~src/splinechart/splinepresenter.cpp~~ renamed +6 -6

-             #include "splinepresenter_p.h"
+             #include "splinechartitem_p.h"
              #include <QPainter>
              QTCOMMERCIALCHART_BEGIN_NAMESPACE
-             SplinePresenter::SplinePresenter(QSplineSeries* series, QGraphicsObject *parent) :
+             SplineChartItem::SplineChartItem(QSplineSeries* series, QGraphicsObject *parent) :
                  LineChartItem(series, parent)//,m_boundingRect()
              {
                  //
-             QPointF SplinePresenter::calculateGeometryControlPoint(int index) const
+             QPointF SplineChartItem::calculateGeometryControlPoint(int index) const
              {
                  QSplineSeries* splineSeries = qobject_cast<QSplineSeries*>(m_series);
                  const qreal deltaX = m_size.width()/(m_maxX-m_minX);
                  return QPointF(x,y);
              }
-             void SplinePresenter::applyGeometry(QVector<QPointF>& points)
+             void SplineChartItem::applyGeometry(QVector<QPointF>& points)
              {
                  if(points.size()==0) return;
                  m_rect = splinePath.boundingRect();
              }
-             void SplinePresenter::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+             void SplineChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
              {
                  Q_UNUSED(widget);
                  Q_UNUSED(option);
                  painter->restore();
              }
-             #include "moc_splinepresenter_p.cpp"
+             #include "moc_splinechartitem_p.cpp"
              QTCOMMERCIALCHART_END_NAMESPACE

src/splinechart/splinechartitem_p.h ~~src/splinechart/splinepresenter_p.h~~ renamed +5 -5

-             #ifndef SPLINEPRESENTER_P_H
-             #define SPLINEPRESENTER_P_H
+             #ifndef SPLINECHARTITEM_P_H
+             #define SPLINECHARTITEM_P_H
              #include "chartitem_p.h"
              #include <QObject>
              QTCOMMERCIALCHART_BEGIN_NAMESPACE
-             class SplinePresenter : public LineChartItem
+             class SplineChartItem : public LineChartItem
              {
                  Q_OBJECT
              public:
-                 SplinePresenter(QSplineSeries* series, QGraphicsObject *parent = 0);
+                 SplineChartItem(QSplineSeries* series, QGraphicsObject *parent = 0);
                  void updateGeometry();
              QTCOMMERCIALCHART_END_NAMESPACE
-             #endif // SPLINEPRESENTER_P_H
+             #endif // SPLINECHARTITEM_P_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