HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1817:f04afbebdb7b

Renamed QCategoryAxis related files

Marek Rosa -

r1817:f04afbebdb7b

parent child

Context file:

r1817:f04afbebdb7b

Collapse all files

doc/src/classes.qdoc +1 -1

                                 <li><a href="qabstractaxis.html">QAbstractAxis</a></li>
                                 <li><a href="qvalueaxis.html">QValueAxis</a></li>
                                 <li><a href="qbarcategoryaxis.html">QBarCategoryAxis</a></li>
-                                <li><a href="qintervalsaxis.html">QIntervalsAxis</a></li>
+                                <li><a href="qcategoryaxis.html">QCategoryAxis</a></li>
                                 <li><a href="qlegend.html">QLegend</a></li>
                                 <li><a href="qabstractseries.html">QAbstractSeries</a></li>
                                 <li><a href="qchartglobal.html">QChartGlobal</a></li>

src/axis/axis.pri +9 -9

             INCLUDEPATH += $$PWD \
                 $$PWD/valueaxis \
                 $$PWD/barcategoryaxis \
-                $$PWD/intervalsaxis \
+                $$PWD/categoryaxis \
                 $$PWD/datetimeaxis
             DEPENDPATH += $$PWD \
                 $$PWD/valueaxis \
                 $$PWD/barcategoryaxis \
-                $$PWD/intervalsaxis \
+                $$PWD/categoryaxis \
                 $$PWD/datetimeaxis
             SOURCES += \
                 $$PWD/barcategoryaxis/chartbarcategoryaxisx.cpp \
                 $$PWD/barcategoryaxis/chartbarcategoryaxisy.cpp \
                 $$PWD/barcategoryaxis/qbarcategoryaxis.cpp \
-                $$PWD/intervalsaxis/chartintervalsaxisx.cpp \
+                $$PWD/categoryaxis/chartcategoryaxisx.cpp \
-                $$PWD/intervalsaxis/chartintervalsaxisy.cpp \
+                $$PWD/categoryaxis/chartcategoryaxisy.cpp \
-                $$PWD/intervalsaxis/qintervalsaxis.cpp \
+                $$PWD/categoryaxis/qcategoryaxis.cpp \
                 $$PWD/datetimeaxis/chartdatetimeaxisx.cpp \
                 $$PWD/datetimeaxis/chartdatetimeaxisy.cpp \
                 $$PWD/datetimeaxis/qdatetimeaxis.cpp
                 $$PWD/barcategoryaxis/chartbarcategoryaxisx_p.h \
                 $$PWD/barcategoryaxis/chartbarcategoryaxisy_p.h \
                 $$PWD/barcategoryaxis/qbarcategoryaxis_p.h \
-                $$PWD/intervalsaxis/chartintervalsaxisx_p.h \
+                $$PWD/categoryaxis/chartcategoryaxisx_p.h \
-                $$PWD/intervalsaxis/chartintervalsaxisy_p.h \
+                $$PWD/categoryaxis/chartcategoryaxisy_p.h \
-                $$PWD/intervalsaxis/qintervalsaxis_p.h \
+                $$PWD/categoryaxis/qcategoryaxis_p.h \
                 $$PWD/datetimeaxis/chartdatetimeaxisx_p.h \
                 $$PWD/datetimeaxis/chartdatetimeaxisy_p.h \
                 $$PWD/datetimeaxis/qdatetimeaxis_p.h
                 $$PWD/qabstractaxis.h \
                 $$PWD/valueaxis/qvalueaxis.h \
                 $$PWD/barcategoryaxis/qbarcategoryaxis.h \
-                $$PWD/intervalsaxis/qintervalsaxis.h \
+                $$PWD/categoryaxis/qcategoryaxis.h \
                 $$PWD/datetimeaxis/qdatetimeaxis.h

src/axis/categoryaxis/chartcategoryaxisx.cpp ~~src/axis/intervalsaxis/chartintervalsaxisx.cpp~~ renamed +7 -7

             **
             ****************************************************************************/
-            #include "chartintervalsaxisx_p.h"
+            #include "chartcategoryaxisx_p.h"
-            #include "qintervalsaxis.h"
+            #include "qcategoryaxis.h"
             #include "qabstractaxis.h"
             #include "chartpresenter_p.h"
             #include <QGraphicsLayout>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            ChartIntervalAxisX::ChartIntervalAxisX(QAbstractAxis *axis,ChartPresenter *presenter) : ChartAxis(axis,presenter)
