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

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

Changes QChartAxis -> QAxis
Michal Klocek -
r1006:a8ef6d6db8bf
parent child
Show More
Side by Side Unified
Context file:
r1006:a8ef6d6db8bf Loading diff...:
Show file before | Show file after | Hide comments
@@ -19,7 +19,7
19 19 ****************************************************************************/
20 20
21 21 #include "chart.h"
22 #include <QChartAxis>
22 #include <QAxis>
23 23 #include <QSplineSeries>
24 24 #include <QTime>
25 25
Show file before | Show file after | Hide comments
@@ -60,8 +60,8 int main(int argc, char *argv[])
60 60 //![2]
61 61
62 62 //![3]
63 QChartAxis* axisX = chart->axisX();
64 QChartAxis* axisY = chart->axisY();
63 QAxis* axisX = chart->axisX();
64 QAxis* axisY = chart->axisY();
65 65
66 66 // Customize axis label font
67 67 QFont labelsFont;
Show file before | Show file after | Hide comments
@@ -19,7 +19,7
19 19 ****************************************************************************/
20 20
21 21 #include "drilldownchart.h"
22 #include <QChartAxis>
22 #include <QAxis>
23 23
24 24 QTCOMMERCIALCHART_USE_NAMESPACE
25 25
Show file before | Show file after | Hide comments
@@ -26,7 +26,7 Q_DECLARE_METATYPE(QVector<qreal>)
26 26 QTCOMMERCIALCHART_BEGIN_NAMESPACE
27 27
28 28
29 AxisAnimation::AxisAnimation(Axis *axis): ChartAnimation(axis),
29 AxisAnimation::AxisAnimation(ChartAxis *axis): ChartAnimation(axis),
30 30 m_axis(axis)
31 31 {
32 32 }
Show file before | Show file after | Hide comments
@@ -21,7 +21,7
21 21 #ifndef AXISANIMATION_H
22 22 #define AXISANIMATION_H
23 23
24 #include "axis_p.h"
24 #include "chartaxis_p.h"
25 25 #include "chartanimation_p.h"
26 26
27 27
@@ -30,13 +30,13 QTCOMMERCIALCHART_BEGIN_NAMESPACE
30 30 class AxisAnimation: public ChartAnimation
31 31 {
32 32 public:
33 AxisAnimation(Axis *axis);
33 AxisAnimation(ChartAxis *axis);
34 34 ~AxisAnimation();
35 35 protected:
36 36 QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress ) const;
37 37 void updateCurrentValue(const QVariant &value );
38 38 private:
39 Axis *m_axis;
39 ChartAxis *m_axis;
40 40 };
41 41
42 42 QTCOMMERCIALCHART_END_NAMESPACE
Show file before | Show file after | Hide comments
@@ -48,7 +48,7 ChartAnimator::~ChartAnimator()
48 48 {
49 49 }
50 50
51 void ChartAnimator::addAnimation(Axis *item)
51 void ChartAnimator::addAnimation(ChartAxis *item)
52 52 {
53 53 ChartAnimation *animation = m_animations.value(item);
54 54
@@ -127,7 +127,7 void ChartAnimator::removeAnimation(Chart *item)
127 127 m_animations.remove(item);
128 128 }
129 129
130 void ChartAnimator::updateLayout(Axis *item , QVector<qreal> &newLayout)
130 void ChartAnimator::updateLayout(ChartAxis *item , QVector<qreal> &newLayout)
131 131 {
132 132 AxisAnimation *animation = static_cast<AxisAnimation*>(m_animations.value(item));
133 133
@@ -144,13 +144,13 void ChartAnimator::updateLayout(Axis *item , QVector<qreal> &newLayout)
144 144 oldLayout.resize(newLayout.count());
145 145
146 146 for(int i = 0, j = oldLayout.count() - 1; i < (oldLayout.count() + 1) / 2; ++i, --j) {
147 oldLayout[i] = item->axisType() == Axis::X_AXIS ? rect.left() : rect.bottom();
148 oldLayout[j] = item->axisType() == Axis::X_AXIS ? rect.right() : rect.top();
147 oldLayout[i] = item->axisType() == ChartAxis::X_AXIS ? rect.left() : rect.bottom();
148 oldLayout[j] = item->axisType() == ChartAxis::X_AXIS ? rect.right() : rect.top();
149 149 }
150 150 }
151 151 break;
152 152 case ZoomInState: {
153 int index = qMin(oldLayout.count() * (item->axisType() == Axis::X_AXIS ? m_point.x() : (1 - m_point.y())), newLayout.count() - 1.0);
153 int index = qMin(oldLayout.count() * (item->axisType() == ChartAxis::X_AXIS ? m_point.x() : (1 - m_point.y())), newLayout.count() - 1.0);
154 154 oldLayout.resize(newLayout.count());
155 155
156 156 for(int i = 0; i < oldLayout.count(); i++)
@@ -177,7 +177,7 void ChartAnimator::updateLayout(Axis *item , QVector<qreal> &newLayout)
177 177 oldLayout.resize(newLayout.count());
178 178 QRectF rect = item->geometry();
179 179 for(int i = 0, j = oldLayout.count() - 1; i < oldLayout.count(); ++i, --j)
180 oldLayout[i] = item->axisType() == Axis::X_AXIS ? rect.left() : rect.top();
180 oldLayout[i] = item->axisType() == ChartAxis::X_AXIS ? rect.left() : rect.top();
181 181 }
182 182 break;
183 183 }
Show file before | Show file after | Hide comments
@@ -30,7 +30,7
30 30 QTCOMMERCIALCHART_BEGIN_NAMESPACE
31 31
32 32 class ChartItem;
33 class Axis;
33 class ChartAxis;
34 34 class AreaChartItem;
35 35 class SplineChartItem;
36 36 class ScatterChartItem;
@@ -46,7 +46,7 public:
46 46 ChartAnimator(QObject *parent = 0);
47 47 virtual ~ChartAnimator();
48 48
49 void addAnimation(Axis *item);
49 void addAnimation(ChartAxis *item);
50 50 void addAnimation(PieChartItem *item);
51 51 void addAnimation(ScatterChartItem *item);
52 52 void addAnimation(LineChartItem *item);
@@ -57,7 +57,7 public:
57 57 void animationStarted();
58 58 void updateLayout(XYChartItem *item, QVector<QPointF> &oldLayout, QVector<QPointF> &newLayout, int index);
59 59 void updateLayout(SplineChartItem *item, QVector<QPointF> &oldPoints, QVector<QPointF> &newPoints, QVector<QPointF> &oldControlPoints, QVector<QPointF> &newContorlPoints, int index);
60 void updateLayout(Axis *item, QVector<qreal> &layout);
60 void updateLayout(ChartAxis *item, QVector<qreal> &layout);
61 61
62 62 void addAnimation(PieChartItem *item, QPieSlice *slice, const PieSliceData &sliceData, bool isEmpty);
63 63 void removeAnimation(PieChartItem *item, QPieSlice *slice);
Show file before | Show file after | Hide comments
@@ -2,15 +2,15 INCLUDEPATH += $$PWD
2 2 DEPENDPATH += $$PWD
3 3
4 4 SOURCES += \
5 $$PWD/axis.cpp \
6 $$PWD/qchartaxis.cpp \
5 $$PWD/chartaxis.cpp \
6 $$PWD/qaxis.cpp \
7 7 $$PWD/qchartaxiscategories.cpp
8 8
9 9 PRIVATE_HEADERS += \
10 $$PWD/axis_p.h \
11 $$PWD/qchartaxis_p.h \
10 $$PWD/chartaxis_p.h \
11 $$PWD/qaxis_p.h \
12 12 $$PWD/qchartaxiscategories_p.h
13 13
14 14 PUBLIC_HEADERS += \
15 $$PWD/qchartaxis.h \
15 $$PWD/qaxis.h \
16 16 $$PWD/qchartaxiscategories.h No newline at end of file
Show file before | Show file after | Hide comments
@@ -18,9 +18,9
18 18 **
19 19 ****************************************************************************/
20 20
21 #include "axis_p.h"
22 #include "qchartaxis.h"
23 #include "qchartaxis_p.h"
21 #include "chartaxis_p.h"
22 #include "qaxis.h"
23 #include "qaxis_p.h"
24 24 #include "qchartaxiscategories_p.h"
25 25 #include "chartpresenter_p.h"
26 26 #include "chartanimator_p.h"
@@ -32,7 +32,7 static int label_padding = 5;
32 32
33 33 QTCOMMERCIALCHART_BEGIN_NAMESPACE
34 34
35 Axis::Axis(QChartAxis *axis,ChartPresenter *presenter,AxisType type) : Chart(presenter),
35 ChartAxis::ChartAxis(QAxis *axis,ChartPresenter *presenter,AxisType type) : Chart(presenter),
36 36 m_chartAxis(axis),
37 37 m_type(type),
38 38 m_labelsAngle(0),
@@ -57,11 +57,11 Axis::Axis(QChartAxis *axis,ChartPresenter *presenter,AxisType type) : Chart(pre
57 57 handleAxisUpdated();
58 58 }
59 59
60 Axis::~Axis()
60 ChartAxis::~ChartAxis()
61 61 {
62 62 }
63 63
64 void Axis::createItems(int count)
64 void ChartAxis::createItems(int count)
65 65 {
66 66
67 67 if (m_axis->children().size() == 0)
@@ -74,7 +74,7 void Axis::createItems(int count)
74 74 }
75 75 }
76 76
77 void Axis::deleteItems(int count)
77 void ChartAxis::deleteItems(int count)
78 78 {
79 79 QList<QGraphicsItem *> lines = m_grid->childItems();
80 80 QList<QGraphicsItem *> labels = m_labels->childItems();
@@ -89,7 +89,7 void Axis::deleteItems(int count)
89 89 }
90 90 }
91 91
92 void Axis::updateLayout(QVector<qreal> &layout)
92 void ChartAxis::updateLayout(QVector<qreal> &layout)
93 93 {
94 94 if (animator()) {
95 95 animator()->updateLayout(this,layout);
@@ -98,7 +98,7 void Axis::updateLayout(QVector<qreal> &layout)
98 98 }
99 99 }
100 100
101 bool Axis::createLabels(QStringList &labels,qreal min, qreal max,int ticks) const
101 bool ChartAxis::createLabels(QStringList &labels,qreal min, qreal max,int ticks) const
102 102 {
103 103 Q_ASSERT(max>=min);
104 104 Q_ASSERT(ticks>1);
@@ -132,47 +132,47 bool Axis::createLabels(QStringList &labels,qreal min, qreal max,int ticks) cons
132 132 return category;
133 133 }
134 134
135 void Axis::setAxisOpacity(qreal opacity)
135 void ChartAxis::setAxisOpacity(qreal opacity)
136 136 {
137 137 m_axis->setOpacity(opacity);
138 138 }
139 139
140 qreal Axis::axisOpacity() const
140 qreal ChartAxis::axisOpacity() const
141 141 {
142 142 return m_axis->opacity();
143 143 }
144 144
145 void Axis::setGridOpacity(qreal opacity)
145 void ChartAxis::setGridOpacity(qreal opacity)
146 146 {
147 147 m_grid->setOpacity(opacity);
148 148 }
149 149
150 qreal Axis::gridOpacity() const
150 qreal ChartAxis::gridOpacity() const
151 151 {
152 152 return m_grid->opacity();
153 153 }
154 154
155 void Axis::setLabelsOpacity(qreal opacity)
155 void ChartAxis::setLabelsOpacity(qreal opacity)
156 156 {
157 157 m_labels->setOpacity(opacity);
158 158 }
159 159
160 qreal Axis::labelsOpacity() const
160 qreal ChartAxis::labelsOpacity() const
161 161 {
162 162 return m_labels->opacity();
163 163 }
164 164
165 void Axis::setShadesOpacity(qreal opacity)
165 void ChartAxis::setShadesOpacity(qreal opacity)
166 166 {
167 167 m_shades->setOpacity(opacity);
168 168 }
169 169
170 qreal Axis::shadesOpacity() const
170 qreal ChartAxis::shadesOpacity() const
171 171 {
172 172 return m_shades->opacity();
173 173 }
174 174
175 void Axis::setLabelsAngle(int angle)
175 void ChartAxis::setLabelsAngle(int angle)
176 176 {
177 177 foreach(QGraphicsItem* item , m_labels->childItems()) {
178 178 item->setRotation(angle);
@@ -181,56 +181,56 void Axis::setLabelsAngle(int angle)
181 181 m_labelsAngle=angle;
182 182 }
183 183
184 void Axis::setLabelsPen(const QPen &pen)
184 void ChartAxis::setLabelsPen(const QPen &pen)
185 185 {
186 186 foreach(QGraphicsItem* item , m_labels->childItems()) {
187 187 static_cast<QGraphicsSimpleTextItem*>(item)->setPen(pen);
188 188 }
189 189 }
190 190
191 void Axis::setLabelsBrush(const QBrush &brush)
191 void ChartAxis::setLabelsBrush(const QBrush &brush)
192 192 {
193 193 foreach(QGraphicsItem* item , m_labels->childItems()) {
194 194 static_cast<QGraphicsSimpleTextItem*>(item)->setBrush(brush);
195 195 }
196 196 }
197 197
198 void Axis::setLabelsFont(const QFont &font)
198 void ChartAxis::setLabelsFont(const QFont &font)
199 199 {
200 200 foreach(QGraphicsItem* item , m_labels->childItems()) {
201 201 static_cast<QGraphicsSimpleTextItem*>(item)->setFont(font);
202 202 }
203 203 }
204 204
205 void Axis::setShadesBrush(const QBrush &brush)
205 void ChartAxis::setShadesBrush(const QBrush &brush)
206 206 {
207 207 foreach(QGraphicsItem* item , m_shades->childItems()) {
208 208 static_cast<QGraphicsRectItem*>(item)->setBrush(brush);
209 209 }
210 210 }
211 211
212 void Axis::setShadesPen(const QPen &pen)
212 void ChartAxis::setShadesPen(const QPen &pen)
213 213 {
214 214 foreach(QGraphicsItem* item , m_shades->childItems()) {
215 215 static_cast<QGraphicsRectItem*>(item)->setPen(pen);
216 216 }
217 217 }
218 218
219 void Axis::setAxisPen(const QPen &pen)
219 void ChartAxis::setAxisPen(const QPen &pen)
220 220 {
221 221 foreach(QGraphicsItem* item , m_axis->childItems()) {
222 222 static_cast<QGraphicsLineItem*>(item)->setPen(pen);
223 223 }
224 224 }
225 225
226 void Axis::setGridPen(const QPen &pen)
226 void ChartAxis::setGridPen(const QPen &pen)
227 227 {
228 228 foreach(QGraphicsItem* item , m_grid->childItems()) {
229 229 static_cast<QGraphicsLineItem*>(item)->setPen(pen);
230 230 }
231 231 }
232 232
233 QVector<qreal> Axis::calculateLayout() const
233 QVector<qreal> ChartAxis::calculateLayout() const
234 234 {
235 235 Q_ASSERT(m_ticksCount>=2);
236 236
@@ -261,7 +261,7 QVector<qreal> Axis::calculateLayout() const
261 261 return points;
262 262 }
263 263
264 void Axis::setLayout(QVector<qreal> &layout)
264 void ChartAxis::setLayout(QVector<qreal> &layout)
265 265 {
266 266 int diff = m_layoutVector.size() - layout.size();
267 267
@@ -377,20 +377,20 void Axis::setLayout(QVector<qreal> &layout)
377 377
378 378 }
379 379
380 bool Axis::isEmpty()
380 bool ChartAxis::isEmpty()
381 381 {
382 382 return m_rect.isEmpty() || qFuzzyIsNull(m_min - m_max) || m_ticksCount==0;
383 383 }
384 384
385 385 //handlers
386 386
387 void Axis::handleAxisCategoriesUpdated()
387 void ChartAxis::handleAxisCategoriesUpdated()
388 388 {
389 389 if (isEmpty()) return;
390 390 updateLayout(m_layoutVector);
391 391 }
392 392
393 void Axis::handleAxisUpdated()
393 void ChartAxis::handleAxisUpdated()
394 394 {
395 395
396 396 if (isEmpty()) return;
@@ -430,7 +430,7 void Axis::handleAxisUpdated()
430 430
431 431 }
432 432
433 void Axis::handleRangeChanged(qreal min, qreal max,int tickCount)
433 void ChartAxis::handleRangeChanged(qreal min, qreal max,int tickCount)
434 434 {
435 435 if (qFuzzyIsNull(min - max) || tickCount < 2)
436 436 return;
@@ -445,7 +445,7 void Axis::handleRangeChanged(qreal min, qreal max,int tickCount)
445 445
446 446 }
447 447
448 void Axis::handleGeometryChanged(const QRectF &rect)
448 void ChartAxis::handleGeometryChanged(const QRectF &rect)
449 449 {
450 450 if(m_rect != rect)
451 451 {
@@ -456,11 +456,11 void Axis::handleGeometryChanged(const QRectF &rect)
456 456 }
457 457 }
458 458
459 void Axis::axisSelected()
459 void ChartAxis::axisSelected()
460 460 {
461 461 qDebug()<<"TODO: axis clicked";
462 462 }
463 463
464 #include "moc_axis_p.cpp"
464 #include "moc_chartaxis_p.cpp"
465 465
466 466 QTCOMMERCIALCHART_END_NAMESPACE
Show file before | Show file after | Hide comments
@@ -27,17 +27,17
27 27
28 28 QTCOMMERCIALCHART_BEGIN_NAMESPACE
29 29
30 class QChartAxis;
30 class QAxis;
31 31 class ChartPresenter;
32 32
33 class Axis : public Chart
33 class ChartAxis : public Chart
34 34 {
35 35 Q_OBJECT
36 36 public:
37 37 enum AxisType{X_AXIS,Y_AXIS};
38 38
39 Axis(QChartAxis *axis, ChartPresenter *presenter, AxisType type = X_AXIS);
40 ~Axis();
39 ChartAxis(QAxis *axis, ChartPresenter *presenter, AxisType type = X_AXIS);
40 ~ChartAxis();
41 41
42 42 AxisType axisType() const { return m_type; }
43 43
@@ -89,7 +89,7 private:
89 89 void axisSelected();
90 90
91 91 private:
92 QChartAxis* m_chartAxis;
92 QAxis* m_chartAxis;
93 93 AxisType m_type;
94 94 QRectF m_rect;
95 95 int m_labelsAngle;
@@ -111,7 +111,7 class AxisItem: public QGraphicsLineItem
111 111 {
112 112
113 113 public:
114 explicit AxisItem(Axis *axis, QGraphicsItem *parent = 0) : QGraphicsLineItem(parent), m_axis(axis) {}
114 explicit AxisItem(ChartAxis *axis, QGraphicsItem *parent = 0) : QGraphicsLineItem(parent), m_axis(axis) {}
115 115
116 116 protected:
117 117 void mousePressEvent(QGraphicsSceneMouseEvent *event)
@@ -129,12 +129,12 protected:
129 129 {
130 130 QPainterPath path = QGraphicsLineItem::shape();
131 131 QRectF rect = path.boundingRect();
132 path.addRect(rect.adjusted(0,0,m_axis->axisType()!=Axis::X_AXIS?8:0,m_axis->axisType()!=Axis::Y_AXIS?8:0));
132 path.addRect(rect.adjusted(0,0,m_axis->axisType()!=ChartAxis::X_AXIS?8:0,m_axis->axisType()!=ChartAxis::Y_AXIS?8:0));
133 133 return path;
134 134 }
135 135
136 136 private:
137 Axis* m_axis;
137 ChartAxis* m_axis;
138 138
139 139 };
140 140
Show file before | Show file after | Hide comments
@@ -18,8 +18,8
18 18 **
19 19 ****************************************************************************/
20 20
21 #include "qchartaxis.h"
22 #include "qchartaxis_p.h"
21 #include "qaxis.h"
22 #include "qaxis_p.h"
23 23
24 24 QTCOMMERCIALCHART_BEGIN_NAMESPACE
25 25
@@ -36,123 +36,123 QTCOMMERCIALCHART_BEGIN_NAMESPACE
36 36 */
37 37
38 38 /*!
39 \fn bool QChartAxis::isAxisVisible() const
39 \fn bool QAxis::isAxisVisible() const
40 40 \brief Returns if axis is visible
41 41 \sa setAxisVisible()
42 42 */
43 43
44 44 /*!
45 \fn QPen QChartAxis::axisPen() const
45 \fn QPen QAxis::axisPen() const
46 46 \brief Returns pen used to draw axis and ticks.
47 47 \sa setAxisPen()
48 48 */
49 49
50 50
51 51 /*!
52 \fn bool QChartAxis::isGridLineVisible() const
52 \fn bool QAxis::isGridLineVisible() const
53 53 \brief Returns if grid is visible
54 54 \sa setGridLineVisible()
55 55 */
56 56
57 57 /*!
58 \fn QPen QChartAxis::gridLinePen() const
58 \fn QPen QAxis::gridLinePen() const
59 59 \brief Returns pen used to draw grid.
60 60 \sa setGridLinePen()
61 61 */
62 62
63 63 /*!
64 \fn bool QChartAxis::labelsVisible() const
64 \fn bool QAxis::labelsVisible() const
65 65 \brief Returns if grid is visible
66 66 \sa setLabelsVisible()
67 67 */
68 68
69 69 /*!
70 \fn QPen QChartAxis::labelsPen() const
70 \fn QPen QAxis::labelsPen() const
71 71 \brief Returns the pen used to labels.
72 72 \sa setLabelsPen()
73 73 */
74 74
75 75 /*!
76 \fn QBrush QChartAxis::labelsBrush() const
76 \fn QBrush QAxis::labelsBrush() const
77 77 \brief Returns brush used to draw labels.
78 78 \sa setLabelsBrush()
79 79 */
80 80
81 81 /*!
82 \fn QFont QChartAxis::labelsFont() const
82 \fn QFont QAxis::labelsFont() const
83 83 \brief Returns font used to draw labels.
84 84 \sa setLabelsFont()
85 85 */
86 86
87 87 /*!
88 \fn QFont QChartAxis::labelsAngle() const
88 \fn QFont QAxis::labelsAngle() const
89 89 \brief Returns angle used to draw labels.
90 90 \sa setLabelsAngle()
91 91 */
92 92
93 93 /*!
94 \fn bool QChartAxis::shadesVisible() const
94 \fn bool QAxis::shadesVisible() const
95 95 \brief Returns if shades are visible.
96 96 \sa setShadesVisible()
97 97 */
98 98
99 99 /*!
100 \fn qreal QChartAxis::shadesOpacity() const
100 \fn qreal QAxis::shadesOpacity() const
101 101 \brief Returns opacity of shades.
102 102 */
103 103
104 104 /*!
105 \fn QPen QChartAxis::shadesPen() const
105 \fn QPen QAxis::shadesPen() const
106 106 \brief Returns pen used to draw shades.
107 107 \sa setShadesPen()
108 108 */
109 109
110 110 /*!
111 \fn QBrush QChartAxis::shadesBrush() const
111 \fn QBrush QAxis::shadesBrush() const
112 112 \brief Returns brush used to draw shades.
113 113 \sa setShadesBrush()
114 114 */
115 115
116 116 /*!
117 \fn qreal QChartAxis::min() const
117 \fn qreal QAxis::min() const
118 118 \brief Returns minimum value on the axis.
119 119 \sa setMin()
120 120 */
121 121
122 122 /*!
123 \fn qreal QChartAxis::max() const
123 \fn qreal QAxis::max() const
124 124 \brief Returns maximim value on the axis.
125 125 \sa setMax()
126 126 */
127 127
128 128 /*!
129 \fn void QChartAxis::minChanged(qreal min)
129 \fn void QAxis::minChanged(qreal min)
130 130 \brief Axis emits signal when \a min of axis has changed.
131 131 */
132 132
133 133 /*!
134 \fn void QChartAxis::maxChanged(qreal max)
134 \fn void QAxis::maxChanged(qreal max)
135 135 \brief Axis emits signal when \a max of axis has changed.
136 136 */
137 137
138 138 /*!
139 \fn void QChartAxis::rangeChanged(qreal min, qreal max)
139 \fn void QAxis::rangeChanged(qreal min, qreal max)
140 140 \brief Axis emits signal when \a min or \a max of axis has changed.
141 141 */
142 142
143 143 /*!
144 \fn int QChartAxis::ticksCount() const
144 \fn int QAxis::ticksCount() const
145 145 \brief Return number of ticks on the axis
146 146 \sa setTicksCount()
147 147 */
148 148
149 149 /*!
150 \fn QChartAxisCategories* QChartAxis::categories()
150 \fn QChartAxisCategories* QAxis::categories()
151 151 \brief Returns pointer to the list of categories which correspond to the values on the axis.
152 152 */
153 153
154 154 /*!
155 \fn void QChartAxis::ticksCountChanged(int count)
155 \fn void QAxis::ticksCountChanged(int count)
156 156 \brief Emits the new \a count of ticks on the axis
157 157 Signal is emitted when the number of the ticks on the axis has been changed to a different value.
158 158 Parementer count\a count is the new number of ticks on the axis.
@@ -163,8 +163,8 QTCOMMERCIALCHART_BEGIN_NAMESPACE
163 163 QChatView or QChart when axis added.
164 164 */
165 165
166 QChartAxis::QChartAxis(QObject *parent) : QObject(parent),
167 d_ptr(new QChartAxisPrivate(this))
166 QAxis::QAxis(QObject *parent) : QObject(parent),
167 d_ptr(new QAxisPrivate(this))
168 168 {
169 169
170 170 }
@@ -173,14 +173,14 d_ptr(new QChartAxisPrivate(this))
173 173 Destructor of the axis object. When axis is added to chart, chart object takes ownership.
174 174 */
175 175
176 QChartAxis::~QChartAxis()
176 QAxis::~QAxis()
177 177 {
178 178 }
179 179
180 180 /*!
181 181 Sets \a pen used to draw axis line and ticks.
182 182 */
183 void QChartAxis::setAxisPen(const QPen &pen)
183 void QAxis::setAxisPen(const QPen &pen)
184 184 {
185 185 if (d_ptr->m_axisPen!=pen) {
186 186 d_ptr->m_axisPen = pen;
@@ -188,7 +188,7 void QChartAxis::setAxisPen(const QPen &pen)
188 188 }
189 189 }
190 190
191 QPen QChartAxis::axisPen() const
191 QPen QAxis::axisPen() const
192 192 {
193 193 return d_ptr->m_axisPen;
194 194 }
@@ -196,7 +196,7 QPen QChartAxis::axisPen() const
196 196 /*!
197 197 Sets if axis and ticks are \a visible.
198 198 */
199 void QChartAxis::setAxisVisible(bool visible)
199 void QAxis::setAxisVisible(bool visible)
200 200 {
201 201 if (d_ptr->m_axisVisible != visible) {
202 202 d_ptr->m_axisVisible = visible;
@@ -204,7 +204,7 void QChartAxis::setAxisVisible(bool visible)
204 204 }
205 205 }
206 206
207 bool QChartAxis::isAxisVisible() const
207 bool QAxis::isAxisVisible() const
208 208 {
209 209 return d_ptr->m_axisVisible;
210 210 }
@@ -212,7 +212,7 bool QChartAxis::isAxisVisible() const
212 212 /*!
213 213 Sets if grid line is \a visible.
214 214 */
215 void QChartAxis::setGridLineVisible(bool visible)
215 void QAxis::setGridLineVisible(bool visible)
216 216 {
217 217 if (d_ptr->m_gridLineVisible != visible) {
218 218 d_ptr->m_gridLineVisible = visible;
@@ -220,14 +220,14 void QChartAxis::setGridLineVisible(bool visible)
220 220 }
221 221 }
222 222
223 bool QChartAxis::isGridLineVisible() const
223 bool QAxis::isGridLineVisible() const
224 224 {
225 225 return d_ptr->m_gridLineVisible;
226 226 }
227 227 /*!
228 228 Sets \a pen used to draw grid line.
229 229 */
230 void QChartAxis::setGridLinePen(const QPen &pen)
230 void QAxis::setGridLinePen(const QPen &pen)
231 231 {
232 232 if (d_ptr->m_gridLinePen != pen) {
233 233 d_ptr->m_gridLinePen = pen;
@@ -235,7 +235,7 void QChartAxis::setGridLinePen(const QPen &pen)
235 235 }
236 236 }
237 237
238 QPen QChartAxis::gridLinePen() const
238 QPen QAxis::gridLinePen() const
239 239 {
240 240 return d_ptr->m_gridLinePen;
241 241 }
@@ -243,7 +243,7 QPen QChartAxis::gridLinePen() const
243 243 /*!
244 244 Sets if axis' labels are \a visible.
245 245 */
246 void QChartAxis::setLabelsVisible(bool visible)
246 void QAxis::setLabelsVisible(bool visible)
247 247 {
248 248 if (d_ptr->m_labelsVisible != visible) {
249 249 d_ptr->m_labelsVisible = visible;
@@ -251,14 +251,14 void QChartAxis::setLabelsVisible(bool visible)
251 251 }
252 252 }
253 253
254 bool QChartAxis::labelsVisible() const
254 bool QAxis::labelsVisible() const
255 255 {
256 256 return d_ptr->m_labelsVisible;
257 257 }
258 258 /*!
259 259 Sets \a pen used to draw labels.
260 260 */
261 void QChartAxis::setLabelsPen(const QPen &pen)
261 void QAxis::setLabelsPen(const QPen &pen)
262 262 {
263 263 if (d_ptr->m_labelsPen != pen) {
264 264 d_ptr->m_labelsPen = pen;
@@ -266,7 +266,7 void QChartAxis::setLabelsPen(const QPen &pen)
266 266 }
267 267 }
268 268
269 QPen QChartAxis::labelsPen() const
269 QPen QAxis::labelsPen() const
270 270 {
271 271 return d_ptr->m_labelsPen;
272 272 }
@@ -274,7 +274,7 QPen QChartAxis::labelsPen() const
274 274 /*!
275 275 Sets \a brush used to draw labels.
276 276 */
277 void QChartAxis::setLabelsBrush(const QBrush &brush)
277 void QAxis::setLabelsBrush(const QBrush &brush)
278 278 {
279 279 if (d_ptr->m_labelsBrush != brush) {
280 280 d_ptr->m_labelsBrush = brush;
@@ -282,7 +282,7 void QChartAxis::setLabelsBrush(const QBrush &brush)
282 282 }
283 283 }
284 284
285 QBrush QChartAxis::labelsBrush() const
285 QBrush QAxis::labelsBrush() const
286 286 {
287 287 return d_ptr->m_labelsBrush;
288 288 }
@@ -290,7 +290,7 QBrush QChartAxis::labelsBrush() const
290 290 /*!
291 291 Sets \a font used to draw labels.
292 292 */
293 void QChartAxis::setLabelsFont(const QFont &font)
293 void QAxis::setLabelsFont(const QFont &font)
294 294 {
295 295 if (d_ptr->m_labelsFont != font) {
296 296 d_ptr->m_labelsFont = font;
@@ -298,7 +298,7 void QChartAxis::setLabelsFont(const QFont &font)
298 298 }
299 299 }
300 300
301 QFont QChartAxis::labelsFont() const
301 QFont QAxis::labelsFont() const
302 302 {
303 303 return d_ptr->m_labelsFont;
304 304 }
@@ -306,7 +306,7 QFont QChartAxis::labelsFont() const
306 306 /*!
307 307 Sets \a angle for all the labels on given axis.
308 308 */
309 void QChartAxis::setLabelsAngle(int angle)
309 void QAxis::setLabelsAngle(int angle)
310 310 {
311 311 if (d_ptr->m_labelsAngle != angle) {
312 312 d_ptr->m_labelsAngle = angle;
@@ -314,7 +314,7 void QChartAxis::setLabelsAngle(int angle)
314 314 }
315 315 }
316 316
317 int QChartAxis::labelsAngle() const
317 int QAxis::labelsAngle() const
318 318 {
319 319 return d_ptr->m_labelsAngle;
320 320 }
@@ -322,7 +322,7 int QChartAxis::labelsAngle() const
322 322 /*!
323 323 Sets if shades are \a visible.
324 324 */
325 void QChartAxis::setShadesVisible(bool visible)
325 void QAxis::setShadesVisible(bool visible)
326 326 {
327 327 if (d_ptr->m_shadesVisible != visible) {
328 328 d_ptr->m_shadesVisible = visible;
@@ -330,7 +330,7 void QChartAxis::setShadesVisible(bool visible)
330 330 }
331 331 }
332 332
333 bool QChartAxis::shadesVisible() const
333 bool QAxis::shadesVisible() const
334 334 {
335 335 return d_ptr->m_shadesVisible;
336 336 }
@@ -338,7 +338,7 bool QChartAxis::shadesVisible() const
338 338 /*!
339 339 Sets \a pen used to draw shades.
340 340 */
341 void QChartAxis::setShadesPen(const QPen &pen)
341 void QAxis::setShadesPen(const QPen &pen)
342 342 {
343 343 if (d_ptr->m_shadesPen != pen) {
344 344 d_ptr->m_shadesPen = pen;
@@ -346,7 +346,7 void QChartAxis::setShadesPen(const QPen &pen)
346 346 }
347 347 }
348 348
349 QPen QChartAxis::shadesPen() const
349 QPen QAxis::shadesPen() const
350 350 {
351 351 return d_ptr->m_shadesPen;
352 352 }
@@ -354,7 +354,7 QPen QChartAxis::shadesPen() const
354 354 /*!
355 355 Sets \a brush used to draw shades.
356 356 */
357 void QChartAxis::setShadesBrush(const QBrush &brush)
357 void QAxis::setShadesBrush(const QBrush &brush)
358 358 {
359 359 if (d_ptr->m_shadesBrush != brush) {
360 360 d_ptr->m_shadesBrush = brush;
@@ -362,7 +362,7 void QChartAxis::setShadesBrush(const QBrush &brush)
362 362 }
363 363 }
364 364
365 QBrush QChartAxis::shadesBrush() const
365 QBrush QAxis::shadesBrush() const
366 366 {
367 367 return d_ptr->m_shadesBrush;
368 368 }
@@ -370,7 +370,7 QBrush QChartAxis::shadesBrush() const
370 370 /*!
371 371 Sets \a opacity of the shades.
372 372 */
373 void QChartAxis::setShadesOpacity(qreal opacity)
373 void QAxis::setShadesOpacity(qreal opacity)
374 374 {
375 375 if (d_ptr->m_shadesOpacity != opacity) {
376 376 d_ptr->m_shadesOpacity=opacity;
@@ -378,7 +378,7 void QChartAxis::setShadesOpacity(qreal opacity)
378 378 }
379 379 }
380 380
381 qreal QChartAxis::shadesOpacity() const
381 qreal QAxis::shadesOpacity() const
382 382 {
383 383 return d_ptr->m_shadesOpacity;
384 384 }
@@ -386,12 +386,12 qreal QChartAxis::shadesOpacity() const
386 386 /*!
387 387 Sets \a min value on the axis.
388 388 */
389 void QChartAxis::setMin(qreal min)
389 void QAxis::setMin(qreal min)
390 390 {
391 391 setRange(min,d_ptr->m_max);
392 392 }
393 393
394 qreal QChartAxis::min() const
394 qreal QAxis::min() const
395 395 {
396 396 return d_ptr->m_min;
397 397 }
@@ -399,12 +399,12 qreal QChartAxis::min() const
399 399 /*!
400 400 Sets \a max value on the axis.
401 401 */
402 void QChartAxis::setMax(qreal max)
402 void QAxis::setMax(qreal max)
403 403 {
404 404 setRange(d_ptr->m_min,max);
405 405 }
406 406
407 qreal QChartAxis::max() const
407 qreal QAxis::max() const
408 408 {
409 409 return d_ptr->m_max;
410 410 }
@@ -412,7 +412,7 qreal QChartAxis::max() const
412 412 /*!
413 413 Sets range from \a min to \a max on the axis.
414 414 */
415 void QChartAxis::setRange(qreal min, qreal max)
415 void QAxis::setRange(qreal min, qreal max)
416 416 {
417 417 bool changed = false;
418 418 if (!qFuzzyIsNull(d_ptr->m_min - min)) {
@@ -436,7 +436,7 void QChartAxis::setRange(qreal min, qreal max)
436 436 /*!
437 437 Sets \a count for ticks on the axis.
438 438 */
439 void QChartAxis::setTicksCount(int count)
439 void QAxis::setTicksCount(int count)
440 440 {
441 441 if (d_ptr->m_ticksCount != count) {
442 442 d_ptr->m_ticksCount = count;
@@ -445,7 +445,7 void QChartAxis::setTicksCount(int count)
445 445 }
446 446 }
447 447
448 int QChartAxis::ticksCount() const
448 int QAxis::ticksCount() const
449 449 {
450 450 return d_ptr->m_ticksCount;
451 451 }
@@ -453,7 +453,7 int QChartAxis::ticksCount() const
453 453 /*!
454 454 Sets axis, shades, labels and grid lines to be visible.
455 455 */
456 void QChartAxis::show()
456 void QAxis::show()
457 457 {
458 458 d_ptr->m_axisVisible=true;
459 459 d_ptr->m_gridLineVisible=true;
@@ -465,7 +465,7 void QChartAxis::show()
465 465 /*!
466 466 Sets axis, shades, labels and grid lines to not be visible.
467 467 */
468 void QChartAxis::hide()
468 void QAxis::hide()
469 469 {
470 470 d_ptr->m_axisVisible = false;
471 471 d_ptr->m_gridLineVisible = false;
@@ -477,7 +477,7 void QChartAxis::hide()
477 477 /*!
478 478 Sets the nice numbers state to \a enable
479 479 */
480 void QChartAxis::setNiceNumbersEnabled(bool enable)
480 void QAxis::setNiceNumbersEnabled(bool enable)
481 481 {
482 482 if (d_ptr->m_niceNumbers != enable){
483 483 d_ptr->m_niceNumbers = enable;
@@ -488,19 +488,19 void QChartAxis::setNiceNumbersEnabled(bool enable)
488 488 /*!
489 489 Returns whether nice numbers are enabled or not.
490 490 */
491 bool QChartAxis::niceNumbersEnabled() const
491 bool QAxis::niceNumbersEnabled() const
492 492 {
493 493 return d_ptr->m_niceNumbers;
494 494 }
495 495
496 QChartAxisCategories* QChartAxis::categories()
496 QChartAxisCategories* QAxis::categories()
497 497 {
498 498 return &d_ptr->m_category;
499 499 }
500 500
501 501 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
502 502
503 QChartAxisPrivate::QChartAxisPrivate(QChartAxis* q):
503 QAxisPrivate::QAxisPrivate(QAxis* q):
504 504 q_ptr(q),
505 505 m_axisVisible(true),
506 506 m_gridLineVisible(true),
@@ -516,18 +516,18 m_niceNumbers(false)
516 516
517 517 }
518 518
519 QChartAxisPrivate::~QChartAxisPrivate()
519 QAxisPrivate::~QAxisPrivate()
520 520 {
521 521
522 522 }
523 523
524 void QChartAxisPrivate::handleAxisRangeChanged(qreal min, qreal max,int count)
524 void QAxisPrivate::handleAxisRangeChanged(qreal min, qreal max,int count)
525 525 {
526 526 q_ptr->setRange(min,max);
527 527 q_ptr->setTicksCount(count);
528 528 }
529 529
530 #include "moc_qchartaxis.cpp"
531 #include "moc_qchartaxis_p.cpp"
530 #include "moc_qaxis.cpp"
531 #include "moc_qaxis_p.cpp"
532 532
533 533 QTCOMMERCIALCHART_END_NAMESPACE
Show file before | Show file after | Hide comments
@@ -18,8 +18,8
18 18 **
19 19 ****************************************************************************/
20 20
21 #ifndef QCHARTAXIS_H
22 #define QCHARTAXIS_H
21 #ifndef QAXIS_H
22 #define QAXIS_H
23 23
24 24 #include <qchartglobal.h>
25 25 #include <qchartaxiscategories.h>
@@ -28,15 +28,15
28 28
29 29 QTCOMMERCIALCHART_BEGIN_NAMESPACE
30 30
31 class QChartAxisPrivate;
31 class QAxisPrivate;
32 32
33 class QTCOMMERCIALCHART_EXPORT QChartAxis : public QObject
33 class QTCOMMERCIALCHART_EXPORT QAxis : public QObject
34 34 {
35 35 Q_OBJECT
36 36 public:
37 37
38 QChartAxis(QObject *parent =0);
39 ~QChartAxis();
38 QAxis(QObject *parent =0);
39 ~QAxis();
40 40
41 41 //axis handling
42 42 bool isAxisVisible() const;
@@ -98,10 +98,10 Q_SIGNALS:
98 98 void ticksCountChanged(int count);
99 99
100 100 private:
101 QScopedPointer<QChartAxisPrivate> d_ptr;
102 Q_DISABLE_COPY(QChartAxis);
101 QScopedPointer<QAxisPrivate> d_ptr;
102 Q_DISABLE_COPY(QAxis);
103 103 friend class ChartDataSet;
104 friend class Axis;
104 friend class ChartAxis;
105 105 };
106 106
107 107 QTCOMMERCIALCHART_END_NAMESPACE
Show file before | Show file after | Hide comments
@@ -27,19 +27,19
27 27 //
28 28 // We mean it.
29 29
30 #ifndef QCHARTAXIS_P_H
31 #define QCHARTAXIS_P_H
30 #ifndef QAXIS_P_H
31 #define QAXIS_P_H
32 32
33 #include "qchartaxis.h"
33 #include "qaxis.h"
34 34
35 35 QTCOMMERCIALCHART_BEGIN_NAMESPACE
36 36
37 class QChartAxisPrivate : public QObject
37 class QAxisPrivate : public QObject
38 38 {
39 39 Q_OBJECT
40 40 public:
41 QChartAxisPrivate(QChartAxis *q);
42 ~QChartAxisPrivate();
41 QAxisPrivate(QAxis *q);
42 ~QAxisPrivate();
43 43
44 44 Q_SIGNALS:
45 45 void updated();
@@ -49,7 +49,7 public Q_SLOTS:
49 49 void handleAxisRangeChanged(qreal min, qreal max,int count);
50 50
51 51 private:
52 QChartAxis *q_ptr;
52 QAxis *q_ptr;
53 53
54 54 bool m_axisVisible;
55 55 QPen m_axisPen;
@@ -77,7 +77,7 private:
77 77
78 78 bool m_niceNumbers;
79 79
80 friend class QChartAxis;
80 friend class QAxis;
81 81 };
82 82
83 83 QTCOMMERCIALCHART_END_NAMESPACE
Show file before | Show file after | Hide comments
@@ -46,8 +46,8 public:
46 46
47 47 private:
48 48 QScopedPointer<QChartAxisCategoriesPrivate> d_ptr;
49 friend class QChartAxisPrivate;
50 friend class Axis;
49 friend class QAxisPrivate;
50 friend class ChartAxis;
51 51 };
52 52
53 53
Show file before | Show file after | Hide comments
@@ -26,7 +26,7
26 26 #include "qbarseries.h"
27 27 #include "qbarseries_p.h"
28 28 #include "qchart.h"
29 #include "qchartaxis.h"
29 //#include "qchartaxis.h"
30 30 #include "qchartaxiscategories.h"
31 31 #include "chartpresenter_p.h"
32 32 #include "chartanimator_p.h"
Show file before | Show file after | Hide comments
@@ -19,8 +19,8
19 19 ****************************************************************************/
20 20
21 21 #include "chartdataset_p.h"
22 #include "qchartaxis.h"
23 #include "qchartaxis_p.h"
22 #include "qaxis.h"
23 #include "qaxis_p.h"
24 24 #include "qabstractseries_p.h"
25 25 #include "qbarseries.h"
26 26 #include "qstackedbarseries.h"
@@ -30,8 +30,8
30 30 QTCOMMERCIALCHART_BEGIN_NAMESPACE
31 31
32 32 ChartDataSet::ChartDataSet(QObject *parent):QObject(parent),
33 m_axisX(new QChartAxis(this)),
34 m_axisY(new QChartAxis(this)),
33 m_axisX(new QAxis(this)),
34 m_axisY(new QAxis(this)),
35 35 m_domainIndex(0),
36 36 m_axisXInitialized(false)
37 37 {
@@ -41,11 +41,11 ChartDataSet::~ChartDataSet()
41 41 {
42 42 }
43 43
44 void ChartDataSet::addSeries(QAbstractSeries* series, QChartAxis *axisY)
44 void ChartDataSet::addSeries(QAbstractSeries* series, QAxis *axisY)
45 45 {
46 46 if(axisY==0) axisY = m_axisY;
47 47
48 QChartAxis* axis = m_seriesAxisMap.value(series);
48 QAxis* axis = m_seriesAxisMap.value(series);
49 49
50 50 if(axis) {
51 51 qWarning() << "Can not add series. Series already on the chart";
@@ -106,9 +106,9 void ChartDataSet::addSeries(QAbstractSeries* series, QChartAxis *axisY)
106 106
107 107 }
108 108
109 QChartAxis* ChartDataSet::removeSeries(QAbstractSeries* series)
109 QAxis* ChartDataSet::removeSeries(QAbstractSeries* series)
110 110 {
111 QChartAxis* axis = m_seriesAxisMap.value(series);
111 QAxis* axis = m_seriesAxisMap.value(series);
112 112
113 113 if(!axis){
114 114 qWarning()<<"Can not remove series. Series not found on the chart.";
@@ -124,7 +124,7 QChartAxis* ChartDataSet::removeSeries(QAbstractSeries* series)
124 124 m_indexSeriesMap.remove(key);
125 125 series->setParent(0);
126 126
127 QList<QChartAxis*> axes = m_seriesAxisMap.values();
127 QList<QAxis*> axes = m_seriesAxisMap.values();
128 128
129 129 int i = axes.indexOf(axis);
130 130
@@ -149,9 +149,9 QChartAxis* ChartDataSet::removeSeries(QAbstractSeries* series)
149 149 void ChartDataSet::removeAllSeries()
150 150 {
151 151 QList<QAbstractSeries*> series = m_seriesAxisMap.keys();
152 QList<QChartAxis*> axes;
152 QList<QAxis*> axes;
153 153 foreach(QAbstractSeries *s , series) {
154 QChartAxis* axis = removeSeries(s);
154 QAxis* axis = removeSeries(s);
155 155 if(axis==axisY()) continue;
156 156 int i = axes.indexOf(axis);
157 157 if(i==-1){
@@ -175,7 +175,7 void ChartDataSet::setupCategories(QBarSeries* series)
175 175
176 176 void ChartDataSet::zoomInDomain(const QRectF& rect, const QSizeF& size)
177 177 {
178 QMapIterator<QChartAxis*, Domain*> i(m_axisDomainMap);
178 QMapIterator<QAxis*, Domain*> i(m_axisDomainMap);
179 179 while (i.hasNext()) {
180 180 i.next();
181 181 i.value()->zoomIn(rect,size);
@@ -184,7 +184,7 void ChartDataSet::zoomInDomain(const QRectF& rect, const QSizeF& size)
184 184
185 185 void ChartDataSet::zoomOutDomain(const QRectF& rect, const QSizeF& size)
186 186 {
187 QMapIterator<QChartAxis*, Domain*> i(m_axisDomainMap);
187 QMapIterator<QAxis*, Domain*> i(m_axisDomainMap);
188 188 while (i.hasNext()) {
189 189 i.next();
190 190 i.value()->zoomOut(rect,size);
@@ -194,7 +194,7 void ChartDataSet::zoomOutDomain(const QRectF& rect, const QSizeF& size)
194 194 int ChartDataSet::seriesCount(QAbstractSeries::QSeriesType type)
195 195 {
196 196 int count=0;
197 QMapIterator<QAbstractSeries*, QChartAxis*> i(m_seriesAxisMap);
197 QMapIterator<QAbstractSeries*, QAxis*> i(m_seriesAxisMap);
198 198 while (i.hasNext()) {
199 199 i.next();
200 200 if(i.key()->type()==type) count++;
@@ -213,7 +213,7 int ChartDataSet::seriesIndex(QAbstractSeries *series)
213 213 return -1;
214 214 }
215 215
216 QChartAxis* ChartDataSet::axisY(QAbstractSeries *series) const
216 QAxis* ChartDataSet::axisY(QAbstractSeries *series) const
217 217 {
218 218 if(series == 0) return m_axisY;
219 219 return m_seriesAxisMap.value(series);
@@ -221,14 +221,14 QChartAxis* ChartDataSet::axisY(QAbstractSeries *series) const
221 221
222 222 Domain* ChartDataSet::domain(QAbstractSeries *series) const
223 223 {
224 QChartAxis* axis = m_seriesAxisMap.value(series);
224 QAxis* axis = m_seriesAxisMap.value(series);
225 225 if(axis){
226 226 return m_axisDomainMap.value(axis);
227 227 }else
228 228 return 0;
229 229 }
230 230
231 Domain* ChartDataSet::domain(QChartAxis* axis) const
231 Domain* ChartDataSet::domain(QAxis* axis) const
232 232 {
233 233 if(!axis || axis==axisX()) {
234 234 return m_axisDomainMap.value(axisY());
@@ -240,7 +240,7 Domain* ChartDataSet::domain(QChartAxis* axis) const
240 240
241 241 void ChartDataSet::scrollDomain(int dx,int dy,const QSizeF& size)
242 242 {
243 QMapIterator<QChartAxis*, Domain*> i( m_axisDomainMap);
243 QMapIterator<QAxis*, Domain*> i( m_axisDomainMap);
244 244 while (i.hasNext()) {
245 245 i.next();
246 246 i.value()->move(dx,dy,size);
Show file before | Show file after | Hide comments
@@ -36,7 +36,7
36 36
37 37 QTCOMMERCIALCHART_BEGIN_NAMESPACE
38 38
39 class QChartAxis;
39 class QAxis;
40 40 class QBarSeries;
41 41
42 42 class ChartDataSet : public QObject
@@ -46,8 +46,8 public:
46 46 ChartDataSet(QObject* parent=0);
47 47 virtual ~ChartDataSet();
48 48
49 void addSeries(QAbstractSeries* series,QChartAxis *axisY = 0);
50 QChartAxis* removeSeries(QAbstractSeries* series);
49 void addSeries(QAbstractSeries* series,QAxis *axisY = 0);
50 QAxis* removeSeries(QAbstractSeries* series);
51 51 void removeAllSeries();
52 52
53 53 void zoomInDomain(const QRectF& rect, const QSizeF& size);
@@ -58,28 +58,28 public:
58 58 int seriesIndex(QAbstractSeries *series);
59 59
60 60 Domain* domain(QAbstractSeries* series) const;
61 Domain* domain(QChartAxis* axis) const;
61 Domain* domain(QAxis* axis) const;
62 62
63 QChartAxis* axisX() const { return m_axisX; }
64 QChartAxis* axisY(QAbstractSeries *series = 0) const;
63 QAxis* axisX() const { return m_axisX; }
64 QAxis* axisY(QAbstractSeries *series = 0) const;
65 65
66 66 Q_SIGNALS:
67 67 void seriesAdded(QAbstractSeries* series, Domain* domain);
68 68 void seriesRemoved(QAbstractSeries* series);
69 void axisAdded(QChartAxis* axis,Domain* domain);
70 void axisRemoved(QChartAxis* axis);
69 void axisAdded(QAxis* axis,Domain* domain);
70 void axisRemoved(QAxis* axis);
71 71
72 72 private:
73 QStringList createLabels(QChartAxis* axis,qreal min, qreal max);
73 QStringList createLabels(QAxis* axis,qreal min, qreal max);
74 74 void calculateDomain(QAbstractSeries* series,Domain* domain);
75 75 void setupCategories(QBarSeries* series);
76 76
77 77 private:
78 QMap<QAbstractSeries *, QChartAxis *> m_seriesAxisMap;
79 QMap<QChartAxis*, Domain *> m_axisDomainMap;
78 QMap<QAbstractSeries *, QAxis *> m_seriesAxisMap;
79 QMap<QAxis*, Domain *> m_axisDomainMap;
80 80 QMap<int, QAbstractSeries *> m_indexSeriesMap;
81 QChartAxis* m_axisX;
82 QChartAxis* m_axisY;
81 QAxis* m_axisX;
82 QAxis* m_axisY;
83 83
84 84 int m_domainIndex;
85 85 bool m_axisXInitialized;
Show file before | Show file after | Hide comments
@@ -20,14 +20,15
20 20 #include "chartpresenter_p.h"
21 21 #include "qchart.h"
22 22 #include "qchart_p.h"
23 #include "qchartaxis.h"
23 #include "qaxis.h"
24 24 #include "chartdataset_p.h"
25 25 #include "charttheme_p.h"
26 26 #include "chartanimator_p.h"
27 27 #include "qabstractseries_p.h"
28 28 #include "qareaseries.h"
29 #include "axis_p.h"
29 #include "chartaxis_p.h"
30 30 #include "areachartitem_p.h"
31 #include "chartbackground_p.h"
31 32
32 33 QTCOMMERCIALCHART_BEGIN_NAMESPACE
33 34
@@ -61,10 +62,10 void ChartPresenter::setGeometry(const QRectF& rect)
61 62 updateLayout();
62 63 }
63 64
64 void ChartPresenter::setMinimumMarginWidth(Axis* axis, qreal width)
65 void ChartPresenter::setMinimumMarginWidth(ChartAxis* axis, qreal width)
65 66 {
66 67 switch(axis->axisType()){
67 case Axis::X_AXIS:
68 case ChartAxis::X_AXIS:
68 69 {
69 70 if(width>m_chartRect.width()+ m_chartMargins.left()) {
70 71 m_minLeftMargin= width - m_chartRect.width();
@@ -72,7 +73,7 void ChartPresenter::setMinimumMarginWidth(Axis* axis, qreal width)
72 73 }
73 74 break;
74 75 }
75 case Axis::Y_AXIS:
76 case ChartAxis::Y_AXIS:
76 77 {
77 78
78 79 if(m_minLeftMargin!=width){
@@ -85,10 +86,10 void ChartPresenter::setMinimumMarginWidth(Axis* axis, qreal width)
85 86 }
86 87 }
87 88
88 void ChartPresenter::setMinimumMarginHeight(Axis* axis, qreal height)
89 void ChartPresenter::setMinimumMarginHeight(ChartAxis* axis, qreal height)
89 90 {
90 91 switch(axis->axisType()){
91 case Axis::X_AXIS:
92 case ChartAxis::X_AXIS:
92 93 {
93 94 if(m_minBottomMargin!=height) {
94 95 m_minBottomMargin= height;
@@ -96,7 +97,7 void ChartPresenter::setMinimumMarginHeight(Axis* axis, qreal height)
96 97 }
97 98 break;
98 99 }
99 case Axis::Y_AXIS:
100 case ChartAxis::Y_AXIS:
100 101 {
101 102
102 103 if(height>m_chartMargins.bottom()+m_chartRect.height()){
@@ -109,9 +110,9 void ChartPresenter::setMinimumMarginHeight(Axis* axis, qreal height)
109 110 }
110 111 }
111 112
112 void ChartPresenter::handleAxisAdded(QChartAxis* axis,Domain* domain)
113 void ChartPresenter::handleAxisAdded(QAxis* axis,Domain* domain)
113 114 {
114 Axis* item = new Axis(axis,this,axis==m_dataset->axisX()?Axis::X_AXIS : Axis::Y_AXIS);
115 ChartAxis* item = new ChartAxis(axis,this,axis==m_dataset->axisX()?ChartAxis::X_AXIS : ChartAxis::Y_AXIS);
115 116
116 117 if(m_options.testFlag(QChart::GridAxisAnimations)){
117 118 m_animator->addAnimation(item);
@@ -137,9 +138,9 void ChartPresenter::handleAxisAdded(QChartAxis* axis,Domain* domain)
137 138 m_axisItems.insert(axis, item);
138 139 }
139 140
140 void ChartPresenter::handleAxisRemoved(QChartAxis* axis)
141 void ChartPresenter::handleAxisRemoved(QAxis* axis)
141 142 {
142 Axis* item = m_axisItems.take(axis);
143 ChartAxis* item = m_axisItems.take(axis);
143 144 Q_ASSERT(item);
144 145 if(m_animator) m_animator->removeAnimation(item);
145 146 delete item;
@@ -207,10 +208,10 void ChartPresenter::setAnimationOptions(QChart::AnimationOptions options)
207 208
208 209 void ChartPresenter::resetAllElements()
209 210 {
210 QList<QChartAxis *> axisList = m_axisItems.uniqueKeys();
211 QList<QAxis *> axisList = m_axisItems.uniqueKeys();
211 212 QList<QAbstractSeries *> seriesList = m_chartItems.uniqueKeys();
212 213
213 foreach(QChartAxis *axis, axisList) {
214 foreach(QAxis *axis, axisList) {
214 215 handleAxisRemoved(axis);
215 216 handleAxisAdded(axis,m_dataset->domain(axis));
216 217 }
Show file before | Show file after | Hide comments
@@ -22,9 +22,7
22 22 #define CHARTPRESENTER_H
23 23
24 24 #include "qchartglobal.h"
25 #include "chartbackground_p.h" //TODO fix me
26 25 #include "qchart.h" //becouse of QChart::ChartThemeId //TODO
27 #include "qchartaxis.h"
28 26 #include <QRectF>
29 27
30 28 QTCOMMERCIALCHART_BEGIN_NAMESPACE
@@ -33,9 +31,10 class Chart;
33 31 class QAbstractSeries;
34 32 class ChartDataSet;
35 33 class Domain;
36 class Axis;
34 class ChartAxis;
37 35 class ChartTheme;
38 36 class ChartAnimator;
37 class ChartBackground;
39 38
40 39 class ChartPresenter: public QObject
41 40 {
@@ -75,8 +74,8 public:
75 74 void setGeometry(const QRectF& rect);
76 75 QRectF chartGeometry() const { return m_chartRect; }
77 76
78 void setMinimumMarginHeight(Axis* axis, qreal height);
79 void setMinimumMarginWidth(Axis* axis, qreal width);
77 void setMinimumMarginHeight(ChartAxis* axis, qreal height);
78 void setMinimumMarginWidth(ChartAxis* axis, qreal width);
80 79 qreal minimumLeftMargin() const { return m_minLeftMargin; }
81 80 qreal minimumBottomMargin() const { return m_minBottomMargin; }
82 81
@@ -89,8 +88,8 public: //TODO: fix me
89 88 public Q_SLOTS:
90 89 void handleSeriesAdded(QAbstractSeries* series,Domain* domain);
91 90 void handleSeriesRemoved(QAbstractSeries* series);
92 void handleAxisAdded(QChartAxis* axis,Domain* domain);
93 void handleAxisRemoved(QChartAxis* axis);
91 void handleAxisAdded(QAxis* axis,Domain* domain);
92 void handleAxisRemoved(QAxis* axis);
94 93 void updateLayout();
95 94
96 95 Q_SIGNALS:
@@ -103,7 +102,7 private:
103 102 ChartDataSet* m_dataset;
104 103 ChartTheme *m_chartTheme;
105 104 QMap<QAbstractSeries *, Chart *> m_chartItems;
106 QMap<QChartAxis *, Axis *> m_axisItems;
105 QMap<QAxis *, ChartAxis *> m_axisItems;
107 106 QRectF m_rect;
108 107 QRectF m_chartRect;
109 108 QChart::AnimationOptions m_options;
Show file before | Show file after | Hide comments
@@ -23,7 +23,7
23 23 #include "qchart_p.h"
24 24 #include "qchartview.h"
25 25 #include "qlegend.h"
26 #include "qchartaxis.h"
26 #include "qaxis.h"
27 27 #include <QTime>
28 28
29 29 //series
@@ -39,7 +39,7
39 39 #include "qsplineseries.h"
40 40
41 41 //items
42 #include "axis_p.h"
42 #include "chartaxis_p.h"
43 43 #include "barchartitem_p.h"
44 44 #include "stackedbarchartitem_p.h"
45 45 #include "percentbarchartitem_p.h"
@@ -264,7 +264,7 void ChartTheme::decorate(QSplineSeries *series, int index)
264 264 }
265 265 }
266 266
267 void ChartTheme::decorate(QChartAxis *axis,bool axisX)
267 void ChartTheme::decorate(QAxis *axis,bool axisX)
268 268 {
269 269 QPen pen;
270 270 QBrush brush;
Show file before | Show file after | Hide comments
@@ -69,7 +69,7 public:
69 69 void decorate(QScatterSeries *series, int index);
70 70 void decorate(QPieSeries *series, int index);
71 71 void decorate(QSplineSeries *series, int index);
72 void decorate(QChartAxis *axis, bool axisX);
72 void decorate(QAxis *axis, bool axisX);
73 73 void setForced(bool enabled);
74 74 bool isForced() { return m_force; }
75 75
Show file before | Show file after | Hide comments
@@ -22,6 +22,8
22 22 #include "qchart_p.h"
23 23 #include "legendscroller_p.h"
24 24 #include "qlegend_p.h"
25 #include "chartbackground_p.h"
26 #include "qaxis.h"
25 27 #include <QGraphicsScene>
26 28 #include <QGraphicsSceneResizeEvent>
27 29
@@ -91,7 +93,7 QChart::~QChart()
91 93 If auto scaling is enabled, re-scales the axes the series is bound to (both the x axis and
92 94 the y axis).
93 95 */
94 void QChart::addSeries(QAbstractSeries *series, QChartAxis *axisY)
96 void QChart::addSeries(QAbstractSeries *series, QAxis *axisY)
95 97 {
96 98 Q_ASSERT(series);
97 99 d_ptr->m_dataset->addSeries(series, axisY);
@@ -273,7 +275,7 void QChart::zoomOut()
273 275 /*!
274 276 Returns the pointer to the x axis object of the chart
275 277 */
276 QChartAxis* QChart::axisX() const
278 QAxis* QChart::axisX() const
277 279 {
278 280 return d_ptr->m_dataset->axisX();
279 281 }
@@ -282,7 +284,7 QChartAxis* QChart::axisX() const
282 284 Returns the pointer to the y axis object of the \a series
283 285 If no \a series is provided then default Y axis of the chart is returned.
284 286 */
285 QChartAxis* QChart::axisY(QAbstractSeries *series) const
287 QAxis* QChart::axisY(QAbstractSeries *series) const
286 288 {
287 289 return d_ptr->m_dataset->axisY(series);
288 290 }
@@ -425,8 +427,8 void QChartPrivate::createConnections()
425 427
426 428 QObject::connect(m_dataset,SIGNAL(seriesAdded(QAbstractSeries *, Domain *)),m_presenter,SLOT(handleSeriesAdded(QAbstractSeries *, Domain *)));
427 429 QObject::connect(m_dataset,SIGNAL(seriesRemoved(QAbstractSeries *)),m_presenter,SLOT(handleSeriesRemoved(QAbstractSeries *)));
428 QObject::connect(m_dataset,SIGNAL(axisAdded(QChartAxis*,Domain*)),m_presenter,SLOT(handleAxisAdded(QChartAxis*,Domain*)));
429 QObject::connect(m_dataset,SIGNAL(axisRemoved(QChartAxis*)),m_presenter,SLOT(handleAxisRemoved(QChartAxis*)));
430 QObject::connect(m_dataset,SIGNAL(axisAdded(QAxis*,Domain*)),m_presenter,SLOT(handleAxisAdded(QAxis*,Domain*)));
431 QObject::connect(m_dataset,SIGNAL(axisRemoved(QAxis*)),m_presenter,SLOT(handleAxisRemoved(QAxis*)));
430 432 }
431 433
432 434 #include "moc_qchart.cpp"
Show file before | Show file after | Hide comments
@@ -30,7 +30,7 class QGraphicsSceneResizeEvent;
30 30 QTCOMMERCIALCHART_BEGIN_NAMESPACE
31 31
32 32 class QAbstractSeries;
33 class QChartAxis;
33 class QAxis;
34 34 class QLegend;
35 35 struct QChartPrivate;
36 36
@@ -63,7 +63,7 public:
63 63 explicit QChart(QGraphicsItem *parent = 0, Qt::WindowFlags wFlags = 0);
64 64 ~QChart();
65 65
66 void addSeries(QAbstractSeries *series, QChartAxis *axisY = 0);
66 void addSeries(QAbstractSeries *series, QAxis *axisY = 0);
67 67 void removeSeries(QAbstractSeries *series);
68 68 void removeAllSeries();
69 69
@@ -97,8 +97,8 public:
97 97 void scrollUp();
98 98 void scrollDown();
99 99
100 QChartAxis* axisX() const;
101 QChartAxis* axisY(QAbstractSeries* series = 0) const;
100 QAxis* axisX() const;
101 QAxis* axisY(QAbstractSeries* series = 0) const;
102 102
103 103 QLegend* legend() const;
104 104 QRectF margins() const;
Show file before | Show file after | Hide comments
@@ -21,7 +21,7
21 21 #ifndef QCHARTVIEW_H
22 22 #define QCHARTVIEW_H
23 23
24 #include <QChartAxis>
24 #include <QAxis>
25 25 #include <QAbstractSeries>
26 26 #include <QChart>
27 27 #include <QGraphicsView>
Show file before | Show file after | Hide comments
@@ -19,7 +19,7
19 19 ****************************************************************************/
20 20
21 21 #include <QtTest/QtTest>
22 #include <qchartaxis.h>
22 #include <qaxis.h>
23 23 #include <qlineseries.h>
24 24 #include <private/chartdataset_p.h>
25 25 #include <private/domain_p.h>
@@ -27,7 +27,7
27 27 QTCOMMERCIALCHART_USE_NAMESPACE
28 28
29 29 Q_DECLARE_METATYPE(Domain *)
30 Q_DECLARE_METATYPE(QChartAxis *)
30 Q_DECLARE_METATYPE(QAxis *)
31 31 Q_DECLARE_METATYPE(QAbstractSeries *)
32 32 Q_DECLARE_METATYPE(QLineSeries *)
33 33
@@ -69,7 +69,7 private Q_SLOTS:
69 69 void tst_ChartDataSet::initTestCase()
70 70 {
71 71 qRegisterMetaType<Domain*>();
72 qRegisterMetaType<QChartAxis*>();
72 qRegisterMetaType<QAxis*>();
73 73 qRegisterMetaType<QAbstractSeries*>();
74 74 }
75 75
@@ -104,40 +104,40 void tst_ChartDataSet::chartdataset()
104 104 void tst_ChartDataSet::addSeries_data()
105 105 {
106 106 QTest::addColumn<QLineSeries*>("series0");
107 QTest::addColumn<QChartAxis*>("axis0");
107 QTest::addColumn<QAxis*>("axis0");
108 108 QTest::addColumn<QLineSeries*>("series1");
109 QTest::addColumn<QChartAxis*>("axis1");
109 QTest::addColumn<QAxis*>("axis1");
110 110 QTest::addColumn<QLineSeries*>("series2");
111 QTest::addColumn<QChartAxis*>("axis2");
111 QTest::addColumn<QAxis*>("axis2");
112 112 QTest::addColumn<int>("axisCount");
113 113
114 114 QLineSeries* series0 = new QLineSeries(this);
115 115 QLineSeries* series1 = new QLineSeries(this);
116 116 QLineSeries* series2 = new QLineSeries(this);
117 117
118 QChartAxis* axis0 = new QChartAxis(this);
119 QChartAxis* axis1 = new QChartAxis(this);
120 QChartAxis* axis2 = new QChartAxis(this);
118 QAxis* axis0 = new QAxis(this);
119 QAxis* axis1 = new QAxis(this);
120 QAxis* axis2 = new QAxis(this);
121 121
122 QTest::newRow("default axis Y: series0,series1,series2") << series0 << (QChartAxis*)0 << series1 << (QChartAxis*)0 << series2 << (QChartAxis*)0 << 2;
123 QTest::newRow("default axis Y: series0, axis 0: series1,series2") << series0 << (QChartAxis*)0 << series1 << axis0 << series2 << axis0 << 3;
122 QTest::newRow("default axis Y: series0,series1,series2") << series0 << (QAxis*)0 << series1 << (QAxis*)0 << series2 << (QAxis*)0 << 2;
123 QTest::newRow("default axis Y: series0, axis 0: series1,series2") << series0 << (QAxis*)0 << series1 << axis0 << series2 << axis0 << 3;
124 124 QTest::newRow("axis0: series0, axis1: series1, axis2: series2") << series0 << axis0 << series1 << axis1 << series2 << axis2 << 4;
125 125 }
126 126
127 127 void tst_ChartDataSet::addSeries()
128 128 {
129 129 QFETCH(QLineSeries*, series0);
130 QFETCH(QChartAxis*, axis0);
130 QFETCH(QAxis*, axis0);
131 131 QFETCH(QLineSeries*, series1);
132 QFETCH(QChartAxis*, axis1);
132 QFETCH(QAxis*, axis1);
133 133 QFETCH(QLineSeries*, series2);
134 QFETCH(QChartAxis*, axis2);
134 QFETCH(QAxis*, axis2);
135 135 QFETCH(int, axisCount);
136 136
137 137 ChartDataSet dataSet;
138 138
139 QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis*,Domain*)));
140 QSignalSpy spy1(&dataSet, SIGNAL(axisRemoved(QChartAxis*)));
139 QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QAxis*,Domain*)));
140 QSignalSpy spy1(&dataSet, SIGNAL(axisRemoved(QAxis*)));
141 141 QSignalSpy spy2(&dataSet, SIGNAL(seriesAdded(QAbstractSeries *,Domain*)));
142 142 QSignalSpy spy3(&dataSet, SIGNAL(seriesRemoved(QAbstractSeries *)));
143 143
@@ -167,11 +167,11 void tst_ChartDataSet::removeSeries_data()
167 167 void tst_ChartDataSet::removeSeries()
168 168 {
169 169 QFETCH(QLineSeries*, series0);
170 QFETCH(QChartAxis*, axis0);
170 QFETCH(QAxis*, axis0);
171 171 QFETCH(QLineSeries*, series1);
172 QFETCH(QChartAxis*, axis1);
172 QFETCH(QAxis*, axis1);
173 173 QFETCH(QLineSeries*, series2);
174 QFETCH(QChartAxis*, axis2);
174 QFETCH(QAxis*, axis2);
175 175 QFETCH(int, axisCount);
176 176
177 177 ChartDataSet dataSet;
@@ -180,8 +180,8 void tst_ChartDataSet::removeSeries()
180 180 dataSet.addSeries(series1,axis1);
181 181 dataSet.addSeries(series2,axis2);
182 182
183 QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis *, Domain *)));
184 QSignalSpy spy1(&dataSet, SIGNAL(axisRemoved(QChartAxis *)));
183 QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QAxis *, Domain *)));
184 QSignalSpy spy1(&dataSet, SIGNAL(axisRemoved(QAxis *)));
185 185 QSignalSpy spy2(&dataSet, SIGNAL(seriesAdded(QAbstractSeries *, Domain *)));
186 186 QSignalSpy spy3(&dataSet, SIGNAL(seriesRemoved(QAbstractSeries *)));
187 187
@@ -206,9 +206,9 void tst_ChartDataSet::removeAllSeries()
206 206 QLineSeries* series1 = new QLineSeries(this);
207 207 QLineSeries* series2 = new QLineSeries(this);
208 208
209 QChartAxis* axis0 = new QChartAxis(this);
210 QChartAxis* axis1 = new QChartAxis(this);
211 QChartAxis* axis2 = new QChartAxis(this);
209 QAxis* axis0 = new QAxis(this);
210 QAxis* axis1 = new QAxis(this);
211 QAxis* axis2 = new QAxis(this);
212 212
213 213
214 214 ChartDataSet dataSet;
@@ -217,8 +217,8 void tst_ChartDataSet::removeAllSeries()
217 217 dataSet.addSeries(series1, axis1);
218 218 dataSet.addSeries(series2, axis2);
219 219
220 QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis *, Domain *)));
221 QSignalSpy spy1(&dataSet, SIGNAL(axisRemoved(QChartAxis *)));
220 QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QAxis *, Domain *)));
221 QSignalSpy spy1(&dataSet, SIGNAL(axisRemoved(QAxis *)));
222 222 QSignalSpy spy2(&dataSet, SIGNAL(seriesAdded(QAbstractSeries *, Domain *)));
223 223 QSignalSpy spy3(&dataSet, SIGNAL(seriesRemoved(QAbstractSeries *)));
224 224
@@ -233,22 +233,22 void tst_ChartDataSet::removeAllSeries()
233 233
234 234 void tst_ChartDataSet::axisY_data()
235 235 {
236 QTest::addColumn<QChartAxis*>("axis0");
237 QTest::addColumn<QChartAxis*>("axis1");
238 QTest::addColumn<QChartAxis*>("axis2");
239 QTest::newRow("1 defualt, 2 optional") << (QChartAxis*)0 << new QChartAxis() << new QChartAxis();
240 QTest::newRow("3 optional") << new QChartAxis() << new QChartAxis() << new QChartAxis();
236 QTest::addColumn<QAxis*>("axis0");
237 QTest::addColumn<QAxis*>("axis1");
238 QTest::addColumn<QAxis*>("axis2");
239 QTest::newRow("1 defualt, 2 optional") << (QAxis*)0 << new QAxis() << new QAxis();
240 QTest::newRow("3 optional") << new QAxis() << new QAxis() << new QAxis();
241 241 }
242 242
243 243 void tst_ChartDataSet::axisY()
244 244 {
245 QFETCH(QChartAxis*, axis0);
246 QFETCH(QChartAxis*, axis1);
247 QFETCH(QChartAxis*, axis2);
245 QFETCH(QAxis*, axis0);
246 QFETCH(QAxis*, axis1);
247 QFETCH(QAxis*, axis2);
248 248
249 249 ChartDataSet dataSet;
250 250
251 QChartAxis* defaultAxisY = dataSet.axisY();
251 QAxis* defaultAxisY = dataSet.axisY();
252 252
253 253 QVERIFY2(defaultAxisY, "Missing axisY.");
254 254
@@ -279,11 +279,11 void tst_ChartDataSet::seriesCount_data()
279 279 void tst_ChartDataSet::seriesCount()
280 280 {
281 281 QFETCH(QLineSeries*, series0);
282 QFETCH(QChartAxis*, axis0);
282 QFETCH(QAxis*, axis0);
283 283 QFETCH(QLineSeries*, series1);
284 QFETCH(QChartAxis*, axis1);
284 QFETCH(QAxis*, axis1);
285 285 QFETCH(QLineSeries*, series2);
286 QFETCH(QChartAxis*, axis2);
286 QFETCH(QAxis*, axis2);
287 287 QFETCH(int, axisCount);
288 288 Q_UNUSED(axisCount);
289 289
@@ -293,8 +293,8 void tst_ChartDataSet::seriesCount()
293 293 dataSet.addSeries(series1, axis1);
294 294 dataSet.addSeries(series2, axis2);
295 295
296 QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis *, Domain *)));
297 QSignalSpy spy1(&dataSet, SIGNAL(axisRemoved(QChartAxis *)));
296 QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QAxis *, Domain *)));
297 QSignalSpy spy1(&dataSet, SIGNAL(axisRemoved(QAxis *)));
298 298 QSignalSpy spy2(&dataSet, SIGNAL(seriesAdded(QAbstractSeries *, Domain *)));
299 299 QSignalSpy spy3(&dataSet, SIGNAL(seriesRemoved(QAbstractSeries *)));
300 300
@@ -319,11 +319,11 void tst_ChartDataSet::seriesIndex()
319 319 //TODO: rewrite this series_index_data to match better
320 320
321 321 QFETCH(QLineSeries*, series0);
322 QFETCH(QChartAxis*, axis0);
322 QFETCH(QAxis*, axis0);
323 323 QFETCH(QLineSeries*, series1);
324 QFETCH(QChartAxis*, axis1);
324 QFETCH(QAxis*, axis1);
325 325 QFETCH(QLineSeries*, series2);
326 QFETCH(QChartAxis*, axis2);
326 QFETCH(QAxis*, axis2);
327 327 QFETCH(int, axisCount);
328 328 Q_UNUSED(axisCount);
329 329
@@ -333,8 +333,8 void tst_ChartDataSet::seriesIndex()
333 333 dataSet.addSeries(series1, axis1);
334 334 dataSet.addSeries(series2, axis2);
335 335
336 QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis*,Domain*)));
337 QSignalSpy spy1(&dataSet, SIGNAL(axisRemoved(QChartAxis*)));
336 QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QAxis*,Domain*)));
337 QSignalSpy spy1(&dataSet, SIGNAL(axisRemoved(QAxis*)));
338 338 QSignalSpy spy2(&dataSet, SIGNAL(seriesAdded(QSeries*,Domain*)));
339 339 QSignalSpy spy3(&dataSet, SIGNAL(seriesRemoved(QSeries*)));
340 340
@@ -408,11 +408,11 void tst_ChartDataSet::domain_data()
408 408 void tst_ChartDataSet::domain()
409 409 {
410 410 QFETCH(QLineSeries*, series0);
411 QFETCH(QChartAxis*, axis0);
411 QFETCH(QAxis*, axis0);
412 412 QFETCH(QLineSeries*, series1);
413 QFETCH(QChartAxis*, axis1);
413 QFETCH(QAxis*, axis1);
414 414 QFETCH(QLineSeries*, series2);
415 QFETCH(QChartAxis*, axis2);
415 QFETCH(QAxis*, axis2);
416 416 QFETCH(int, axisCount);
417 417 Q_UNUSED(axisCount);
418 418
@@ -422,8 +422,8 void tst_ChartDataSet::domain()
422 422 dataSet.addSeries(series1, axis1);
423 423 dataSet.addSeries(series2, axis2);
424 424
425 QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QChartAxis *, Domain *)));
426 QSignalSpy spy1(&dataSet, SIGNAL(axisRemoved(QChartAxis *)));
425 QSignalSpy spy0(&dataSet, SIGNAL(axisAdded(QAxis *, Domain *)));
426 QSignalSpy spy1(&dataSet, SIGNAL(axisRemoved(QAxis *)));
427 427 QSignalSpy spy2(&dataSet, SIGNAL(seriesAdded(QAbstractSeries *, Domain *)));
428 428 QSignalSpy spy3(&dataSet, SIGNAL(seriesRemoved(QAbstractSeries *)));
429 429
@@ -448,11 +448,11 void tst_ChartDataSet::zoomInDomain_data()
448 448 void tst_ChartDataSet::zoomInDomain()
449 449 {
450 450 QFETCH(QLineSeries*, series0);
451 QFETCH(QChartAxis*, axis0);
451 QFETCH(QAxis*, axis0);
452 452 QFETCH(QLineSeries*, series1);
453 QFETCH(QChartAxis*, axis1);
453 QFETCH(QAxis*, axis1);
454 454 QFETCH(QLineSeries*, series2);
455 QFETCH(QChartAxis*, axis2);
455 QFETCH(QAxis*, axis2);
456 456 QFETCH(int, axisCount);
457 457
458 458 Q_UNUSED(axisCount);
@@ -489,11 +489,11 void tst_ChartDataSet::zoomOutDomain_data()
489 489 void tst_ChartDataSet::zoomOutDomain()
490 490 {
491 491 QFETCH(QLineSeries*, series0);
492 QFETCH(QChartAxis*, axis0);
492 QFETCH(QAxis*, axis0);
493 493 QFETCH(QLineSeries*, series1);
494 QFETCH(QChartAxis*, axis1);
494 QFETCH(QAxis*, axis1);
495 495 QFETCH(QLineSeries*, series2);
496 QFETCH(QChartAxis*, axis2);
496 QFETCH(QAxis*, axis2);
497 497 QFETCH(int, axisCount);
498 498
499 499 Q_UNUSED(axisCount);
@@ -531,11 +531,11 void tst_ChartDataSet::scrollDomain_data()
531 531 void tst_ChartDataSet::scrollDomain()
532 532 {
533 533 QFETCH(QLineSeries*, series0);
534 QFETCH(QChartAxis*, axis0);
534 QFETCH(QAxis*, axis0);
535 535 QFETCH(QLineSeries*, series1);
536 QFETCH(QChartAxis*, axis1);
536 QFETCH(QAxis*, axis1);
537 537 QFETCH(QLineSeries*, series2);
538 QFETCH(QChartAxis*, axis2);
538 QFETCH(QAxis*, axis2);
539 539 QFETCH(int, axisCount);
540 540
541 541 Q_UNUSED(axisCount);
Show file before | Show file after | Hide comments
@@ -20,7 +20,7
20 20
21 21 #include <QtTest/QtTest>
22 22 #include <private/domain_p.h>
23 #include <qchartaxis.h>
23 #include <qaxis.h>
24 24
25 25 QTCOMMERCIALCHART_USE_NAMESPACE
26 26
Show file before | Show file after | Hide comments
@@ -11,7 +11,7
11 11
12 12 QTCOMMERCIALCHART_USE_NAMESPACE
13 13
14 Q_DECLARE_METATYPE(QChartAxis *)
14 Q_DECLARE_METATYPE(QAxis *)
15 15 Q_DECLARE_METATYPE(QAbstractSeries *)
16 16 Q_DECLARE_METATYPE(QChart::AnimationOption)
17 17 Q_DECLARE_METATYPE(QBrush)
@@ -157,7 +157,7 void tst_QChart::qchart()
157 157 void tst_QChart::addSeries_data()
158 158 {
159 159 QTest::addColumn<QAbstractSeries *>("series");
160 QTest::addColumn<QChartAxis *>("axis");
160 QTest::addColumn<QAxis *>("axis");
161 161
162 162 QAbstractSeries* series0 = new QLineSeries(this);
163 163 QAbstractSeries* series1 = new QAreaSeries(static_cast<QLineSeries*>(series0));
@@ -168,23 +168,23 void tst_QChart::addSeries_data()
168 168 QAbstractSeries* series6 = new QPercentBarSeries(QBarCategories(),this);
169 169 QAbstractSeries* series7 = new QStackedBarSeries(QBarCategories(),this);
170 170
171 QChartAxis* axis = new QChartAxis(this);
171 QAxis* axis = new QAxis(this);
172 172
173 QTest::newRow("default axis: lineSeries") << series0 << (QChartAxis*) 0;
173 QTest::newRow("default axis: lineSeries") << series0 << (QAxis*) 0;
174 174 QTest::newRow("axis0: lineSeries") << series0 << axis;
175 QTest::newRow("default axis: areaSeries") << series1 << (QChartAxis*) 0;
175 QTest::newRow("default axis: areaSeries") << series1 << (QAxis*) 0;
176 176 QTest::newRow("axis: areaSeries") << series1 << axis;
177 QTest::newRow("default axis: scatterSeries") << series2 << (QChartAxis*) 0;
177 QTest::newRow("default axis: scatterSeries") << series2 << (QAxis*) 0;
178 178 QTest::newRow("axis1: scatterSeries") << series2 << axis;
179 QTest::newRow("default axis: splineSeries") << series3 << (QChartAxis*) 0;
179 QTest::newRow("default axis: splineSeries") << series3 << (QAxis*) 0;
180 180 QTest::newRow("axis: splineSeries") << series3 << axis;
181 QTest::newRow("default axis: pieSeries") << series4 << (QChartAxis*) 0;
181 QTest::newRow("default axis: pieSeries") << series4 << (QAxis*) 0;
182 182 QTest::newRow("axis: pieSeries") << series4 << axis;
183 QTest::newRow("default axis: barSeries") << series5 << (QChartAxis*) 0;
183 QTest::newRow("default axis: barSeries") << series5 << (QAxis*) 0;
184 184 QTest::newRow("axis: barSeries") << series5 << axis;
185 QTest::newRow("default axis: percentBarSeries") << series6 << (QChartAxis*) 0;
185 QTest::newRow("default axis: percentBarSeries") << series6 << (QAxis*) 0;
186 186 QTest::newRow("axis: barSeries") << series6 << axis;
187 QTest::newRow("default axis: stackedBarSeries") << series7 << (QChartAxis*) 0;
187 QTest::newRow("default axis: stackedBarSeries") << series7 << (QAxis*) 0;
188 188 QTest::newRow("axis: barSeries") << series7 << axis;
189 189
190 190 }
@@ -192,7 +192,7 void tst_QChart::addSeries_data()
192 192 void tst_QChart::addSeries()
193 193 {
194 194 QFETCH(QAbstractSeries *, series);
195 QFETCH(QChartAxis *, axis);
195 QFETCH(QAxis *, axis);
196 196 m_view->show();
197 197 QTest::qWaitForWindowShown(m_view);
198 198 if(!axis) axis = m_chart->axisY();
@@ -227,7 +227,7 void tst_QChart::axisX_data()
227 227 void tst_QChart::axisX()
228 228 {
229 229 QVERIFY(m_chart->axisX());
230 QChartAxis* axis = m_chart->axisX();
230 QAxis* axis = m_chart->axisX();
231 231 createTestData();
232 232 //it should be the same axis
233 233 QCOMPARE(axis,m_chart->axisX());
@@ -235,21 +235,21 void tst_QChart::axisX()
235 235
236 236 void tst_QChart::axisY_data()
237 237 {
238 QTest::addColumn<QChartAxis*>("axis0");
239 QTest::addColumn<QChartAxis*>("axis1");
240 QTest::addColumn<QChartAxis*>("axis2");
241 QTest::newRow("1 defualt, 2 optional") << (QChartAxis*)0 << new QChartAxis() << new QChartAxis();
242 QTest::newRow("3 optional") << new QChartAxis() << new QChartAxis() << new QChartAxis();
238 QTest::addColumn<QAxis*>("axis0");
239 QTest::addColumn<QAxis*>("axis1");
240 QTest::addColumn<QAxis*>("axis2");
241 QTest::newRow("1 defualt, 2 optional") << (QAxis*)0 << new QAxis() << new QAxis();
242 QTest::newRow("3 optional") << new QAxis() << new QAxis() << new QAxis();
243 243 }
244 244
245 245
246 246 void tst_QChart::axisY()
247 247 {
248 QFETCH(QChartAxis*, axis0);
249 QFETCH(QChartAxis*, axis1);
250 QFETCH(QChartAxis*, axis2);
248 QFETCH(QAxis*, axis0);
249 QFETCH(QAxis*, axis1);
250 QFETCH(QAxis*, axis2);
251 251
252 QChartAxis* defaultAxisY = m_chart->axisY();
252 QAxis* defaultAxisY = m_chart->axisY();
253 253
254 254 QVERIFY2(defaultAxisY, "Missing axisY.");
255 255
@@ -385,7 +385,7 void tst_QChart::removeSeries_data()
385 385 void tst_QChart::removeSeries()
386 386 {
387 387 QFETCH(QAbstractSeries *, series);
388 QFETCH(QChartAxis *, axis);
388 QFETCH(QAxis *, axis);
389 389 m_view->show();
390 390 QTest::qWaitForWindowShown(m_view);
391 391 if(!axis) axis = m_chart->axisY();
Show file before | Show file after | Hide comments
@@ -145,9 +145,9 void tst_QChartView::rubberBand()
145 145 //this is hack since view does not get events otherwise
146 146 m_view->setMouseTracking(true);
147 147
148 QChartAxis* axisY = m_view->chart()->axisY();
148 QAxis* axisY = m_view->chart()->axisY();
149 149 QSignalSpy spy0(axisY, SIGNAL(rangeChanged(qreal,qreal)));
150 QChartAxis* axisX = m_view->chart()->axisX();
150 QAxis* axisX = m_view->chart()->axisX();
151 151 QSignalSpy spy1(axisX, SIGNAL(rangeChanged(qreal,qreal)));
152 152
153 153 QTest::qWaitForWindowShown(m_view);
@@ -197,9 +197,9 void tst_QChartView::keys()
197 197 m_view->resize(100 + padding.left() + padding.right(), 100 + padding.top()+ padding.bottom());
198 198 m_view->show();
199 199
200 QChartAxis* axisY = m_view->chart()->axisY();
200 QAxis* axisY = m_view->chart()->axisY();
201 201 QSignalSpy spy0(axisY, SIGNAL(rangeChanged(qreal,qreal)));
202 QChartAxis* axisX = m_view->chart()->axisX();
202 QAxis* axisX = m_view->chart()->axisX();
203 203 QSignalSpy spy1(axisX, SIGNAL(rangeChanged(qreal,qreal)));
204 204
205 205 QTest::keyPress(m_view, key);
Show file before | Show file after | Hide comments
@@ -22,7 +22,7
22 22
23 23 #include <QChart>
24 24 #include <QScatterSeries>
25 #include <QChartAxis>
25 #include <QAxis>
26 26 #include <QBarSet>
27 27 #include <QBarSeries>
28 28 #include <QLegend>
Show file before | Show file after | Hide comments
@@ -143,7 +143,7 void TableWidget::updateChartType(bool toggle)
143 143
144 144 // renable axes of the chart (pie hides them)
145 145 // x axis
146 QChartAxis *axis = m_chart->axisX();
146 QAxis *axis = m_chart->axisX();
147 147 axis->setAxisVisible(true);
148 148 axis->setGridLineVisible(true);
149 149 axis->setLabelsVisible(true);
@@ -332,5 +332,5 void TableWidget::updateChartType(bool toggle)
332 332
333 333 TableWidget::~TableWidget()
334 334 {
335
335
336 336 }
General Comments 0
You need to be logged in to leave comments. Login now