HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1829:df98ed9e54fb

QCategoryAxis renamed some methods names according to review

Marek Rosa -

r1829:df98ed9e54fb

parent child

Context file:

r1829:df98ed9e54fb

Collapse all files

src/axis/categoryaxis/chartcategoryaxisx.cpp +4 -4

             QVector<qreal> ChartCategoryAxisX::calculateLayout() const
             {
                 QCategoryAxis *axis = qobject_cast<QCategoryAxis *>(m_chartAxis);
-                int tickCount = axis->intervalsLabels().count() + 1;
+                int tickCount = axis->categoriesLabels().count() + 1;
                 QVector<qreal> points;
                 if (tickCount < 2)
                 qreal scale = m_rect.width() / axis->max();
                 for (int i = 0; i < tickCount; ++i)
                     if (i < tickCount - 1) {
-                        int x = axis->intervalMin(axis->intervalsLabels().at(i)) * scale + m_rect.left();
+                        int x = axis->categoryStart(axis->categoriesLabels().at(i)) * scale + m_rect.left();
                         points[i] = x;
                     } else {
-                        int x = axis->intervalMax(axis->intervalsLabels().at(i - 1))  * scale + m_rect.left();
+                        int x = axis->categoryEnd(axis->categoriesLabels().at(i - 1))  * scale + m_rect.left();
                         points[i] = x;
                     }
                 QCategoryAxis *intervalAxis = qobject_cast<QCategoryAxis *>(m_chartAxis);
-                QStringList ticksList = intervalAxis->intervalsLabels();
+                QStringList ticksList = intervalAxis->categoriesLabels();
                 //    createNumberLabels(ticksList,m_min,m_max,layout.size());

src/axis/categoryaxis/chartcategoryaxisy.cpp +4 -4

             QVector<qreal> ChartCategoryAxisY::calculateLayout() const
             {
                 QCategoryAxis *axis = qobject_cast<QCategoryAxis *>(m_chartAxis);
-                int tickCount = axis->intervalsLabels().count() + 1;
+                int tickCount = axis->categoriesLabels().count() + 1;
                 QVector<qreal> points;
                 if (tickCount < 2)
                 qreal scale = m_rect.height() / axis->max();
                 for (int i = 0; i < tickCount; ++i)
                     if (i < tickCount - 1) {
-                        int y = -axis->intervalMin(axis->intervalsLabels().at(i)) * scale + m_rect.bottom();
+                        int y = -axis->categoryStart(axis->categoriesLabels().at(i)) * scale + m_rect.bottom();
                         points[i] = y;
                     } else {
-                        int y = -axis->intervalMax(axis->intervalsLabels().at(i - 1))  * scale + m_rect.bottom();
+                        int y = -axis->categoryEnd(axis->categoriesLabels().at(i - 1))  * scale + m_rect.bottom();
                         points[i] = y;
                     }
                 QCategoryAxis *intervalAxis = qobject_cast<QCategoryAxis *>(m_chartAxis);
-                QStringList ticksList = intervalAxis->intervalsLabels();
+                QStringList ticksList = intervalAxis->categoriesLabels();
                 QList<QGraphicsItem *> lines = m_grid->childItems();
                 QList<QGraphicsItem *> labels = m_labels->childItems();

src/axis/categoryaxis/qcategoryaxis.cpp +47 -47

             }
             /*!
-                Appends new interval to the axis with an \a intervalLabel.
+                Appends new category to the axis with an \a categoryLabel.
-                Interval label has to be unique.
+                Category label has to be unique.
-                Parameter \a intervalEnd specifies the high end limit of the interval.
+                Parameter \a categoryHighEnd specifies the high end limit of the category.
-                It has to be greater than the high end limit of the previous interval.
+                It has to be greater than the high end limit of the previous category.
-                Otherwise the method returns without adding a new interval.
+                Otherwise the method returns without adding a new category.
             */
-            void QCategoryAxis::append(const QString& intervalLabel, qreal intervalEnd)
+            void QCategoryAxis::append(const QString& categoryLabel, qreal categoryHighEnd)
             {
                 Q_D(QCategoryAxis);
-                if (!d->m_intervals.contains(intervalLabel))
+                if (!d->m_categories.contains(categoryLabel))
                 {
-                    if(d->m_intervals.isEmpty()){
+                    if(d->m_categories.isEmpty()){
-                        Range range(d->m_categoryMinimum, intervalEnd);
+                        Range range(d->m_categoryMinimum, categoryHighEnd);
-                        d->m_intervalsMap.insert(intervalLabel, range);
+                        d->m_categoriesMap.insert(categoryLabel, range);
-                        d->m_intervals.append(intervalLabel);
+                        d->m_categories.append(categoryLabel);
-                    }else if (intervalEnd > intervalMax(d->m_intervals.last())){
+                    }else if (categoryHighEnd > categoryEnd(d->m_categories.last())){
-                        Range range = d->m_intervalsMap.value(d->m_intervals.last());
+                        Range previousRange = d->m_categoriesMap.value(d->m_categories.last());
-                        d->m_intervalsMap.insert(intervalLabel, Range(range.second, intervalEnd));
+                        d->m_categoriesMap.insert(categoryLabel, Range(previousRange.second, categoryHighEnd));
-                        d->m_intervals.append(intervalLabel);
+                        d->m_categories.append(categoryLabel);
                     }
                 }
             }
             /*!
-                Sets to \a min the low end limit of the first interval on the axis.
+                Sets to \a min the low end limit of the first category on the axis.
             */
-            void QCategoryAxis::setFisrtIntervalMinimum(qreal min)
+            void QCategoryAxis::setStartValue(qreal min)
             {
                 Q_D(QCategoryAxis);
-                if(d->m_intervals.isEmpty()){
+                if(d->m_categories.isEmpty()){
                     d->m_categoryMinimum = min;
                 }else{
-                    Range range = d->m_intervalsMap.value(d->m_intervals.first());
+                    Range range = d->m_categoriesMap.value(d->m_categories.first());
-                    d->m_intervalsMap.insert(d->m_intervals.first(), Range(min, range.second));
+                    d->m_categoriesMap.insert(d->m_categories.first(), Range(min, range.second));
                 }
             }
             /*!
-                Returns the low end limit of the interval specified by an \a intervalLabel
+                Returns the low end limit of the category specified by an \a categoryLabel
             */
-            qreal QCategoryAxis::intervalMin(const QString& intervalLabel) const
+            qreal QCategoryAxis::categoryStart(const QString& categoryLabel) const
             {
                 Q_D(const QCategoryAxis);
-                return d->m_intervalsMap.value(intervalLabel).first;
+                return d->m_categoriesMap.value(categoryLabel).first;
             }
             /*!
-                Returns the high end limit of the interval specified by an \a intervalLabel
+                Returns the high end limit of the interval specified by an \a categoryLabel
             */
-            qreal QCategoryAxis::intervalMax(const QString& intervalLabel) const
+            qreal QCategoryAxis::categoryEnd(const QString& categoryLabel) const
             {
                 Q_D(const QCategoryAxis);
-                return d->m_intervalsMap.value(intervalLabel).second;
+                return d->m_categoriesMap.value(categoryLabel).second;
             }
             /*!
-                Removes an interval specified by the \a intervalLabel from the axis
+                Removes an interval specified by the \a categoryLabel from the axis
             */
-            void QCategoryAxis::remove(const QString &intervalLabel)
+            void QCategoryAxis::remove(const QString &categoryLabel)
             {
                 Q_D(QCategoryAxis);
-                int labelIndex = d->m_intervals.indexOf(intervalLabel);
+                int labelIndex = d->m_categories.indexOf(categoryLabel);
                 // check if such label exists
                 if (labelIndex != -1) {
-                    d->m_intervals.removeAt(labelIndex);
+                    d->m_categories.removeAt(labelIndex);
-                    d->m_intervalsMap.remove(intervalLabel);
+                    d->m_categoriesMap.remove(categoryLabel);
                     // the range of the interval that follows (if exists) needs to be updated
-                    if (labelIndex < d->m_intervals.count()) {
+                    if (labelIndex < d->m_categories.count()) {
-                        QString label = d->m_intervals.at(labelIndex);
+                        QString label = d->m_categories.at(labelIndex);
-                        Range range = d->m_intervalsMap.value(label);
+                        Range range = d->m_categoriesMap.value(label);
                         // set the range
                         if (labelIndex == 0) {
                             range.first = d->m_categoryMinimum;
-                            d->m_intervalsMap.insert(label, range);
+                            d->m_categoriesMap.insert(label, range);
                         } else {
-                            range.first = d->m_intervalsMap.value(d->m_intervals.at(labelIndex - 1)).second;
+                            range.first = d->m_categoriesMap.value(d->m_categories.at(labelIndex - 1)).second;
-                            d->m_intervalsMap.insert(label, range);
+                            d->m_categoriesMap.insert(label, range);
                         }
                     }
                     d->emitUpdated();
             }
             /*!
-              Replaces \a oldLabel of an existing interval with a \a newLabel
+              Replaces \a oldLabel of an existing category with a \a newLabel
               If the old label does not exist the method returns without making any changes.
              */
             void QCategoryAxis::replaceLabel(const QString& oldLabel, const QString& newLabel)
             {
                 Q_D(QCategoryAxis);
-                int labelIndex = d->m_intervals.indexOf(oldLabel);
+                int labelIndex = d->m_categories.indexOf(oldLabel);
                 // check if such label exists
                 if (labelIndex != -1) {
-                    d->m_intervals.replace(labelIndex, newLabel);
+                    d->m_categories.replace(labelIndex, newLabel);
-                    Range range = d->m_intervalsMap.value(oldLabel);
+                    Range range = d->m_categoriesMap.value(oldLabel);
-                    d->m_intervalsMap.remove(oldLabel);
+                    d->m_categoriesMap.remove(oldLabel);
-                    d->m_intervalsMap.insert(newLabel, range);
+                    d->m_categoriesMap.insert(newLabel, range);
                     d->emitUpdated();
                 }
             /*!
               Returns the list of the intervals labels
              */
-            QStringList QCategoryAxis::intervalsLabels()
+            QStringList QCategoryAxis::categoriesLabels()
             {
                 Q_D(QCategoryAxis);
-                return d->m_intervals;
+                return d->m_categories;
             }
             /*!
             int QCategoryAxis::count() const
             {
                 Q_D(const QCategoryAxis);
-                return d->m_intervals.count();
+                return d->m_categories.count();
             }
             /*!
             int QCategoryAxisPrivate::ticksCount() const
             {
-                return m_intervals.count() + 1;
+                return m_categories.count() + 1;
             }
             void QCategoryAxisPrivate::handleAxisRangeChanged(qreal min, qreal max,int count)

src/axis/categoryaxis/qcategoryaxis.h +5 -5

             public:
                 AxisType type() const;
-                void append(const QString& label, qreal intervalEnd);
+                void append(const QString& label, qreal categoryHighEnd);
                 void remove(const QString& label);
                 void replaceLabel(const QString& oldLabel, const QString& newLabel);
-                void setFisrtIntervalMinimum(qreal min);
+                void setStartValue(qreal min);
-                qreal intervalMin(const QString& intervalLabel) const;
+                qreal categoryStart(const QString& categoryLabel) const;
-                qreal intervalMax(const QString& intervalLabel) const;
+                qreal categoryEnd(const QString& categoryLabel) const;
-                QStringList intervalsLabels();
+                QStringList categoriesLabels();
                 int count() const;

src/axis/categoryaxis/qcategoryaxis_p.h +2 -2

                 void handleAxisRangeChanged(qreal min, qreal max,int count);
             private:
-                QMap<QString , Range> m_intervalsMap;
+                QMap<QString , Range> m_categoriesMap;
-                QStringList m_intervals;
+                QStringList m_categories;
                 qreal m_categoryMinimum;
             private:

src/axis/datetimeaxis/qdatetimeaxis.cpp +1 -1

             {
                 m_min = QDateTime::fromMSecsSinceEpoch(0);
                 m_max = QDateTime::fromMSecsSinceEpoch(0);
-                m_format = "dd-MMM-yy\nh:mm";
+                m_format = "dd-MMM-yyyy\nh:mm";
             }
             QDateTimeAxisPrivate::~QDateTimeAxisPrivate()

tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp +11 -11

             {
                 // append one correct interval
                 m_intervalsaxis->append("first", (qreal)45);
-                QCOMPARE(m_intervalsaxis->intervalMin("first"), (qreal)0);
+                QCOMPARE(m_intervalsaxis->categoryStart("first"), (qreal)0);
-                QCOMPARE(m_intervalsaxis->intervalMax("first"), (qreal)45);
+                QCOMPARE(m_intervalsaxis->categoryEnd("first"), (qreal)45);
                 // append one more correct interval
                 m_intervalsaxis->append("second", (qreal)75);
-                QCOMPARE(m_intervalsaxis->intervalMin("second"), (qreal)45);
+                QCOMPARE(m_intervalsaxis->categoryStart("second"), (qreal)45);
-                QCOMPARE(m_intervalsaxis->intervalMax("second"), (qreal)75);
+                QCOMPARE(m_intervalsaxis->categoryEnd("second"), (qreal)75);
                 // append one incorrect interval
                 m_intervalsaxis->append("third", (qreal)15);
                 QCOMPARE(m_intervalsaxis->count(), 2);
-                QCOMPARE(m_intervalsaxis->intervalMax(m_intervalsaxis->intervalsLabels().last()), (qreal)75);
+                QCOMPARE(m_intervalsaxis->categoryEnd(m_intervalsaxis->categoriesLabels().last()), (qreal)75);
             //    QCOMPARE(intervalMax("first"), (qreal)75);
                 // append one more correct interval
                 m_intervalsaxis->append("third", (qreal)100);
                 QCOMPARE(m_intervalsaxis->count(), 3);
-                QCOMPARE(m_intervalsaxis->intervalMin("third"), (qreal)75);
+                QCOMPARE(m_intervalsaxis->categoryStart("third"), (qreal)75);
-                QCOMPARE(m_intervalsaxis->intervalMax("third"), (qreal)100);
+                QCOMPARE(m_intervalsaxis->categoryEnd("third"), (qreal)100);
                 // remove one interval
                 m_intervalsaxis->remove("first");
                 QCOMPARE(m_intervalsaxis->count(), 2);
-                QCOMPARE(m_intervalsaxis->intervalMin("second"), (qreal)0); // second interval should extend to firstInterval minimum
+                QCOMPARE(m_intervalsaxis->categoryStart("second"), (qreal)0); // second interval should extend to firstInterval minimum
-                QCOMPARE(m_intervalsaxis->intervalMax("second"), (qreal)75);
+                QCOMPARE(m_intervalsaxis->categoryEnd("second"), (qreal)75);
                 // remove one interval
                 m_intervalsaxis->replaceLabel("second", "replaced");
                 QCOMPARE(m_intervalsaxis->count(), 2);
-                QCOMPARE(m_intervalsaxis->intervalMin("replaced"), (qreal)0); // second interval should extend to firstInterval minimum
+                QCOMPARE(m_intervalsaxis->categoryStart("replaced"), (qreal)0); // second interval should extend to firstInterval minimum
-                QCOMPARE(m_intervalsaxis->intervalMax("replaced"), (qreal)75);
+                QCOMPARE(m_intervalsaxis->categoryEnd("replaced"), (qreal)75);
             }
             QTEST_MAIN(tst_QCategoryAxis)

tests/auto/qdatetimeaxis/tst_qdatetimeaxis.cpp +4 -4

                 *m_series << QPointF(-100, -100) << QPointF(0, 0) << QPointF(100, 100);
                 //    tst_QAbstractAxis::init(m_datetimeaxis, m_series);
-                m_view = new QChartView(new QChart());
+                m_view = new QChartView;
                 m_chart = m_view->chart();
                 m_chart->addSeries(m_series);
                 m_chart->setAxisY(m_dateTimeAxisY, m_series);
             void tst_QDateTimeAxis::max()
             {
-                m_chart->setAxisX(m_dateTimeAxisX, m_series);
+            //    m_chart->setAxisX(m_dateTimeAxisX, m_series);
                 m_view->show();
                 QTest::qWaitForWindowShown(m_view);
                 max_raw();
             void tst_QDateTimeAxis::min()
             {
-                m_chart->setAxisX(m_dateTimeAxisX, m_series);
+            //    m_chart->setAxisX(m_dateTimeAxisX, m_series);
                 m_view->show();
                 QTest::qWaitForWindowShown(m_view);
                 min_raw();
             void tst_QDateTimeAxis::range()
             {
-                m_chart->setAxisX(m_dateTimeAxisX, m_series);
+            //    m_chart->setAxisX(m_dateTimeAxisX, m_series);
                 m_view->show();
                 QTest::qWaitForWindowShown(m_view);
                 range_raw();

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