@@ -57,11 +57,6 void AxisAnimation::setValues(QVector<qreal> &oldLayout, QVector<qreal> &newLayo | |||
|
57 | 57 | { |
|
58 | 58 | if (state() != QAbstractAnimation::Stopped) stop(); |
|
59 | 59 | |
|
60 | // TODO: cannot return even if layout is empty | |
|
61 | // New layout is not set properly without it (crash) | |
|
62 | // if (newLayout.count() == 0) | |
|
63 | // return; | |
|
64 | ||
|
65 | 60 | switch (m_type) { |
|
66 | 61 | case ZoomOutAnimation: { |
|
67 | 62 | QRectF rect = m_axis->gridGeometry(); |
@@ -130,7 +125,6 void AxisAnimation::updateCurrentValue(const QVariant &value) | |||
|
130 | 125 | { |
|
131 | 126 | if (state() != QAbstractAnimation::Stopped) { //workaround |
|
132 | 127 | QVector<qreal> vector = qvariant_cast<QVector<qreal> >(value); |
|
133 | // Q_ASSERT(vector.count() != 0); | |
|
134 | 128 | m_axis->setLayout(vector); |
|
135 | 129 | m_axis->updateGeometry(); |
|
136 | 130 | } |
@@ -31,10 +31,8 | |||
|
31 | 31 | |
|
32 | 32 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
|
33 | 33 | |
|
34 | //TODO: optimize : remove points which are not visible | |
|
35 | ||
|
36 | 34 | AreaChartItem::AreaChartItem(QAreaSeries *areaSeries, QGraphicsItem* item) |
|
37 |
: ChartItem(areaSeries->d_func(),item), |
|
|
35 | : ChartItem(areaSeries->d_func(),item), | |
|
38 | 36 | m_series(areaSeries), |
|
39 | 37 | m_upper(0), |
|
40 | 38 | m_lower(0), |
@@ -213,8 +213,7 void QAreaSeries::setUpperSeries(QLineSeries *series) | |||
|
213 | 213 | { |
|
214 | 214 | Q_D(QAreaSeries); |
|
215 | 215 | if(d->m_upperSeries!=series){ |
|
216 | d->m_upperSeries = series; | |
|
217 | //TODO: | |
|
216 | d->m_upperSeries = series; | |
|
218 | 217 |
|
|
219 | 218 | } |
|
220 | 219 |
@@ -247,8 +247,7 void QBarCategoryAxis::remove(const QString &category) | |||
|
247 | 247 | } else if (d->m_maxCategory == category) { |
|
248 | 248 | setRange(d->m_minCategory, d->m_categories.last()); |
|
249 | 249 | } else { |
|
250 | d->updateCategoryDomain(); | |
|
251 | //TODO:: d->emitUpdated(); | |
|
250 | d->updateCategoryDomain(); | |
|
252 | 251 |
|
|
253 | 252 | } else { |
|
254 | 253 | setRange(QString::null, QString::null); |
@@ -281,8 +280,7 void QBarCategoryAxis::insert(int index, const QString &category) | |||
|
281 | 280 | } else if (index == count) { |
|
282 | 281 | setRange(d->m_minCategory, d->m_categories.last()); |
|
283 | 282 | } else { |
|
284 | d->updateCategoryDomain(); | |
|
285 | //TODO:: d->emitUpdated(); | |
|
283 | d->updateCategoryDomain(); | |
|
286 | 284 |
|
|
287 | 285 | |
|
288 | 286 | emit categoriesChanged(); |
@@ -306,8 +304,6 void QBarCategoryAxis::replace(const QString &oldCategory, const QString &newCat | |||
|
306 | 304 | setRange(newCategory, d->m_maxCategory); |
|
307 | 305 | } else if (d->m_maxCategory == oldCategory) { |
|
308 | 306 | setRange(d->m_minCategory, newCategory); |
|
309 | } else { | |
|
310 | //TODO:: d->emitUpdated(); | |
|
311 | 307 | } |
|
312 | 308 | emit categoriesChanged(); |
|
313 | 309 | emit countChanged(); |
@@ -66,8 +66,7 QVector<qreal> ChartCategoryAxisX::calculateLayout() const | |||
|
66 | 66 | } |
|
67 | 67 | |
|
68 | 68 | void ChartCategoryAxisX::updateGeometry() |
|
69 | { | |
|
70 | //TODO: this is not optimal when many categories :( , create only visible lables | |
|
69 | { | |
|
71 | 70 |
|
|
72 | 71 | HorizontalAxis::updateGeometry(); |
|
73 | 72 | } |
@@ -74,8 +74,7 void ChartCategoryAxisY::updateGeometry() | |||
|
74 | 74 | |
|
75 | 75 | void ChartCategoryAxisY::handleAxisUpdated() |
|
76 | 76 | { |
|
77 | updateGeometry(); | |
|
78 | //TODO:: ChartAxis::handleAxisUpdated(); | |
|
77 | updateGeometry(); | |
|
79 | 78 | } |
|
80 | 79 | |
|
81 | 80 | QSizeF ChartCategoryAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const |
@@ -226,8 +226,7 void QCategoryAxis::remove(const QString &categoryLabel) | |||
|
226 | 226 | range.first = d->m_categoriesMap.value(d->m_categories.at(labelIndex - 1)).second; |
|
227 | 227 | d->m_categoriesMap.insert(label, range); |
|
228 | 228 | } |
|
229 | } | |
|
230 | //TODO:: d->emitUpdated(); | |
|
229 | } | |
|
231 | 230 |
|
|
232 | 231 | } |
|
233 | 232 | |
@@ -250,8 +249,7 void QCategoryAxis::replaceLabel(const QString &oldLabel, const QString &newLabe | |||
|
250 | 249 | d->m_categories.replace(labelIndex, newLabel); |
|
251 | 250 | Range range = d->m_categoriesMap.value(oldLabel); |
|
252 | 251 | d->m_categoriesMap.remove(oldLabel); |
|
253 | d->m_categoriesMap.insert(newLabel, range); | |
|
254 | //TODO:: d->emitUpdated(); | |
|
252 | d->m_categoriesMap.insert(newLabel, range); | |
|
255 | 253 |
|
|
256 | 254 | } |
|
257 | 255 |
@@ -419,9 +419,6 void ChartAxis::handleRangeChanged(qreal min, qreal max) | |||
|
419 | 419 | |
|
420 | 420 | QStringList ChartAxis::createValueLabels(qreal min, qreal max, int ticks,const QString& format) |
|
421 | 421 | { |
|
422 | //TODO: Q_ASSERT(m_max > m_min); | |
|
423 | //TODO: Q_ASSERT(ticks > 1); | |
|
424 | ||
|
425 | 422 | QStringList labels; |
|
426 | 423 | |
|
427 | 424 | if(max <= min || ticks < 1){ |
@@ -509,8 +506,6 QStringList ChartAxis::createLogValueLabels(qreal min, qreal max, qreal base, in | |||
|
509 | 506 | |
|
510 | 507 | QStringList ChartAxis::createDateTimeLabels(qreal min, qreal max,int ticks,const QString& format) |
|
511 | 508 | { |
|
512 | //TODO: Q_ASSERT(m_max > m_min); | |
|
513 | //TODO: Q_ASSERT(ticks > 1); | |
|
514 | 509 | QStringList labels; |
|
515 | 510 | |
|
516 | 511 | if(max <= min || ticks < 1) { |
@@ -468,7 +468,6 QPen QAbstractAxis::linePen() const | |||
|
468 | 468 | return d_ptr->m_axisPen; |
|
469 | 469 | } |
|
470 | 470 | |
|
471 | //TODO: remove me | |
|
472 | 471 | void QAbstractAxis::setLinePenColor(QColor color) |
|
473 | 472 | { |
|
474 | 473 | QPen p = d_ptr->m_axisPen; |
@@ -614,7 +613,7 int QAbstractAxis::labelsAngle() const | |||
|
614 | 613 | { |
|
615 | 614 | return d_ptr->m_labelsAngle; |
|
616 | 615 | } |
|
617 | //TODO: remove me | |
|
616 | ||
|
618 | 617 | void QAbstractAxis::setLabelsColor(QColor color) |
|
619 | 618 | { |
|
620 | 619 | QBrush b = d_ptr->m_labelsBrush; |
@@ -863,8 +862,6 void QAbstractAxis::setRange(const QVariant &min, const QVariant &max) | |||
|
863 | 862 | /*! |
|
864 | 863 | Returns the orientation in which the axis is being used (Vertical or Horizontal) |
|
865 | 864 | */ |
|
866 | // NOTE: should have const but it breaks BC: | |
|
867 | // http://techbase.kde.org/Policies/Binary_Compatibility_Examples#Change_the_CV-qualifiers_of_a_member_function | |
|
868 | 865 | Qt::Orientation QAbstractAxis::orientation() |
|
869 | 866 | { |
|
870 | 867 | return d_ptr->orientation(); |
@@ -931,7 +928,7 void QAbstractAxisPrivate::initializeTheme(ChartTheme* theme, bool forced) | |||
|
931 | 928 | if (forced || brush == m_labelsBrush){ |
|
932 | 929 | q_ptr->setLabelsBrush(theme->labelBrush()); |
|
933 | 930 | } |
|
934 | //TODO: introduce axis brush | |
|
931 | ||
|
935 | 932 | if (forced || brush == m_titleBrush){ |
|
936 | 933 | q_ptr->setTitleBrush(theme->labelBrush()); |
|
937 | 934 | } |
@@ -967,7 +964,7 void QAbstractAxisPrivate::initializeTheme(ChartTheme* theme, bool forced) | |||
|
967 | 964 | if (forced || font == m_labelsFont){ |
|
968 | 965 | q_ptr->setLabelsFont(theme->labelFont()); |
|
969 | 966 | } |
|
970 | //TODO: discuss with Tero | |
|
967 | ||
|
971 | 968 | if (forced || font == m_titleFont){ |
|
972 | 969 | QFont font(m_labelsFont); |
|
973 | 970 | font.setBold(true); |
@@ -43,7 +43,7 class QTCOMMERCIALCHART_EXPORT QAbstractAxis : public QObject | |||
|
43 | 43 | Q_PROPERTY(bool labelsVisible READ labelsVisible WRITE setLabelsVisible NOTIFY labelsVisibleChanged) |
|
44 | 44 | Q_PROPERTY(QPen labelsPen READ labelsPen WRITE setLabelsPen NOTIFY labelsPenChanged) |
|
45 | 45 | Q_PROPERTY(QBrush labelsBrush READ labelsBrush WRITE setLabelsBrush NOTIFY labelsBrushChanged) |
|
46 | //TODO: fix labels angles to work with layout | |
|
46 | ||
|
47 | 47 | Q_PROPERTY(int labelsAngle READ labelsAngle WRITE setLabelsAngle NOTIFY labelsAngleChanged) |
|
48 | 48 | Q_PROPERTY(QFont labelsFont READ labelsFont WRITE setLabelsFont NOTIFY labelsFontChanged) |
|
49 | 49 | Q_PROPERTY(QColor labelsColor READ labelsColor WRITE setLabelsColor NOTIFY labelsColorChanged) |
@@ -146,7 +146,7 public: | |||
|
146 | 146 | void setShadesBorderColor(QColor color); |
|
147 | 147 | QColor shadesBorderColor() const; |
|
148 | 148 | |
|
149 |
Qt::Orientation orientation(); |
|
|
149 | Qt::Orientation orientation(); | |
|
150 | 150 | Qt::Alignment alignment() const; |
|
151 | 151 | |
|
152 | 152 | //range handling |
@@ -60,7 +60,7 public: | |||
|
60 | 60 | void setLabelFormat(const QString &format); |
|
61 | 61 | QString labelFormat() const; |
|
62 | 62 | |
|
63 | //TODO: depreciated ! | |
|
63 | ||
|
64 | 64 | void setNiceNumbersEnabled(bool enable = true); |
|
65 | 65 | bool niceNumbersEnabled() const; |
|
66 | 66 |
@@ -61,7 +61,7 private: | |||
|
61 | 61 | int m_tickCount; |
|
62 | 62 | QString m_format; |
|
63 | 63 | bool m_applying; |
|
64 |
bool m_niceNumbersEnabled; |
|
|
64 | bool m_niceNumbersEnabled; | |
|
65 | 65 | Q_DECLARE_PUBLIC(QValueAxis) |
|
66 | 66 | }; |
|
67 | 67 |
@@ -183,9 +183,6 QList<QGradient> ChartThemeManager::generateSeriesGradients(const QList<QColor>& | |||
|
183 | 183 | qreal h = color.hsvHueF(); |
|
184 | 184 | qreal s = color.hsvSaturationF(); |
|
185 | 185 | |
|
186 | // TODO: tune the algorithm to give nice results with most base colors defined in | |
|
187 | // most themes. The rest of the gradients we can define manually in theme specific | |
|
188 | // implementation. | |
|
189 | 186 | QColor start = color; |
|
190 | 187 | start.setHsvF(h, 0.0, 1.0); |
|
191 | 188 | g.setColorAt(0.0, start); |
@@ -39,7 +39,7 | |||
|
39 | 39 | |
|
40 | 40 | QTCOMMERCIALCHART_BEGIN_NAMESPACE |
|
41 | 41 | |
|
42 | // TODO: check these | |
|
42 | ||
|
43 | 43 | class QAbstractSeries; |
|
44 | 44 | class QAreaSeries; |
|
45 | 45 | class QXYSeries; |
@@ -204,11 +204,6 QChart *QAbstractSeries::chart() const | |||
|
204 | 204 | return d_ptr->m_chart; |
|
205 | 205 | } |
|
206 | 206 | |
|
207 | //void QAbstractSeries::adjustView() | |
|
208 | //{ | |
|
209 | // //TODO: | |
|
210 | //} | |
|
211 | ||
|
212 | 207 | /*! |
|
213 | 208 | \brief Sets the visibility of the series to true |
|
214 | 209 |
@@ -118,8 +118,6 QChart::QChart(QGraphicsItem *parent, Qt::WindowFlags wFlags) | |||
|
118 | 118 | { |
|
119 | 119 | d_ptr->m_legend = new LegendScroller(this); |
|
120 | 120 | setTheme(QChart::ChartThemeLight); |
|
121 | //TODO: what is that ? | |
|
122 | //connect(d_ptr->m_presenter, SIGNAL(marginsChanged(QRectF)), this, SIGNAL(marginsChanged(QRectF))); | |
|
123 | 121 | setLayout(d_ptr->m_presenter->layout()); |
|
124 | 122 | } |
|
125 | 123 | |
@@ -449,15 +447,6 QRectF QChart::plotArea() const | |||
|
449 | 447 | return d_ptr->m_presenter->geometry(); |
|
450 | 448 | } |
|
451 | 449 | |
|
452 | ///*! | |
|
453 | // TODO: Dummy. | |
|
454 | // Adjest the ranges of the axes so that all the data of the specified \a series is visible | |
|
455 | // */ | |
|
456 | //void QChart::adjustViewToSeries(QAbstractSeries* series) | |
|
457 | //{ | |
|
458 | // // | |
|
459 | //} | |
|
460 | ||
|
461 | 450 | /*! |
|
462 | 451 | Sets animation \a options for the chart |
|
463 | 452 | */ |
@@ -176,8 +176,7 void ScatterChartItem::handleUpdated() | |||
|
176 | 176 | m_shape = m_series->markerShape(); |
|
177 | 177 | setOpacity(m_series->opacity()); |
|
178 | 178 | |
|
179 | if (recreate) { | |
|
180 | // TODO: optimize handleUpdate to recreate points only in case shape changed | |
|
179 | if (recreate) { | |
|
181 | 180 |
|
|
182 | 181 | createPoints(count); |
|
183 | 182 |
General Comments 0
You need to be logged in to leave comments.
Login now