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