HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1312:0b557819e7a2

Replaced 'Bar' with 'BarSet' in BarModelMapper functions and member variables

Marek Rosa -

r1312:0b557819e7a2

parent child

Context file:

r1312:0b557819e7a2

Collapse all files

src/barchart/qbarmodelmapper.cpp +22 -22

                 d->initializeBarFromModel();
             }
-            int QBarModelMapper::firstBarSection() const
+            int QBarModelMapper::firstBarSetSection() const
             {
                 Q_D(const QBarModelMapper);
-                return d->m_firstBarSection;
+                return d->m_firstBarSetSection;
             }
-            void QBarModelMapper::setFirstBarSection(int firstBarSection)
+            void QBarModelMapper::setFirstBarSetSection(int firstBarSetSection)
             {
                 Q_D(QBarModelMapper);
-                d->m_firstBarSection = firstBarSection;
+                d->m_firstBarSetSection = firstBarSetSection;
                 d->initializeBarFromModel();
             }
-            int QBarModelMapper::lastBarSection() const
+            int QBarModelMapper::lastBarSetSection() const
             {
                 Q_D(const QBarModelMapper);
-                return d->m_lastBarSection;
+                return d->m_lastBarSetSection;
             }
-            void QBarModelMapper::setLastBarSection(int lastBarSection)
+            void QBarModelMapper::setLastBarSetSection(int lastBarSetSection)
             {
                 Q_D(QBarModelMapper);
-                d->m_lastBarSection = lastBarSection;
+                d->m_lastBarSetSection = lastBarSetSection;
                 d->initializeBarFromModel();
             }
                 d->m_first = 0;
                 d->m_count = -1;
                 d->m_orientation = Qt::Vertical;
-                d->m_firstBarSection = -1;
+                d->m_firstBarSetSection = -1;
-                d->m_lastBarSection = -1;
+                d->m_lastBarSetSection = -1;
                 d->m_categoriesSection = -1;
                 d->initializeBarFromModel();
             }
                 m_first(0),
                 m_count(-1),
                 m_orientation(Qt::Vertical),
-                m_firstBarSection(-1),
+                m_firstBarSetSection(-1),
-                m_lastBarSection(-1),
+                m_lastBarSetSection(-1),
                 m_categoriesSection(-1),
                 m_seriesSignalsBlock(false),
                 m_modelSignalsBlock(false),
                 if (!index.isValid())
                     return 0;
-                if (m_orientation == Qt::Vertical && index.column() >= m_firstBarSection && index.column() <= m_lastBarSection) {
+                if (m_orientation == Qt::Vertical && index.column() >= m_firstBarSetSection && index.column() <= m_lastBarSetSection) {
                     if (index.row() >= m_first && (m_count == - 1 || index.row() < m_first + m_count))
-                        return m_series->barSets().at(index.column() - m_firstBarSection);
+                        return m_series->barSets().at(index.column() - m_firstBarSetSection);
-                } else if (m_orientation == Qt::Horizontal && index.row() >= m_firstBarSection && index.row() <= m_lastBarSection) {
+                } else if (m_orientation == Qt::Horizontal && index.row() >= m_firstBarSetSection && index.row() <= m_lastBarSetSection) {
                     if (index.column() >= m_first && (m_count == - 1 || index.column() < m_first + m_count))
-                        return m_series->barSets().at(index.row() - m_firstBarSection);
+                        return m_series->barSets().at(index.row() - m_firstBarSetSection);
                 }
                 return 0; // This part of model has not been mapped to any slice
             }
                 if (m_count != -1 && posInBar >= m_count)
                     return QModelIndex(); // invalid
-                if (barSection < m_firstBarSection || barSection > m_lastBarSection)
+                if (barSection < m_firstBarSetSection || barSection > m_lastBarSetSection)
                     return QModelIndex(); // invalid
                 if (m_orientation == Qt::Vertical)
                 if (m_orientation == Qt::Vertical)
                     //        insertData(start, end);
                     initializeBarFromModel();
