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

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

Renames header axisitem -> axis
Michal Klocek -
r959:6fbac6697666
parent child
Show More
Show file before | Show file after | Hide comments
@@ -21,7 +21,7
21 #ifndef AXISANIMATIONITEM_H_
21 #ifndef AXISANIMATIONITEM_H_
22 #define AXISANIMATIONITEM_H_
22 #define AXISANIMATIONITEM_H_
23
23
24 #include "axisitem_p.h"
24 #include "axis_p.h"
25 #include "chartanimation_p.h"
25 #include "chartanimation_p.h"
26
26
27
27
@@ -33,8 +33,8 public:
33 AxisAnimation(Axis *axis);
33 AxisAnimation(Axis *axis);
34 ~AxisAnimation();
34 ~AxisAnimation();
35 protected:
35 protected:
36 virtual QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress ) const;
36 QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress ) const;
37 virtual void updateCurrentValue(const QVariant &value );
37 void updateCurrentValue(const QVariant &value );
38 private:
38 private:
39 Axis *m_axis;
39 Axis *m_axis;
40 };
40 };
Show file before | Show file after | Hide comments
@@ -18,12 +18,11
18 **
18 **
19 ****************************************************************************/
19 ****************************************************************************/
20
20
21 #include "axisitem_p.h"
21 #include "axis_p.h"
22 #include "qchartaxis.h"
22 #include "qchartaxis.h"
23 #include "chartpresenter_p.h"
23 #include "chartpresenter_p.h"
24 #include "chartanimator_p.h"
24 #include "chartanimator_p.h"
25 #include <QPainter>
25 #include <QPainter>
26 #include <QDebug>
27 #include <cmath>
26 #include <cmath>
28
27
29 static int label_padding = 5;
28 static int label_padding = 5;
@@ -460,6 +459,6 void Axis::axisSelected()
460 }
459 }
461
460
462 //TODO "nice numbers algorithm"
461 //TODO "nice numbers algorithm"
463 #include "moc_axisitem_p.cpp"
462 #include "moc_axis_p.cpp"
464
463
465 QTCOMMERCIALCHART_END_NAMESPACE
464 QTCOMMERCIALCHART_END_NAMESPACE
Show file before | Show file after | Hide comments
@@ -2,12 +2,12 INCLUDEPATH += $$PWD
2 DEPENDPATH += $$PWD
2 DEPENDPATH += $$PWD
3
3
4 SOURCES += \
4 SOURCES += \
5 $$PWD/axisitem.cpp \
5 $$PWD/axis.cpp \
6 $$PWD/qchartaxis.cpp \
6 $$PWD/qchartaxis.cpp \
7 $$PWD/qchartaxiscategories.cpp
7 $$PWD/qchartaxiscategories.cpp
8
8
9 PRIVATE_HEADERS += \
9 PRIVATE_HEADERS += \
10 $$PWD/axisitem_p.h
10 $$PWD/axis_p.h
11
11
12 PUBLIC_HEADERS += \
12 PUBLIC_HEADERS += \
13 $$PWD/qchartaxis.h \
13 $$PWD/qchartaxis.h \
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from src/axis/axisitem_p.h to src/axis/axis_p.h
NO CONTENT: file renamed from src/axis/axisitem_p.h to src/axis/axis_p.h
Show file before | Show file after | Hide comments
@@ -27,7 +27,7
27 #include "chartanimator_p.h"
27 #include "chartanimator_p.h"
28 #include "qseries_p.h"
28 #include "qseries_p.h"
29 #include "qareaseries.h"
29 #include "qareaseries.h"
30 #include "axisitem_p.h"
30 #include "axis_p.h"
31 #include "areachartitem_p.h"
31 #include "areachartitem_p.h"
32
32
33 QTCOMMERCIALCHART_BEGIN_NAMESPACE
33 QTCOMMERCIALCHART_BEGIN_NAMESPACE
Show file before | Show file after | Hide comments
@@ -38,7 +38,7
38 #include "qsplineseries.h"
38 #include "qsplineseries.h"
39
39
40 //items
40 //items
41 #include "axisitem_p.h"
41 #include "axis_p.h"
42 #include "barchartitem_p.h"
42 #include "barchartitem_p.h"
43 #include "stackedbarchartitem_p.h"
43 #include "stackedbarchartitem_p.h"
44 #include "percentbarchartitem_p.h"
44 #include "percentbarchartitem_p.h"
General Comments 0
You need to be logged in to leave comments. Login now