##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

renamed QBarCategoryAxis related files
Marek Rosa -
r1810:62c8384299b9
parent child
Show More
Side by Side Unified
Context file:
r1810:62c8384299b9 Loading diff...:
Show file before | Show file after | Hide comments
@@ -26,7 +26,7
26 #include "declarativepieseries.h"
26 #include "declarativepieseries.h"
27 #include "declarativesplineseries.h"
27 #include "declarativesplineseries.h"
28 #include "declarativescatterseries.h"
28 #include "declarativescatterseries.h"
29 #include "qbarcategoriesaxis.h"
29 #include "qbarcategoryaxis.h"
30
30
31 QTCOMMERCIALCHART_BEGIN_NAMESPACE
31 QTCOMMERCIALCHART_BEGIN_NAMESPACE
32
32
Show file before | Show file after | Hide comments
@@ -23,7 +23,7
23 #include "qchart.h"
23 #include "qchart.h"
24 #include "qabstractaxis.h"
24 #include "qabstractaxis.h"
25 #include "qvalueaxis.h"
25 #include "qvalueaxis.h"
26 #include "qbarcategoriesaxis.h"
26 #include "qbarcategoryaxis.h"
27 #include "declarativechart.h"
27 #include "declarativechart.h"
28 #include "declarativexypoint.h"
28 #include "declarativexypoint.h"
29 #include "declarativelineseries.h"
29 #include "declarativelineseries.h"
Show file before | Show file after | Hide comments
@@ -2,13 +2,13
2
2
3 INCLUDEPATH += $$PWD \
3 INCLUDEPATH += $$PWD \
4 $$PWD/valueaxis \
4 $$PWD/valueaxis \
5 $$PWD/categoriesaxis \
5 $$PWD/barcategoryaxis \
6 $$PWD/intervalsaxis \
6 $$PWD/intervalsaxis \
7 $$PWD/datetimeaxis
7 $$PWD/datetimeaxis
8
8
9 DEPENDPATH += $$PWD \
9 DEPENDPATH += $$PWD \
10 $$PWD/valueaxis \
10 $$PWD/valueaxis \
11 $$PWD/categoriesaxis \
11 $$PWD/barcategoryaxis \
12 $$PWD/intervalsaxis \
12 $$PWD/intervalsaxis \
13 $$PWD/datetimeaxis
13 $$PWD/datetimeaxis
14
14
@@ -18,9 +18,9 SOURCES += \
18 $$PWD/valueaxis/chartvalueaxisx.cpp \
18 $$PWD/valueaxis/chartvalueaxisx.cpp \
19 $$PWD/valueaxis/chartvalueaxisy.cpp \
19 $$PWD/valueaxis/chartvalueaxisy.cpp \
20 $$PWD/valueaxis/qvalueaxis.cpp \
20 $$PWD/valueaxis/qvalueaxis.cpp \
21 $$PWD/categoriesaxis/chartcategoriesaxisx.cpp \
21 $$PWD/barcategoryaxis/chartbarcategoryaxisx.cpp \
22 $$PWD/categoriesaxis/chartcategoriesaxisy.cpp \
22 $$PWD/barcategoryaxis/chartbarcategoryaxisy.cpp \
23 $$PWD/categoriesaxis/qbarcategoriesaxis.cpp \
23 $$PWD/barcategoryaxis/qbarcategoryaxis.cpp \
24 $$PWD/intervalsaxis/chartintervalsaxisx.cpp \
24 $$PWD/intervalsaxis/chartintervalsaxisx.cpp \
25 $$PWD/intervalsaxis/chartintervalsaxisy.cpp \
25 $$PWD/intervalsaxis/chartintervalsaxisy.cpp \
26 $$PWD/intervalsaxis/qintervalsaxis.cpp \
26 $$PWD/intervalsaxis/qintervalsaxis.cpp \
@@ -34,9 +34,9 PRIVATE_HEADERS += \
34 $$PWD/valueaxis/chartvalueaxisx_p.h \
34 $$PWD/valueaxis/chartvalueaxisx_p.h \
35 $$PWD/valueaxis/chartvalueaxisy_p.h \
35 $$PWD/valueaxis/chartvalueaxisy_p.h \
36 $$PWD/valueaxis/qvalueaxis_p.h \
36 $$PWD/valueaxis/qvalueaxis_p.h \
37 $$PWD/categoriesaxis/chartcategoriesaxisx_p.h \
37 $$PWD/barcategoryaxis/chartbarcategoryaxisx_p.h \
38 $$PWD/categoriesaxis/chartcategoriesaxisy_p.h \
38 $$PWD/barcategoryaxis/chartbarcategoryaxisy_p.h \
39 $$PWD/categoriesaxis/qbarcategoriesaxis_p.h \
39 $$PWD/barcategoryaxis/qbarcategoryaxis_p.h \
40 $$PWD/intervalsaxis/chartintervalsaxisx_p.h \
40 $$PWD/intervalsaxis/chartintervalsaxisx_p.h \
41 $$PWD/intervalsaxis/chartintervalsaxisy_p.h \
41 $$PWD/intervalsaxis/chartintervalsaxisy_p.h \
42 $$PWD/intervalsaxis/qintervalsaxis_p.h \
42 $$PWD/intervalsaxis/qintervalsaxis_p.h \
@@ -47,6 +47,6 PRIVATE_HEADERS += \
47 PUBLIC_HEADERS += \
47 PUBLIC_HEADERS += \
48 $$PWD/qabstractaxis.h \
48 $$PWD/qabstractaxis.h \
49 $$PWD/valueaxis/qvalueaxis.h \
49 $$PWD/valueaxis/qvalueaxis.h \
50 $$PWD/categoriesaxis/qbarcategoriesaxis.h \
50 $$PWD/barcategoryaxis/qbarcategoryaxis.h \
51 $$PWD/intervalsaxis/qintervalsaxis.h \
51 $$PWD/intervalsaxis/qintervalsaxis.h \
52 $$PWD/datetimeaxis/qdatetimeaxis.h
52 $$PWD/datetimeaxis/qdatetimeaxis.h
Show file before | Show file after | Hide comments
@@ -18,9 +18,9
18 **
18 **
19 ****************************************************************************/
19 ****************************************************************************/
20
20
21 #include "chartcategoriesaxisx_p.h"
21 #include "chartbarcategoryaxisx_p.h"
22 #include "chartpresenter_p.h"
22 #include "chartpresenter_p.h"
23 #include "qbarcategoriesaxis_p.h"
23 #include "qbarcategoryaxis_p.h"
24 #include <QDebug>
24 #include <QDebug>
25 #include <qmath.h>
25 #include <qmath.h>
26
26
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from src/axis/categoriesaxis/chartcategoriesaxisx_p.h to src/axis/barcategoryaxis/chartbarcategoryaxisx_p.h
NO CONTENT: file renamed from src/axis/categoriesaxis/chartcategoriesaxisx_p.h to src/axis/barcategoryaxis/chartbarcategoryaxisx_p.h
Show file before | Show file after | Hide comments
@@ -18,9 +18,9
18 **
18 **
19 ****************************************************************************/
19 ****************************************************************************/
20
20
21 #include "chartcategoriesaxisy_p.h"
21 #include "chartbarcategoryaxisy_p.h"
22 #include "chartpresenter_p.h"
22 #include "chartpresenter_p.h"
23 #include "qbarcategoriesaxis_p.h"
23 #include "qbarcategoryaxis_p.h"
24 #include <qmath.h>
24 #include <qmath.h>
25
25
26 static int label_padding = 5;
26 static int label_padding = 5;
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from src/axis/categoriesaxis/chartcategoriesaxisy_p.h to src/axis/barcategoryaxis/chartbarcategoryaxisy_p.h
NO CONTENT: file renamed from src/axis/categoriesaxis/chartcategoriesaxisy_p.h to src/axis/barcategoryaxis/chartbarcategoryaxisy_p.h
Show file before | Show file after | Hide comments
@@ -18,10 +18,10
18 **
18 **
19 ****************************************************************************/
19 ****************************************************************************/
20
20
21 #include "qbarcategoriesaxis.h"
21 #include "qbarcategoryaxis.h"
22 #include "qbarcategoriesaxis_p.h"
22 #include "qbarcategoryaxis_p.h"
23 #include "chartcategoriesaxisx_p.h"
23 #include "chartbarcategoryaxisx_p.h"
24 #include "chartcategoriesaxisy_p.h"
24 #include "chartbarcategoryaxisy_p.h"
25 #include "domain_p.h"
25 #include "domain_p.h"
26 #include "chartdataset_p.h"
26 #include "chartdataset_p.h"
27 #include <qmath.h>
27 #include <qmath.h>
@@ -465,7 +465,7 void QBarCategoryAxisPrivate::intializeDomain(Domain* domain)
465 }
465 }
466 }
466 }
467
467
468 #include "moc_qbarcategoriesaxis.cpp"
468 #include "moc_qbarcategoryaxis.cpp"
469 #include "moc_qbarcategoriesaxis_p.cpp"
469 #include "moc_qbarcategoryaxis_p.cpp"
470
470
471 QTCOMMERCIALCHART_END_NAMESPACE
471 QTCOMMERCIALCHART_END_NAMESPACE
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from src/axis/categoriesaxis/qbarcategoriesaxis.h to src/axis/barcategoryaxis/qbarcategoryaxis.h
NO CONTENT: file renamed from src/axis/categoriesaxis/qbarcategoriesaxis.h to src/axis/barcategoryaxis/qbarcategoryaxis.h
Show file before | Show file after | Hide comments
@@ -30,7 +30,7
30 #ifndef QBARCATEGORIESAXIS_P_H
30 #ifndef QBARCATEGORIESAXIS_P_H
31 #define QBARCATEGORIESAXIS_P_H
31 #define QBARCATEGORIESAXIS_P_H
32
32
33 #include "qbarcategoriesaxis.h"
33 #include "qbarcategoryaxis.h"
34 #include "qabstractaxis_p.h"
34 #include "qabstractaxis_p.h"
35
35
36 QTCOMMERCIALCHART_BEGIN_NAMESPACE
36 QTCOMMERCIALCHART_BEGIN_NAMESPACE
Show file before | Show file after | Hide comments
@@ -22,7 +22,7
22 #include "qhorizontalbarseries_p.h"
22 #include "qhorizontalbarseries_p.h"
23 #include "horizontalbarchartitem_p.h"
23 #include "horizontalbarchartitem_p.h"
24 #include "horizontalbaranimation_p.h"
24 #include "horizontalbaranimation_p.h"
25 #include "qbarcategoriesaxis.h"
25 #include "qbarcategoryaxis.h"
26
26
27 #include "chartdataset_p.h"
27 #include "chartdataset_p.h"
28 #include "charttheme_p.h"
28 #include "charttheme_p.h"
Show file before | Show file after | Hide comments
@@ -27,7 +27,7
27 #include "chartdataset_p.h"
27 #include "chartdataset_p.h"
28 #include "charttheme_p.h"
28 #include "charttheme_p.h"
29 #include "qvalueaxis.h"
29 #include "qvalueaxis.h"
30 #include "qbarcategoriesaxis.h"
30 #include "qbarcategoryaxis.h"
31
31
32 QTCOMMERCIALCHART_BEGIN_NAMESPACE
32 QTCOMMERCIALCHART_BEGIN_NAMESPACE
33
33
Show file before | Show file after | Hide comments
@@ -25,7 +25,7
25 #include "charttheme_p.h"
25 #include "charttheme_p.h"
26 #include "baranimation_p.h"
26 #include "baranimation_p.h"
27 #include "qvalueaxis.h"
27 #include "qvalueaxis.h"
28 #include "qbarcategoriesaxis.h"
28 #include "qbarcategoryaxis.h"
29
29
30 QTCOMMERCIALCHART_BEGIN_NAMESPACE
30 QTCOMMERCIALCHART_BEGIN_NAMESPACE
31
31
Show file before | Show file after | Hide comments
@@ -21,7 +21,7
21 #include "chartdataset_p.h"
21 #include "chartdataset_p.h"
22 #include "qchart.h"
22 #include "qchart.h"
23 #include "qvalueaxis.h"
23 #include "qvalueaxis.h"
24 #include "qbarcategoriesaxis.h"
24 #include "qbarcategoryaxis.h"
25 #include "qvalueaxis_p.h"
25 #include "qvalueaxis_p.h"
26 #include "qintervalsaxis.h"
26 #include "qintervalsaxis.h"
27 #include "qdatetimeaxis.h"
27 #include "qdatetimeaxis.h"
Show file before | Show file after | Hide comments
@@ -23,7 +23,7 SUBDIRS += \
23 qvalueaxis \
23 qvalueaxis \
24 qintervalsaxis \
24 qintervalsaxis \
25 qdatetimeaxis \
25 qdatetimeaxis \
26 qbarcategoriesaxis
26 qbarcategoryaxis
27
27
28 test_private:{
28 test_private:{
29 SUBDIRS += domain chartdataset
29 SUBDIRS += domain chartdataset
Show file before | Show file after | Hide comments
@@ -21,7 +21,7
21 #include <QtTest/QtTest>
21 #include <QtTest/QtTest>
22 #include <qabstractaxis.h>
22 #include <qabstractaxis.h>
23 #include <qvalueaxis.h>
23 #include <qvalueaxis.h>
24 #include <qbarcategoriesaxis.h>
24 #include <qbarcategoryaxis.h>
25 #include <qlineseries.h>
25 #include <qlineseries.h>
26 #include <qareaseries.h>
26 #include <qareaseries.h>
27 #include <qscatterseries.h>
27 #include <qscatterseries.h>
Show file before | Show file after | Hide comments
@@ -2,4 +2,4
2 error( "Couldn't find the auto.pri file!" )
2 error( "Couldn't find the auto.pri file!" )
3 }
3 }
4 HEADERS += ../qabstractaxis/tst_qabstractaxis.h
4 HEADERS += ../qabstractaxis/tst_qabstractaxis.h
5 SOURCES += tst_qbarcategoriesaxis.cpp ../qabstractaxis/tst_qabstractaxis.cpp
5 SOURCES += tst_qbarcategoryaxis.cpp ../qabstractaxis/tst_qabstractaxis.cpp
Show file before | Show file after | Hide comments
@@ -21,7 +21,7
21 #include "../qabstractaxis/tst_qabstractaxis.h"
21 #include "../qabstractaxis/tst_qabstractaxis.h"
22 #include <qbarseries.h>
22 #include <qbarseries.h>
23 #include <qbarset.h>
23 #include <qbarset.h>
24 #include <qbarcategoriesaxis.h>
24 #include <qbarcategoryaxis.h>
25
25
26 class tst_QBarCategoriesAxis: public tst_QAbstractAxis
26 class tst_QBarCategoriesAxis: public tst_QAbstractAxis
27 {
27 {
@@ -34,8 +34,8 public slots:
34 void cleanup();
34 void cleanup();
35
35
36 private slots:
36 private slots:
37 void qbarcategoriesaxis_data();
37 void qbarcategoryaxis_data();
38 void qbarcategoriesaxis();
38 void qbarcategoryaxis();
39
39
40 void append_data();
40 void append_data();
41 void append();
41 void append();
@@ -129,11 +129,11 void tst_QBarCategoriesAxis::cleanup()
129 tst_QAbstractAxis::cleanup();
129 tst_QAbstractAxis::cleanup();
130 }
130 }
131
131
132 void tst_QBarCategoriesAxis::qbarcategoriesaxis_data()
132 void tst_QBarCategoriesAxis::qbarcategoryaxis_data()
133 {
133 {
134 }
134 }
135
135
136 void tst_QBarCategoriesAxis::qbarcategoriesaxis()
136 void tst_QBarCategoriesAxis::qbarcategoryaxis()
137 {
137 {
138 qabstractaxis();
138 qabstractaxis();
139 QBarCategoryAxis axis;
139 QBarCategoryAxis axis;
@@ -645,5 +645,5 void tst_QBarCategoriesAxis::autoscale()
645
645
646
646
647 QTEST_MAIN(tst_QBarCategoriesAxis)
647 QTEST_MAIN(tst_QBarCategoriesAxis)
648 #include "tst_qbarcategoriesaxis.moc"
648 #include "tst_qbarcategoryaxis.moc"
649
649
Show file before | Show file after | Hide comments
@@ -30,7 +30,7
30 #include <qpercentbarseries.h>
30 #include <qpercentbarseries.h>
31 #include <qstackedbarseries.h>
31 #include <qstackedbarseries.h>
32 #include <qvalueaxis.h>
32 #include <qvalueaxis.h>
33 #include <qbarcategoriesaxis.h>
33 #include <qbarcategoryaxis.h>
34
34
35 QTCOMMERCIALCHART_USE_NAMESPACE
35 QTCOMMERCIALCHART_USE_NAMESPACE
36
36
General Comments 0
You need to be logged in to leave comments. Login now