diff --git a/example/splinechart/splinewidget.cpp b/example/splinechart/splinewidget.cpp index a32f92a..33c0dd5 100644 --- a/example/splinechart/splinewidget.cpp +++ b/example/splinechart/splinewidget.cpp @@ -48,14 +48,8 @@ SplineWidget::SplineWidget(QWidget *parent) 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] @@ -88,7 +82,7 @@ SplineWidget::SplineWidget(QWidget *parent) 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)); } diff --git a/src/chartpresenter.cpp b/src/chartpresenter.cpp index ce33e1a..3e68bba 100644 --- a/src/chartpresenter.cpp +++ b/src/chartpresenter.cpp @@ -23,7 +23,7 @@ #include "linechartanimationitem_p.h" #include "piepresenter_p.h" #include "scatterpresenter_p.h" -#include "splinepresenter_p.h" +#include "splinechartitem_p.h" QTCOMMERCIALCHART_BEGIN_NAMESPACE @@ -257,7 +257,7 @@ void ChartPresenter::handleSeriesAdded(QSeries* series,Domain* domain) case QSeries::SeriesTypeSpline: { QSplineSeries* splineSeries = qobject_cast(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 diff --git a/src/charttheme.cpp b/src/charttheme.cpp index 4c9ebed..e555b85 100644 --- a/src/charttheme.cpp +++ b/src/charttheme.cpp @@ -24,7 +24,7 @@ #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" @@ -299,19 +299,19 @@ void ChartTheme::decorate(QChartAxis* axis,AxisItem* item) 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? diff --git a/src/charttheme_p.h b/src/charttheme_p.h index 225411d..2c4f4ea 100644 --- a/src/charttheme_p.h +++ b/src/charttheme_p.h @@ -21,7 +21,7 @@ class QScatterSeries; class ScatterPresenter; class PiePresenter; class QPieSeries; -class SplinePresenter; +class SplineChartItem; class QSplineSeries; class AreaChartItem; class QAreaSeries; @@ -43,7 +43,7 @@ public: 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; diff --git a/src/splinechart/splinechart.pri b/src/splinechart/splinechart.pri index c2ff5c8..de44901 100644 --- a/src/splinechart/splinechart.pri +++ b/src/splinechart/splinechart.pri @@ -3,10 +3,10 @@ DEPENDPATH += $$PWD 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 diff --git a/src/splinechart/splinepresenter.cpp b/src/splinechart/splinechartitem.cpp similarity index 90% rename from src/splinechart/splinepresenter.cpp rename to src/splinechart/splinechartitem.cpp index 2a4d53c..0b5a1e1 100644 --- a/src/splinechart/splinepresenter.cpp +++ b/src/splinechart/splinechartitem.cpp @@ -1,9 +1,9 @@ -#include "splinepresenter_p.h" +#include "splinechartitem_p.h" #include QTCOMMERCIALCHART_BEGIN_NAMESPACE -SplinePresenter::SplinePresenter(QSplineSeries* series, QGraphicsObject *parent) : +SplineChartItem::SplineChartItem(QSplineSeries* series, QGraphicsObject *parent) : LineChartItem(series, parent)//,m_boundingRect() { // @@ -11,7 +11,7 @@ SplinePresenter::SplinePresenter(QSplineSeries* series, QGraphicsObject *parent) -QPointF SplinePresenter::calculateGeometryControlPoint(int index) const +QPointF SplineChartItem::calculateGeometryControlPoint(int index) const { QSplineSeries* splineSeries = qobject_cast(m_series); const qreal deltaX = m_size.width()/(m_maxX-m_minX); @@ -21,7 +21,7 @@ QPointF SplinePresenter::calculateGeometryControlPoint(int index) const return QPointF(x,y); } -void SplinePresenter::applyGeometry(QVector& points) +void SplineChartItem::applyGeometry(QVector& points) { if(points.size()==0) return; @@ -41,7 +41,7 @@ void SplinePresenter::applyGeometry(QVector& points) 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); @@ -70,6 +70,6 @@ void SplinePresenter::paint(QPainter *painter, const QStyleOptionGraphicsItem *o painter->restore(); } -#include "moc_splinepresenter_p.cpp" +#include "moc_splinechartitem_p.cpp" QTCOMMERCIALCHART_END_NAMESPACE diff --git a/src/splinechart/splinepresenter_p.h b/src/splinechart/splinechartitem_p.h similarity index 75% rename from src/splinechart/splinepresenter_p.h rename to src/splinechart/splinechartitem_p.h index fa4a295..e84889b 100644 --- a/src/splinechart/splinepresenter_p.h +++ b/src/splinechart/splinechartitem_p.h @@ -1,5 +1,5 @@ -#ifndef SPLINEPRESENTER_P_H -#define SPLINEPRESENTER_P_H +#ifndef SPLINECHARTITEM_P_H +#define SPLINECHARTITEM_P_H #include "chartitem_p.h" #include @@ -8,11 +8,11 @@ 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(); @@ -25,4 +25,4 @@ public: QTCOMMERCIALCHART_END_NAMESPACE -#endif // SPLINEPRESENTER_P_H +#endif // SPLINECHARTITEM_P_H