+            ChartCategoryAxisX::ChartCategoryAxisX(QAbstractAxis *axis,ChartPresenter *presenter) : ChartAxis(axis,presenter)
             {
             }
-            ChartIntervalAxisX::~ChartIntervalAxisX()
+            ChartCategoryAxisX::~ChartCategoryAxisX()
             {
             }
-            QVector<qreal> ChartIntervalAxisX::calculateLayout() const
+            QVector<qreal> ChartCategoryAxisX::calculateLayout() const
             {
                 QCategoryAxis *axis = qobject_cast<QCategoryAxis *>(m_chartAxis);
                 int tickCount = axis->intervalsLabels().count() + 1;
                 return points;
             }
-            void ChartIntervalAxisX::updateGeometry()
+            void ChartCategoryAxisX::updateGeometry()
             {
                 const QVector<qreal>& layout = ChartAxis::layout();
                 }
             }
-            void ChartIntervalAxisX::handleAxisUpdated()
+            void ChartCategoryAxisX::handleAxisUpdated()
             {
                 updateGeometry();
                 ChartAxis::handleAxisUpdated();

src/axis/categoryaxis/chartcategoryaxisx_p.h ~~src/axis/intervalsaxis/chartintervalsaxisx_p.h~~ renamed +3 -3

             class QAbstractAxis;
             class ChartPresenter;
-            class ChartIntervalAxisX : public ChartAxis
+            class ChartCategoryAxisX : public ChartAxis
             {
             public:
-                ChartIntervalAxisX(QAbstractAxis *axis, ChartPresenter *presenter);
+                ChartCategoryAxisX(QAbstractAxis *axis, ChartPresenter *presenter);
-                ~ChartIntervalAxisX();
+                ~ChartCategoryAxisX();
                 AxisType axisType() const { return X_AXIS;}

src/axis/categoryaxis/chartcategoryaxisy.cpp ~~src/axis/intervalsaxis/chartintervalsaxisy.cpp~~ renamed +7 -7

             **
             ****************************************************************************/
-            #include "chartintervalsaxisy_p.h"
+            #include "chartcategoryaxisy_p.h"
-            #include "qintervalsaxis.h"
+            #include "qcategoryaxis.h"
             #include "qabstractaxis.h"
             #include "chartpresenter_p.h"
             #include <QGraphicsLayout>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
-            ChartIntervalAxisY::ChartIntervalAxisY(QAbstractAxis *axis,ChartPresenter *presenter) : ChartAxis(axis,presenter)
+            ChartCategoryAxisY::ChartCategoryAxisY(QAbstractAxis *axis,ChartPresenter *presenter) : ChartAxis(axis,presenter)
             {
             }
-            ChartIntervalAxisY::~ChartIntervalAxisY()
+            ChartCategoryAxisY::~ChartCategoryAxisY()
             {
             }
-            QVector<qreal> ChartIntervalAxisY::calculateLayout() const
+            QVector<qreal> ChartCategoryAxisY::calculateLayout() const
             {
                 QCategoryAxis *axis = qobject_cast<QCategoryAxis *>(m_chartAxis);
                 int tickCount = axis->intervalsLabels().count() + 1;
                 return points;
             }
-            void ChartIntervalAxisY::updateGeometry()
+            void ChartCategoryAxisY::updateGeometry()
             {
                 const QVector<qreal> &layout = ChartAxis::layout();
                 m_minWidth = 0;
                 }
             }
-            void ChartIntervalAxisY::handleAxisUpdated()
+            void ChartCategoryAxisY::handleAxisUpdated()
             {
                 updateGeometry();
                 ChartAxis::handleAxisUpdated();

src/axis/categoryaxis/chartcategoryaxisy_p.h ~~src/axis/intervalsaxis/chartintervalsaxisy_p.h~~ renamed +3 -3

             class QAbstractAxis;
             class ChartPresenter;
-            class ChartIntervalAxisY : public ChartAxis
+            class ChartCategoryAxisY : public ChartAxis
             {
             public:
-                ChartIntervalAxisY(QAbstractAxis *axis, ChartPresenter *presenter);
+                ChartCategoryAxisY(QAbstractAxis *axis, ChartPresenter *presenter);
-                ~ChartIntervalAxisY();
+                ~ChartCategoryAxisY();
                 AxisType axisType() const { return Y_AXIS;}

src/axis/categoryaxis/qcategoryaxis.cpp ~~src/axis/intervalsaxis/qintervalsaxis.cpp~~ renamed +9 -16

             **
             ****************************************************************************/
-            #include "qintervalsaxis.h"
+            #include "qcategoryaxis.h"
-            #include "qintervalsaxis_p.h"
+            #include "qcategoryaxis_p.h"
-            #include "chartintervalsaxisx_p.h"
+            #include "chartcategoryaxisx_p.h"
-            #include "chartintervalsaxisy_p.h"
+            #include "chartcategoryaxisy_p.h"
             #include <qmath.h>
             #include <QDebug>
             */
             /*!
-                \qmlclass Axis QCategoryAxis
+                \qmlclass CategoryAxis QCategoryAxis
                 \brief The Axis element is used for manipulating chart's axes.
-                Axis can be setup to show axis line with tick marks, grid lines and shades.
-                To access Axes you can use ChartView API. For example:
-                \code
-                // TODO :)
-                \endcode
             */
             /*!
             {
                 Q_Q(QCategoryAxis);
                 if(m_orientation == Qt::Vertical){
-                    return new ChartIntervalAxisY(q,presenter);
+                    return new ChartCategoryAxisY(q,presenter);
                 }else{
-                    return new ChartIntervalAxisX(q,presenter);
+                    return new ChartCategoryAxisX(q,presenter);
                 }
             }
-            #include "moc_qintervalsaxis.cpp"
+            #include "moc_qcategoryaxis.cpp"
-            #include "moc_qintervalsaxis_p.cpp"
+            #include "moc_qcategoryaxis_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/axis/categoryaxis/qcategoryaxis.h ~~src/axis/intervalsaxis/qintervalsaxis.h~~ renamed 0 0

NO CONTENT: file renamed from src/axis/intervalsaxis/qintervalsaxis.h to src/axis/categoryaxis/qcategoryaxis.h

src/axis/categoryaxis/qcategoryaxis_p.h ~~src/axis/intervalsaxis/qintervalsaxis_p.h~~ renamed +1 -1

             #ifndef QCATEGORYAXIS_P_H
             #define QCATEGORYAXIS_P_H
-            #include "qintervalsaxis.h"
+            #include "qcategoryaxis.h"
             #include "qvalueaxis_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

src/chartdataset.cpp +1 -1

             #include "qvalueaxis.h"
             #include "qbarcategoryaxis.h"
             #include "qvalueaxis_p.h"
-            #include "qintervalsaxis.h"
+            #include "qcategoryaxis.h"
             #include "qdatetimeaxis.h"
             #include "qabstractseries_p.h"
             #include "qabstractbarseries.h"

tests/auto/auto.pro +1 -1

                        qhorizontalstackedbarseries \
                        qhorizontalpercentbarseries \
                        qvalueaxis \
-                       qintervalsaxis \
+                       qcategoryaxis \
                        qdatetimeaxis \
                        qbarcategoryaxis

tests/auto/qcategoryaxis/qcategoryaxis.pro ~~tests/auto/qintervalsaxis/qintervalsaxis.pro~~ renamed +1 -1

                 error( "Couldn't find the auto.pri file!" )
             }
             HEADERS += ../qabstractaxis/tst_qabstractaxis.h
-            SOURCES += tst_qintervalsaxis.cpp ../qabstractaxis/tst_qabstractaxis.cpp
+            SOURCES += tst_qcategoryaxis.cpp ../qabstractaxis/tst_qabstractaxis.cpp

tests/auto/qcategoryaxis/tst_qcategoryaxis.cpp ~~tests/auto/qintervalsaxis/tst_qintervalsaxis.cpp~~ renamed +6 -6

              ****************************************************************************/
             #include "../qabstractaxis/tst_qabstractaxis.h"
-            #include "qintervalsaxis.h"
+            #include "qcategoryaxis.h"
             #include <qlineseries.h>
             class tst_QCategoryAxis: public tst_QAbstractAxis
                 void cleanup();
             private slots:
-                void qintervalsaxis_data();
+                void qcategoryaxis_data();
-                void qintervalsaxis();
+                void qcategoryaxis();
                 void max_raw_data();
                 void max_raw();
                 tst_QAbstractAxis::cleanup();
             }
-            void tst_QCategoryAxis::qintervalsaxis_data()
+            void tst_QCategoryAxis::qcategoryaxis_data()
             {
             }
-            void tst_QCategoryAxis::qintervalsaxis()
+            void tst_QCategoryAxis::qcategoryaxis()
             {
                 qabstractaxis();
             }
             QTEST_MAIN(tst_QCategoryAxis)
-            #include "tst_qintervalsaxis.moc"
+            #include "tst_qcategoryaxis.moc"

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