HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r864:a8bae3529b3d

Quick fix: Refactoring the name did not work correctly

Marek Rosa -

r864:a8bae3529b3d

parent child

Context file:

r864:a8bae3529b3d

Collapse all files

examples/tablemodelchart/tablewidget.cpp +8 -8

                      m_series = new QLineSeries;
                      m_series->setModel(m_model);
                      m_series->setModelMapping(0,1, Qt::Vertical);
-                     m_series->setModelMappingShift(1, 4);
+                     m_series->setModelMappingRange(1, 4);
                      m_chart->addSeries(m_series);
                      seriesColorHex = "#" + QString::number(m_series->pen().color().rgb(), 16).right(6).toUpper();
                      m_model->addMapping(seriesColorHex, QRect(0, 1, 2, 4));
                      m_series = new QLineSeries;
                      m_series->setModel(m_model);
                      m_series->setModelMapping(4,5, Qt::Vertical);
-                     m_series->setModelMappingShift(2, 0);
+                     m_series->setModelMappingRange(2, 0);
                      m_chart->addSeries(m_series);
                      seriesColorHex = "#" + QString::number(m_series->pen().color().rgb(), 16).right(6).toUpper();
                      m_model->addMapping(seriesColorHex, QRect(4, 2, 2, 1000));
                      m_series = new QSplineSeries;
                      m_series->setModel(m_model);
                      m_series->setModelMapping(0,1, Qt::Vertical);
-                     m_series->setModelMappingShift(1, 4);
+                     m_series->setModelMappingRange(1, 4);
                      //        series->setModelMapping(0,1, Qt::Horizontal);
                      m_chart->addSeries(m_series);
                      seriesColorHex = "#" + QString::number(m_series->pen().color().rgb(), 16).right(6).toUpper();
                      m_series = new QSplineSeries;
                      m_series->setModel(m_model);
                      m_series->setModelMapping(2,3, Qt::Vertical);
-                     m_series->setModelMappingShift(0, 0);
+                     m_series->setModelMappingRange(0, 0);
                      //        series->setModelMapping(2,3, Qt::Horizontal);
                      m_chart->addSeries(m_series);
                      seriesColorHex = "#" + QString::number(m_series->pen().color().rgb(), 16).right(6).toUpper();
                      m_series = new QSplineSeries;
                      m_series->setModel(m_model);
                      m_series->setModelMapping(4,5, Qt::Vertical);
-                     m_series->setModelMappingShift(2, 0);
+                     m_series->setModelMappingRange(2, 0);
                      //        series->setModelMapping(4,5, Qt::Horizontal);
                      m_chart->addSeries(m_series);
                      seriesColorHex = "#" + QString::number(m_series->pen().color().rgb(), 16).right(6).toUpper();
                      m_series = new QScatterSeries;
                      m_series->setModel(m_model);
                      m_series->setModelMapping(0,1, Qt::Vertical);
-                     m_series->setModelMappingShift(2, 0);
+                     m_series->setModelMappingRange(2, 0);
                      //        series->setModelMapping(0,1, Qt::Horizontal);
                      m_chart->addSeries(m_series);
                      m_series = new QScatterSeries;
                      m_series->setModel(m_model);
                      m_series->setModelMapping(2,3, Qt::Vertical);
-                     m_series->setModelMappingShift(1, 6);
+                     m_series->setModelMappingRange(1, 6);
                      //        series->setModelMapping(2,3, Qt::Horizontal);
                      m_chart->addSeries(m_series);
                      QLineSeries* upperLineSeries = new QLineSeries;
                      upperLineSeries->setModel(m_model);
                      upperLineSeries->setModelMapping(0, 1, Qt::Vertical);
-                     upperLineSeries->setModelMappingShift(1, 5);
+                     upperLineSeries->setModelMappingRange(1, 5);
                      QLineSeries* lowerLineSeries = new QLineSeries;
                      lowerLineSeries->setModel(m_model);
                      lowerLineSeries->setModelMapping(2, 3, Qt::Vertical);

src/splinechart/qsplineseries.cpp +2 -2

              //    calculateControlPoints();
              }
-             void QSplineSeries::setModelMappingShift(int first, int count)
+             void QSplineSeries::setModelMappingRange(int first, int count)
              {
-                 QLineSeries::setModelMappingShift(first, count);
+                 QLineSeries::setModelMappingRange(first, count);
                  calculateControlPoints();
              }

src/splinechart/qsplineseries.h +1 -1

                  bool setModel(QAbstractItemModel *model);
                  void setModelMapping(int modelX, int modelY, Qt::Orientation orientation = Qt::Vertical);
-                 void setModelMappingShift(int first, int count);
+                 void setModelMappingRange(int first, int count);
              private:
                  void calculateControlPoints();

src/xychart/qxyseries.cpp +1 -1

                  }
              }
-             void QXYSeries::setModelMappingShift(int first, int count)
+             void QXYSeries::setModelMappingRange(int first, int count)
              {
                  m_mapFirst = first;
                  if (count == 0) {

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