HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1736:cb991e4e355f

0

src/areachart/qareaseries.cpp +1 -1

                 domain.setRange(minX,maxX,minY,maxY);
             }
-            Chart* QAreaSeriesPrivate::createGraphics(ChartPresenter* presenter)
+            ChartElement* QAreaSeriesPrivate::createGraphics(ChartPresenter* presenter)
             {
                 Q_Q(QAreaSeries);

0

src/areachart/qareaseries_p.h +1 -1

                 QAreaSeriesPrivate(QLineSeries *upperSeries, QLineSeries *lowerSeries,QAreaSeries* q);
                 void scaleDomain(Domain& domain);
-                Chart* createGraphics(ChartPresenter* presenter);
+                ChartElement* createGraphics(ChartPresenter* presenter);
                 QList<LegendMarker*> createLegendMarker(QLegend* legend);
                 void initializeAxis(QAbstractAxis* axis);
                 QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const;

0

src/axis/chartaxis.cpp +1 -1

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            ChartAxis::ChartAxis(QAbstractAxis *axis,ChartPresenter *presenter) : Chart(presenter),
+            ChartAxis::ChartAxis(QAbstractAxis *axis,ChartPresenter *presenter) : ChartElement(presenter),
                 m_chartAxis(axis),
                 m_labelsAngle(0),
                 m_grid(new QGraphicsItemGroup(presenter->rootItem())),

0

src/axis/chartaxis_p.h +2 -2

             #define CHARTAXIS_H
             #include "qchartglobal.h"
-            #include "chart_p.h"
+            #include "chartelement_p.h"
             #include "axisanimation_p.h"
             #include <QGraphicsItem>
             #include <QFont>
             class QAbstractAxis;
             class ChartPresenter;
-            class ChartAxis : public Chart
+            class ChartAxis : public ChartElement
             {
                 Q_OBJECT
             public:

0

src/barchart/horizontal/bar/qhorizontalbarseries.cpp +1 -1

                 domain.setRange(minX,maxX,minY,maxY);
             }
-            Chart* QHorizontalBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
+            ChartElement* QHorizontalBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
             {
                 Q_Q(QHorizontalBarSeries);

0

src/barchart/horizontal/bar/qhorizontalbarseries_p.h +1 -1

             {
             public:
                 QHorizontalBarSeriesPrivate(QHorizontalBarSeries* q);
-                Chart* createGraphics(ChartPresenter* presenter);
+                ChartElement* createGraphics(ChartPresenter* presenter);
                 void scaleDomain(Domain& domain);
             private:
                 Q_DECLARE_PUBLIC(QHorizontalBarSeries)

0

src/barchart/horizontal/percent/qhorizontalpercentbarseries.cpp +1 -1

                 domain.setRange(minX,maxX,minY,maxY);
             }
-            Chart* QHorizontalPercentBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
+            ChartElement* QHorizontalPercentBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
             {
                 Q_Q(QHorizontalPercentBarSeries);

0

src/barchart/horizontal/percent/qhorizontalpercentbarseries_p.h +1 -1

             {
             public:
                 QHorizontalPercentBarSeriesPrivate(QHorizontalPercentBarSeries* q);
-                Chart* createGraphics(ChartPresenter* presenter);
+                ChartElement* createGraphics(ChartPresenter* presenter);
                 void scaleDomain(Domain& domain);
             private:
                 Q_DECLARE_PUBLIC(QHorizontalPercentBarSeries)

0

src/barchart/horizontal/stacked/qhorizontalstackedbarseries.cpp +1 -1

                 domain.setRange(minX,maxX,minY,maxY);
             }
-            Chart* QHorizontalStackedBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
+            ChartElement* QHorizontalStackedBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
             {
                 Q_Q(QHorizontalStackedBarSeries);

0

src/barchart/horizontal/stacked/qhorizontalstackedbarseries_p.h +1 -1

             {
             public:
                 QHorizontalStackedBarSeriesPrivate(QHorizontalStackedBarSeries* q);
-                Chart* createGraphics(ChartPresenter* presenter);
+                ChartElement* createGraphics(ChartPresenter* presenter);
                 void scaleDomain(Domain& domain);
             private:
                 Q_DECLARE_PUBLIC(QHorizontalStackedBarSeries)

0

src/barchart/qabstractbarseries.cpp +1 -2

             #include "legendmarker_p.h"
             #include "chartdataset_p.h"
             #include "charttheme_p.h"
-            #include "chartanimator_p.h"
             #include "qvaluesaxis.h"
             #include "qbarcategoriesaxis.h"
                 domain.setRange(minX,maxX,minY,maxY);
             }
-            Chart* QAbstractBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
+            ChartElement* QAbstractBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
             {
                 Q_UNUSED(presenter);
                 qWarning() << "QAbstractBarSeriesPrivate::createGraphics called";

0

src/barchart/qabstractbarseries_p.h +1 -1

                 void setLabelsVisible(bool visible);
                 void scaleDomain(Domain& domain);
-                Chart* createGraphics(ChartPresenter* presenter);
+                ChartElement* createGraphics(ChartPresenter* presenter);
                 QList<LegendMarker*> createLegendMarker(QLegend* legend);
                 void initializeAxis(QAbstractAxis* axis);

0

src/barchart/vertical/bar/qbarseries.cpp +1 -1

             }
-            Chart* QBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
+            ChartElement* QBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
             {
                 Q_Q(QBarSeries);

0

src/barchart/vertical/bar/qbarseries_p.h +1 -1

             {
             public:
                 QBarSeriesPrivate(QBarSeries* q);
-                Chart* createGraphics(ChartPresenter* presenter);
+                ChartElement* createGraphics(ChartPresenter* presenter);
                 void scaleDomain(Domain& domain);
             private:
                 Q_DECLARE_PUBLIC(QBarSeries)

0

src/barchart/vertical/percent/qpercentbarseries.cpp +1 -1

             }
-            Chart* QPercentBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
+            ChartElement* QPercentBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
             {
                 Q_Q(QPercentBarSeries);

0

src/barchart/vertical/percent/qpercentbarseries_p.h +1 -1

             public:
                 QPercentBarSeriesPrivate(QPercentBarSeries* q);
                 void scaleDomain(Domain& domain);
-                Chart* createGraphics(ChartPresenter* presenter);
+                ChartElement* createGraphics(ChartPresenter* presenter);
             private:
                 Q_DECLARE_PUBLIC(QPercentBarSeries)
             };

0

src/barchart/vertical/stacked/qstackedbarseries.cpp +1 -1

             }
-            Chart* QStackedBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
+            ChartElement* QStackedBarSeriesPrivate::createGraphics(ChartPresenter* presenter)
             {
                 Q_Q(QStackedBarSeries);

0

src/barchart/vertical/stacked/qstackedbarseries_p.h +1 -1

             {
             public:
                 QStackedBarSeriesPrivate(QStackedBarSeries* q);
-                Chart* createGraphics(ChartPresenter* presenter);
+                ChartElement* createGraphics(ChartPresenter* presenter);
                 void scaleDomain(Domain& domain);
             private:
                 Q_DECLARE_PUBLIC(QStackedBarSeries)

0

src/chartelement.cpp ~~src/chart.cpp~~ renamed +10 -10

             **
             ****************************************************************************/
-            #include "chart_p.h"
+            #include "chartelement_p.h"
             #include "chartpresenter_p.h"
             #include "domain_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            Chart::Chart(ChartPresenter *presenter):QObject(presenter),
+            ChartElement::ChartElement(ChartPresenter *presenter):QObject(presenter),
                 m_presenter(presenter),
                 m_domain(0)
             {
             }
-            void Chart::setPresenter(ChartPresenter *presenter)
+            void ChartElement::setPresenter(ChartPresenter *presenter)
             {
                 m_presenter=presenter;
             }
-            ChartPresenter* Chart::presenter() const
+            ChartPresenter* ChartElement::presenter() const
             {
                 return m_presenter;
             }
-            void Chart::setDomain(Domain *domain)
+            void ChartElement::setDomain(Domain *domain)
             {
                 m_domain=domain;
             }
-            Domain* Chart::domain() const
+            Domain* ChartElement::domain() const
             {
                 return m_domain;
             }
-            void Chart::handleGeometryChanged(const QRectF& rect)
+            void ChartElement::handleGeometryChanged(const QRectF& rect)
             {
                 Q_UNUSED(rect);
                 qWarning()<<"Slot not implemented";
             }
-            void Chart::handleDomainChanged(qreal minX,qreal maxX,qreal minY,qreal maxY)
+            void ChartElement::handleDomainChanged(qreal minX,qreal maxX,qreal minY,qreal maxY)
             {
                 Q_UNUSED(minX);
                 Q_UNUSED(maxX);
                 qWarning()<<"Slot not implemented";
             }
-            void Chart::handleDomainUpdated()
+            void ChartElement::handleDomainUpdated()
             {
                 qWarning()<<"Slot not implemented";
             }
-            #include "moc_chart_p.cpp"
+            #include "moc_chartelement_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

0

src/chartelement_p.h ~~src/chart_p.h~~ renamed +4 -4

             //
             // We mean it.
-            #ifndef CHART_H
+            #ifndef CHARTELEMENT_H
-            #define CHART_H
+            #define CHARTELEMENT_H
             #include "qchartglobal.h"
             #include <QObject>
             class ChartAnimation;
             class Domain;
-            class Chart: public QObject
+            class ChartElement: public QObject
             {
                 Q_OBJECT
             public:
-                explicit Chart(ChartPresenter *presenter);
+                explicit ChartElement(ChartPresenter *presenter);
             public Q_SLOTS:
                 virtual void handleGeometryChanged(const QRectF& rect);

0

src/chartitem_p.h +3 -3

             #ifndef CHARTITEM_H
             #define CHARTITEM_H
-            #include "chart_p.h"
+            #include "chartelement_p.h"
             #include "chartpresenter_p.h"
             #include <QGraphicsItem>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class ChartItem : public QGraphicsItem, public Chart
+            class ChartItem : public QGraphicsItem, public ChartElement
             {
                 enum ChartItemTypes{ AXIS_ITEM = UserType + 1, XYLINE_ITEM };
             public:
-                ChartItem(ChartPresenter *presenter) : QGraphicsItem(presenter ? presenter->rootItem() : 0), Chart(presenter) {}
+                ChartItem(ChartPresenter *presenter) : QGraphicsItem(presenter ? presenter->rootItem() : 0), ChartElement(presenter) {}
             };
             QTCOMMERCIALCHART_END_NAMESPACE

0

src/chartpresenter.cpp +3 -3

             void ChartPresenter::handleSeriesAdded(QAbstractSeries* series,Domain* domain)
             {
-                Chart *item = series->d_ptr->createGraphics(this);
+                ChartElement *item = series->d_ptr->createGraphics(this);
                 Q_ASSERT(item);
                 item->setDomain(domain);
             void ChartPresenter::handleSeriesRemoved(QAbstractSeries* series)
             {
-                Chart* item = m_chartItems.take(series);
+                ChartElement* item = m_chartItems.take(series);
                 Q_ASSERT(item);
                 item->deleteLater();
             }
                        handleAxisAdded(axis,domain);
                 }
-                QMapIterator<QAbstractSeries*, Chart*> j(m_chartItems);
+                QMapIterator<QAbstractSeries*, ChartElement*> j(m_chartItems);
                    while (j.hasNext()) {
                           j.next();
                           Domain* domain = j.value()->domain();

0

src/chartpresenter_p.h +2 -2

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            class Chart;
+            class ChartElement;
             class QAbstractSeries;
             class ChartDataSet;
             class Domain;
                 QChart* m_chart;
                 ChartDataSet* m_dataset;
                 ChartTheme *m_chartTheme;
-                QMap<QAbstractSeries*, Chart*> m_chartItems;
+                QMap<QAbstractSeries*, ChartElement*> m_chartItems;
                 QMap<QAbstractAxis*, ChartAxis*> m_axisItems;
                 QRectF m_rect;
                 QChart::AnimationOptions m_options;

0

src/linechart/qlineseries.cpp +1 -1

             };
-            Chart* QLineSeriesPrivate::createGraphics(ChartPresenter* presenter)
+            ChartElement* QLineSeriesPrivate::createGraphics(ChartPresenter* presenter)
             {
                 Q_Q(QLineSeries);
                 LineChartItem* line = new LineChartItem(q,presenter);

0

src/linechart/qlineseries_p.h +1 -1

             {
             public:
                 QLineSeriesPrivate(QLineSeries* q);
-                Chart* createGraphics(ChartPresenter* presenter);
+                ChartElement* createGraphics(ChartPresenter* presenter);
             private:
                 Q_DECLARE_PUBLIC(QLineSeries);

0

src/piechart/qpieseries.cpp +1 -1

                 // does not apply to pie
             }
-            Chart* QPieSeriesPrivate::createGraphics(ChartPresenter* presenter)
+            ChartElement* QPieSeriesPrivate::createGraphics(ChartPresenter* presenter)
             {
                 Q_Q(QPieSeries);
                 PieChartItem* pie = new PieChartItem(q,presenter);

0

src/piechart/qpieseries_p.h +1 -1

                 ~QPieSeriesPrivate();
                 void scaleDomain(Domain& domain);
-                Chart* createGraphics(ChartPresenter *presenter);
+                ChartElement* createGraphics(ChartPresenter *presenter);
                 QList<LegendMarker*> createLegendMarker(QLegend *legend);
                 void initializeAxis(QAbstractAxis* axis);
                 QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const;

0

src/qabstractseries_p.h +2 -2

             class Domain;
             class ChartPresenter;
-            class Chart;
+            class ChartElement;
             class LegendMarker;
             class QLegend;
             class ChartDataSet;
                 ~QAbstractSeriesPrivate();
                 virtual void scaleDomain(Domain& domain) = 0;
-                virtual Chart* createGraphics(ChartPresenter* presenter) = 0;
+                virtual ChartElement* createGraphics(ChartPresenter* presenter) = 0;
                 virtual QList<LegendMarker*> createLegendMarker(QLegend* legend) = 0;
                 virtual void initializeAxis(QAbstractAxis* axis) = 0;
                 virtual QAbstractAxis::AxisType defaultAxisType(Qt::Orientation) const = 0;

0

src/scatterchart/qscatterseries.cpp +1 -1

             {
             }
-            Chart* QScatterSeriesPrivate::createGraphics(ChartPresenter* presenter)
+            ChartElement* QScatterSeriesPrivate::createGraphics(ChartPresenter* presenter)
             {
                 Q_Q(QScatterSeries);
                 ScatterChartItem *scatter = new ScatterChartItem(q,presenter);

0

src/scatterchart/qscatterseries_p.h +1 -1

             {
             public:
                 QScatterSeriesPrivate(QScatterSeries* q);
-                Chart* createGraphics(ChartPresenter* presenter);
+                ChartElement* createGraphics(ChartPresenter* presenter);
             private:
                 QScatterSeries::MarkerShape m_shape;

0

src/splinechart/qsplineseries.cpp +1 -1

                 }
             }
-            Chart* QSplineSeriesPrivate::createGraphics(ChartPresenter* presenter)
+            ChartElement* QSplineSeriesPrivate::createGraphics(ChartPresenter* presenter)
             {
                 Q_Q(QSplineSeries);
                 SplineChartItem* spline  = new SplineChartItem(q,presenter);

0

src/splinechart/qsplineseries_p.h +1 -1

             {
                 Q_OBJECT
             public:
-                Chart* createGraphics(ChartPresenter* presenter);
+                ChartElement* createGraphics(ChartPresenter* presenter);
                 QSplineSeriesPrivate(QSplineSeries* q);
                 QPointF controlPoint(int index) const;

0

src/src.pro +2 -2

                 $$PWD/qchartview.cpp \
                 $$PWD/qabstractseries.cpp \
                 $$PWD/chartbackground.cpp \
-                $$PWD/chart.cpp \
+                $$PWD/chartelement.cpp \
                 $$PWD/scroller.cpp \
                 $$PWD/chartlayout.cpp
             PRIVATE_HEADERS += \
                 $$PWD/charttheme_p.h \
                 $$PWD/domain_p.h \
                 $$PWD/chartbackground_p.h \
-                $$PWD/chart_p.h \
+                $$PWD/chartelement_p.h \
                 $$PWD/chartconfig_p.h \
                 $$PWD/qchart_p.h \
                 $$PWD/qchartview_p.h \

0

src/xychart/xychart.cpp +1 -1

             //TODO: optimize : remove points which are not visible
-            XYChart::XYChart(QXYSeries *series, ChartPresenter *presenter):Chart(presenter),
+            XYChart::XYChart(QXYSeries *series, ChartPresenter *presenter):ChartElement(presenter),
             m_minX(0),
             m_maxX(0),
             m_minY(0),

0

src/xychart/xychart_p.h +1 -1

             class ChartPresenter;
             class QXYSeries;
-            class XYChart :  public Chart
+            class XYChart :  public ChartElement
             {
                  Q_OBJECT
             public:

	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