HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r796:4bbe1f66d4b7

rename functions add() -> append()

Jani Honkonen -

r796:4bbe1f66d4b7

parent child

Context file:

r796:4bbe1f66d4b7

Collapse all files

demos/chartthemes/themewidget.cpp +6 -6

                         QLineSeries *series1 = new QLineSeries(chart);
                         QLineSeries *series2 = new QLineSeries(chart);
                         foreach (Data data, m_dataTable[i]) {
-                            series1->add(data.first);
+                            series1->append(data.first);
-                            series2->add(QPointF(data.first.x(), 0.0));
+                            series2->append(QPointF(data.first.x(), 0.0));
                         }
                         QAreaSeries *area = new QAreaSeries(series1, series2);
                         area->setName(name + QString::number(nameIndex));
                 foreach (DataList list, m_dataTable) {
                     QLineSeries *series = new QLineSeries(chart);
                     foreach (Data data, list)
-                        series->add(data.first);
+                        series->append(data.first);
                     series->setName(name + QString::number(nameIndex));
                     nameIndex++;
                     chart->addSeries(series);
                 for (int i = 0; i < m_dataTable.count(); i++) {
                     QPieSeries *series = new QPieSeries(chart);
                     foreach (Data data, m_dataTable[i]) {
-                        QPieSlice *slice = series->add(data.first.y(), data.second);
+                        QPieSlice *slice = series->append(data.first.y(), data.second);
                         if (data == m_dataTable[i].first()) {
                             slice->setLabelVisible();
                             slice->setExploded();
                 foreach (DataList list, m_dataTable) {
                     QSplineSeries *series = new QSplineSeries(chart);
                     foreach (Data data, list)
-                        series->add(data.first);
+                        series->append(data.first);
                     series->setName(name + QString::number(nameIndex));
                     nameIndex++;
                     chart->addSeries(series);
                 foreach (DataList list, m_dataTable) {
                     QScatterSeries *series = new QScatterSeries(chart);
                     foreach (Data data, list)
-                        series->add(data.first);
+                        series->append(data.first);
                     series->setName(name + QString::number(nameIndex));
                     nameIndex++;
                     chart->addSeries(series);

examples/chartview/main.cpp +5 -5

                 chartView->setChartTitle("Simple Line Chart");
                 // Add series to the chart
                 QLineSeries *line = new QLineSeries();
-                line->add(0.0, 0.8);
+                line->append(0.0, 0.8);
-                line->add(1.1, 1.1);
+                line->append(1.1, 1.1);
-                line->add(2.0, 2.5);
+                line->append(2.0, 2.5);
                 chartView->addSeries(line);
                 //! [1]
                 // Add pie series
                 // ...
                 QPieSeries *pie = new QPieSeries();
-                pie->add(3.4, "slice1");
+                pie->append(3.4, "slice1");
-                pie->add(6.7, "slice2");
+                pie->append(6.7, "slice2");
                 chartView->addSeries(pie);
                 //! [3]

examples/dynamiclinechart/wavegenerator.h +2 -2

                     int fluctuate = 100;
                     for (qreal x = 0; x <= 2*PI; x+=m_step) {
-                          series1->add(x, fabs(sin(x)*fluctuate));
+                          series1->append(x, fabs(sin(x)*fluctuate));
-                          series2->add(x, fabs(cos(x)*fluctuate));
+                          series2->append(x, fabs(cos(x)*fluctuate));
                     }
                     QObject::connect(&m_timer,SIGNAL(timeout()),this,SLOT(update()));

examples/ekgchart/chartview.cpp +4 -4

                 green.setWidth(3);
                 m_series1->setPen(green);
-                m_series0->add(m_x,m_y);
+                m_series0->append(m_x,m_y);
-                m_series1->add(m_x,m_y);
+                m_series1->append(m_x,m_y);
                 setChartTitle("Simple EKG chart");
                 addSeries(m_series0);
             {
                 m_x+=m_step;
                 m_y = qrand() % 5 - 2.5;
-                m_series0->add(m_x,m_y);
+                m_series0->append(m_x,m_y);
-                m_series1->add(m_x,m_y);
+                m_series1->append(m_x,m_y);
                 if(m_x>=10)
                 {
                     m_series0->remove(m_x-10);

examples/linechart/main.cpp +5 -5

             //![1]
             //![2]
-                series0->add(0, 6);
+                series0->append(0, 6);
-                series0->add(2, 4);
+                series0->append(2, 4);
-                series0->add(3, 8);
+                series0->append(3, 8);
-                series0->add(7, 4);
+                series0->append(7, 4);
-                series0->add(10, 5);
+                series0->append(10, 5);
                 *series1 << QPointF(1, 1) << QPointF(3, 3) << QPointF(7, 6) << QPointF(8, 3) << QPointF(10, 2);
             //![2]

examples/multichart/multichartwidget.cpp +2 -2

                 QChartView *chartView1 = new QChartView();
                 l->addWidget(chartView1);
                 QPieSeries *pie = new QPieSeries();
-                pie->add(1.1, "label1");
+                pie->append(1.1, "label1");
-                pie->add(1.2, "label2");
+                pie->append(1.2, "label2");
                 chartView1->addSeries(pie);
                 // Create chart 2 and add a simple scatter series onto it

examples/piechart/main.cpp +5 -5

             //![1]
                 QPieSeries *series = new QPieSeries();
-                series->add(1, "Slice 1");
+                series->append(1, "Slice 1");
-                series->add(2, "Slice 2");
+                series->append(2, "Slice 2");
-                series->add(3, "Slice 3");
+                series->append(3, "Slice 3");
-                series->add(4, "Slice 4");
+                series->append(4, "Slice 4");
-                series->add(5, "Slice 5");
+                series->append(5, "Slice 5");
             //![1]
             //![2]

examples/presenterchart/chartview.cpp +3 -3

                 for (int x = 0; x <= numPoints; ++x) {
                     qreal y = qrand() % 100;
-                    series0->add(x,y);
+                    series0->append(x,y);
-                    series1->add(x,y);
+                    series1->append(x,y);
-                    series2->add(x,y);
+                    series2->append(x,y);
                 }
             //![2]

examples/scatterchart/main.cpp +5 -5

             //![1]
             //![2]
-                series0->add(0, 6);
+                series0->append(0, 6);
-                series0->add(2, 4);
+                series0->append(2, 4);
-                series0->add(3, 8);
+                series0->append(3, 8);
-                series0->add(7, 4);
+                series0->append(7, 4);
-                series0->add(10, 5);
+                series0->append(10, 5);
                 *series1 << QPointF(1, 1) << QPointF(3, 3) << QPointF(7, 6) << QPointF(8, 3) << QPointF(10, 2);
             //![2]

examples/splinechart/splinewidget.cpp +21 -21

                 //! [add points to series]
                 //add data points to the series
-                series->add(QPointF(150, 100));
+                series->append(QPointF(150, 100));
-                series->add(QPointF(200, 130));
+                series->append(QPointF(200, 130));
-                series->add(QPointF(250, 120));
+                series->append(QPointF(250, 120));
-                series->add(QPointF(300, 140));
+                series->append(QPointF(300, 140));
-                series->add(QPointF(350, 160));
+                series->append(QPointF(350, 160));
                 //! [add points to series]
                 QSplineSeries* series2 = new QSplineSeries;
-                series2->add(QPointF(400, 120));
+                series2->append(QPointF(400, 120));
-                series2->add(QPointF(450, 150));
+                series2->append(QPointF(450, 150));
-                series2->add(QPointF(500, 145));
+                series2->append(QPointF(500, 145));
-                series2->add(QPointF(550, 170));
+                series2->append(QPointF(550, 170));
-            //    series->add(QPointF(600, 190));
+            //    series->append(QPointF(600, 190));
-            //    series->add(QPointF(650, 210));
+            //    series->append(QPointF(650, 210));
-            //    series->add(QPointF(700, 190));
+            //    series->append(QPointF(700, 190));
-            //    series->add(QPointF(750, 180));
+            //    series->append(QPointF(750, 180));
-            //    series->add(QPointF(800, 170));
+            //    series->append(QPointF(800, 170));
                 QSplineSeries* series3 = new QSplineSeries;
-                    series3->add(QPointF(600, 190));
+                    series3->append(QPointF(600, 190));
-                    series3->add(QPointF(650, 210));
+                    series3->append(QPointF(650, 210));
-                    series3->add(QPointF(700, 190));
+                    series3->append(QPointF(700, 190));
-                    series3->add(QPointF(750, 180));
+                    series3->append(QPointF(750, 180));
-                    series3->add(QPointF(800, 170));
+                    series3->append(QPointF(800, 170));
                 //! [3]
                 // create chart view
             void SplineWidget::addNewPoint()
             {
                 if (series->count() > 0)
-                    series->add(QPointF(series->x(series->count() - 1) + 40 + qrand()%40, qAbs(series->y(series->count() - 1) - 50 + qrand()%100)));
+                    series->append(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));
+                    series->append(QPointF(50, 50 + qrand()%50));
             }
             //! [add point]

qmlplugin/declarativepieseries.cpp +1 -1

             {
                 DeclarativePieSeries *series = qobject_cast<DeclarativePieSeries *>(list->object);
                 if (series)
-                    series->add(slice->value(), slice->label());
+                    series->append(slice->value(), slice->label());
             }
             #include "moc_declarativepieseries.cpp"

qmlplugin/declarativexyseries.cpp +1 -1

             {
                 QXYSeries *series = qobject_cast<QXYSeries *>(list->object);
                 if (series)
-                    series->add(QPointF(element->x(), element->y()));
+                    series->append(QPointF(element->x(), element->y()));
             }
             QTCOMMERCIALCHART_END_NAMESPACE

src/areachart/qareaseries.cpp +2 -2

             	Creating basic area chart is simple:
             	\code
             	QLineSeries* lineSeries = new QLineSeries();
-            	series->add(0, 6);
+                series->append(0, 6);
-            	series->add(2, 4);
+                series->append(2, 4);
             	QAreaSeries* areaSeries = new QAreaSeries(lineSeries);
             	...
             	chartView->addSeries(areaSeries);

src/linechart/qlineseries.cpp +2 -2

             	Creating basic line chart is simple:
             	\code
             	QLineSeries* series = new QLineSeries();
-            	series->add(0, 6);
+                series->append(0, 6);
-            	series->add(2, 4);
+                series->append(2, 4);
             	...
             	chartView->addSeries(series);
                 \endcode

src/piechart/qpieseries.cpp +9 -9

             void QPieSeries::replace(QList<QPieSlice*> slices)
             {
                 clear();
-                add(slices);
+                append(slices);
             }
             /*!
                 Adds an array of \a slices to the series.
                 Slice ownership is passed to the series.
             */
-            void QPieSeries::add(QList<QPieSlice*> slices)
+            void QPieSeries::append(QList<QPieSlice*> slices)
             {
                 Q_D(QPieSeries);
                 Adds a single \a slice to the series.
                 Slice ownership is passed to the series.
             */
-            void QPieSeries::add(QPieSlice* slice)
+            void QPieSeries::append(QPieSlice* slice)
             {
-                add(QList<QPieSlice*>() << slice);
+                append(QList<QPieSlice*>() << slice);
             }
             /*!
             */
             QPieSeries& QPieSeries::operator << (QPieSlice* slice)
             {
-                add(slice);
+                append(slice);
                 return *this;
             }
                 Adds a single slice to the series with give \a value and \a name.
                 Slice ownership is passed to the series.
             */
-            QPieSlice* QPieSeries::add(qreal value, QString name)
+            QPieSlice* QPieSeries::append(qreal value, QString name)
             {
                 QPieSlice* slice = new QPieSlice(value, name);
-                add(slice);
+                append(slice);
                 return slice;
             }
                 // create the initial slices set
                 if (d->m_mapOrientation == Qt::Vertical) {
                     for (int i = 0; i < m_model->rowCount(); i++)
-                        add(m_model->data(m_model->index(i, d->m_mapValues), Qt::DisplayRole).toDouble(), m_model->data(m_model->index(i, d->m_mapLabels), Qt::DisplayRole).toString());
+                        append(m_model->data(m_model->index(i, d->m_mapValues), Qt::DisplayRole).toDouble(), m_model->data(m_model->index(i, d->m_mapLabels), Qt::DisplayRole).toString());
                 } else {
                     for (int i = 0; i < m_model->columnCount(); i++)
-                        add(m_model->data(m_model->index(d->m_mapValues, i), Qt::DisplayRole).toDouble(), m_model->data(m_model->index(d->m_mapLabels, i), Qt::DisplayRole).toString());
+                        append(m_model->data(m_model->index(d->m_mapValues, i), Qt::DisplayRole).toDouble(), m_model->data(m_model->index(d->m_mapLabels, i), Qt::DisplayRole).toString());
                 }
             }

src/piechart/qpieseries.h +3 -3

             public:
                 // slice setters
-                void add(QPieSlice* slice);
+                void append(QPieSlice* slice);
-                void add(QList<QPieSlice*> slices);
+                void append(QList<QPieSlice*> slices);
                 void insert(int i, QPieSlice* slice);
                 void replace(QList<QPieSlice*> slices);
                 void remove(QPieSlice* slice);
                 // convenience function
                 QPieSeries& operator << (QPieSlice* slice);
-                QPieSlice* add(qreal value, QString name);
+                QPieSlice* append(qreal value, QString name);
                 void setLabelsVisible(bool visible = true);
                 // data from model

src/piechart/qpieslice.cpp +2 -2

                 Note that QPieSeries takes ownership of the slice when it is set/added.
-                \sa QPieSeries::replace(), QPieSeries::add()
+                \sa QPieSeries::replace(), QPieSeries::append()
             */
             QPieSlice::QPieSlice(QObject *parent)
                 :QObject(parent),
             /*!
                 Constructs an empty slice with given \a value, \a label and a \a parent.
                 Note that QPieSeries takes ownership of the slice when it is set/added.
-                \sa QPieSeries::replace(), QPieSeries::add()
+                \sa QPieSeries::replace(), QPieSeries::append()
             */
             QPieSlice::QPieSlice(qreal value, QString label, QObject *parent)
                 :QObject(parent),

src/scatterseries/qscatterseries.cpp +2 -2

                 Creating basic scatter chart is simple:
                 \code
                 QScatterSeries* series = new QScatterSeries();
-                series->add(0, 6);
+                series->append(0, 6);
-                series->add(2, 4);
+                series->append(2, 4);
                 ...
                 chartView->addSeries(series);
                 \endcode

src/xychart/qxyseries.cpp +9 -9

             /*!
                 Adds data point \a x \a y to the series. Points are connected with lines on the chart.
              */
-            void QXYSeries::add(qreal x,qreal y)
+            void QXYSeries::append(qreal x,qreal y)
             {
                 Q_ASSERT(m_x.size() == m_y.size());
                 m_x<<x;
                This is an overloaded function.
                Adds data \a point to the series. Points are connected with lines on the chart.
              */
-            void QXYSeries::add(const QPointF &point)
+            void QXYSeries::append(const QPointF &point)
             {
-                add(point.x(),point.y());
+                append(point.x(),point.y());
             }
             /*!
                This is an overloaded function.
                Adds list of data \a points to the series. Points are connected with lines on the chart.
              */
-            void QXYSeries::add(const QList<QPointF> points)
+            void QXYSeries::append(const QList<QPointF> points)
             {
                 foreach(const QPointF& point , points) {
-                    add(point.x(),point.y());
+                    append(point.x(),point.y());
                 }
             }
             /*!
                 Stream operator for adding a data \a point to the series.
-                \sa add()
+                \sa append()
             */
             QXYSeries& QXYSeries::operator<< (const QPointF &point)
             {
-                add(point);
+                append(point);
                 return *this;
             }
             /*!
                 Stream operator for adding a list of \a points to the series.
-                \sa add()
+                \sa append()
             */
             QXYSeries& QXYSeries::operator<< (const QList<QPointF> points)
             {
-                add(points);
+                append(points);
                 return *this;
             }

src/xychart/qxyseries.h +3 -3

                 virtual ~QXYSeries();
             public:
-                void add(qreal x, qreal y);
+                void append(qreal x, qreal y);
-                void add(const QPointF &point);
+                void append(const QPointF &point);
-                void add(const QList<QPointF> points);
+                void append(const QList<QPointF> points);
                 void replace(qreal x,qreal y);
                 void replace(const QPointF &point);
                 void remove(qreal x);

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