-                else if (start <= m_firstBarSection || start <= m_lastBarSection || start <= m_categoriesSection) // if the changes affect the map - reinitialize
+                else if (start <= m_firstBarSetSection || start <= m_lastBarSetSection || start <= m_categoriesSection) // if the changes affect the map - reinitialize
                     initializeBarFromModel();
                 blockSeriesSignals(false);
             }
                 if (m_orientation == Qt::Vertical)
                     //        removeData(start, end);
                     initializeBarFromModel();
-                else if (start <= m_firstBarSection || start <= m_lastBarSection || start <= m_categoriesSection) // if the changes affect the map - reinitialize
+                else if (start <= m_firstBarSetSection || start <= m_lastBarSetSection || start <= m_categoriesSection) // if the changes affect the map - reinitialize
                     initializeBarFromModel();
                 blockSeriesSignals(false);
             }
                 if (m_orientation == Qt::Horizontal)
                     //        insertData(start, end);
                     initializeBarFromModel();
-                else if (start <= m_firstBarSection || start <= m_lastBarSection || start <= m_categoriesSection) // if the changes affect the map - reinitialize
+                else if (start <= m_firstBarSetSection || start <= m_lastBarSetSection || start <= m_categoriesSection) // if the changes affect the map - reinitialize
                     initializeBarFromModel();
                 blockSeriesSignals(false);
             }
                 if (m_orientation == Qt::Horizontal)
                     //        removeData(start, end);
                     initializeBarFromModel();
-                else if (start <= m_firstBarSection || start <= m_lastBarSection || start <= m_categoriesSection) // if the changes affect the map - reinitialize
+                else if (start <= m_firstBarSetSection || start <= m_lastBarSetSection || start <= m_categoriesSection) // if the changes affect the map - reinitialize
                     initializeBarFromModel();
                 blockSeriesSignals(false);
             }
                 m_series->clear();
                 // create the initial bar sets
-                for (int i = m_firstBarSection; i <= m_lastBarSection; i++) {
+                for (int i = m_firstBarSetSection; i <= m_lastBarSetSection; i++) {
                     int posInBar = 0;
                     QModelIndex barIndex = barModelIndex(i, posInBar);
                     QBarSet *barSet = new QBarSet(m_model->headerData(i, Qt::Horizontal).toString());

src/barchart/qbarmodelmapper.h +4 -4

                 int count() const;
                 void setCount(int count);
-                int firstBarSection() const;
+                int firstBarSetSection() const;
-                void setFirstBarSection(int firstBarSection);
+                void setFirstBarSetSection(int firstBarSetSection);
-                int lastBarSection() const;
+                int lastBarSetSection() const;
-                void setLastBarSection(int lastBarSection);
+                void setLastBarSetSection(int lastBarSetSection);
                 int categoriesSection() const;
                 void setCategoriesSection(int categoriesSection);

src/barchart/qbarmodelmapper_p.h +2 -2

                 int m_first;
                 int m_count;
                 Qt::Orientation m_orientation;
-                int m_firstBarSection;
+                int m_firstBarSetSection;
-                int m_lastBarSection;
+                int m_lastBarSetSection;
                 int m_categoriesSection;
                 bool m_seriesSignalsBlock;
                 bool m_modelSignalsBlock;

src/barchart/qhbarmodelmapper.cpp +8 -8

                 QBarModelMapper::setOrientation(Qt::Horizontal);
             }
-            int QHBarModelMapper::firstBarRow() const
+            int QHBarModelMapper::firstBarSetRow() const
             {
-                return QBarModelMapper::firstBarSection();
+                return QBarModelMapper::firstBarSetSection();
             }
-            void QHBarModelMapper::setFirstBarRow(int firstBarRow)
+            void QHBarModelMapper::setFirstBarSetRow(int firstBarSetRow)
             {
-                return QBarModelMapper::setFirstBarSection(firstBarRow);
+                return QBarModelMapper::setFirstBarSetSection(firstBarSetRow);
             }
-            int QHBarModelMapper::lastBarRow() const
+            int QHBarModelMapper::lastBarSetRow() const
             {
-                return QBarModelMapper::lastBarSection();
+                return QBarModelMapper::lastBarSetSection();
             }
-            void QHBarModelMapper::setLastBarRow(int lastBarRow)
+            void QHBarModelMapper::setLastBarSetRow(int lastBarSetRow)
             {
-                return QBarModelMapper::setLastBarSection(lastBarRow);
+                return QBarModelMapper::setLastBarSetSection(lastBarSetRow);
             }
             int QHBarModelMapper::categoriesRow() const

src/barchart/qhbarmodelmapper.h +6 -6

             class QTCOMMERCIALCHART_EXPORT QHBarModelMapper : public QBarModelMapper
             {
                 Q_OBJECT
-                Q_PROPERTY(int firstBarRow READ firstBarRow WRITE setFirstBarRow)
+                Q_PROPERTY(int firstBarSetRow READ firstBarSetRow WRITE setFirstBarSetRow)
-                Q_PROPERTY(int lastBarRow READ lastBarRow WRITE setLastBarRow)
+                Q_PROPERTY(int lastBarSetRow READ lastBarSetRow WRITE setLastBarSetRow)
             public:
                 explicit QHBarModelMapper(QObject *parent = 0);
-                int firstBarRow() const;
+                int firstBarSetRow() const;
-                void setFirstBarRow(int firstBarRow);
+                void setFirstBarSetRow(int firstBarSetRow);
-                int lastBarRow() const;
+                int lastBarSetRow() const;
-                void setLastBarRow(int lastBarRow);
+                void setLastBarSetRow(int lastBarSetRow);
                 int categoriesRow() const;
                 void setCategoriesRow(int categoriesRow);

src/barchart/qvbarmodelmapper.cpp +8 -8

                 QBarModelMapper::setOrientation(Qt::Vertical);
             }
-            int QVBarModelMapper::firstBarColumn() const
+            int QVBarModelMapper::firstBarSetColumn() const
             {
-                return QBarModelMapper::firstBarSection();
+                return QBarModelMapper::firstBarSetSection();
             }
-            void QVBarModelMapper::setFirstBarColumn(int firstBarColumn)
+            void QVBarModelMapper::setFirstBarSetColumn(int firstBarSetColumn)
             {
-                return QBarModelMapper::setFirstBarSection(firstBarColumn);
+                return QBarModelMapper::setFirstBarSetSection(firstBarSetColumn);
             }
-            int QVBarModelMapper::lastBarColumn() const
+            int QVBarModelMapper::lastBarSetColumn() const
             {
-                return QBarModelMapper::lastBarSection();
+                return QBarModelMapper::lastBarSetSection();
             }
-            void QVBarModelMapper::setLastBarColumn(int lastBarColumn)
+            void QVBarModelMapper::setLastBarSetColumn(int lastBarSetColumn)
             {
-                return QBarModelMapper::setLastBarSection(lastBarColumn);
+                return QBarModelMapper::setLastBarSetSection(lastBarSetColumn);
             }
             int QVBarModelMapper::categoriesColumn() const

src/barchart/qvbarmodelmapper.h +6 -6

             class QTCOMMERCIALCHART_EXPORT QVBarModelMapper : public QBarModelMapper
             {
                 Q_OBJECT
-                Q_PROPERTY(int firstBarColumn READ firstBarColumn WRITE setFirstBarColumn)
+                Q_PROPERTY(int firstBarSetColumn READ firstBarSetColumn WRITE setFirstBarSetColumn)
-                Q_PROPERTY(int lastBarColumn READ lastBarColumn WRITE setLastBarColumn)
+                Q_PROPERTY(int lastBarSetColumn READ lastBarSetColumn WRITE setLastBarSetColumn)
             public:
                 explicit QVBarModelMapper(QObject *parent = 0);
-                int firstBarColumn() const;
+                int firstBarSetColumn() const;
-                void setFirstBarColumn(int firstBarColumn);
+                void setFirstBarSetColumn(int firstBarSetColumn);
-                int lastBarColumn() const;
+                int lastBarSetColumn() const;
-                void setLastBarColumn(int lastBarColumn);
+                void setLastBarSetColumn(int lastBarSetColumn);
                 int categoriesColumn() const;
                 void setCategoriesColumn(int categoriesColumn);

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