HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2407:d108889b4c99

Revert "TODOs removed from code. Undo me after release"...

Michal Klocek -

r2407:d108889b4c99

parent child

Context file:

r2407:d108889b4c99

Collapse all files

src/animations/axisanimation.cpp +6 0

             {
                 if (state() != QAbstractAnimation::Stopped) stop();
+            //  TODO: cannot return even if layout is empty
+            //  New layout is not set properly without it (crash)
+            //    if (newLayout.count() == 0)
+            //        return;
                 switch (m_type) {
                 case ZoomOutAnimation: {
                     QRectF rect = m_axis->gridGeometry();
             {
                 if (state() != QAbstractAnimation::Stopped) { //workaround
                     QVector<qreal> vector = qvariant_cast<QVector<qreal> >(value);
+            //        Q_ASSERT(vector.count() != 0);
                     m_axis->setLayout(vector);
                     m_axis->updateGeometry();
                 }

src/areachart/areachartitem.cpp +3 -1

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
+            //TODO: optimize : remove points which are not visible
             AreaChartItem::AreaChartItem(QAreaSeries *areaSeries, QGraphicsItem* item)
-                : ChartItem(areaSeries->d_func(),item),
+                : ChartItem(areaSeries->d_func(),item), //TODO: fix me
                   m_series(areaSeries),
                   m_upper(0),
                   m_lower(0),

src/areachart/qareaseries.cpp +2 -1

             {
                 Q_D(QAreaSeries);
                 if(d->m_upperSeries!=series){
                 	d->m_upperSeries = series;
+                	//TODO:
                 }
             }

src/axis/barcategoryaxis/qbarcategoryaxis.cpp +6 -2

                         } else if (d->m_maxCategory == category) {
                             setRange(d->m_minCategory, d->m_categories.last());
                         } else {
                             d->updateCategoryDomain();
+                            //TODO:: d->emitUpdated();
                         }
                     } else {
                         setRange(QString::null, QString::null);
                 } else if (index == count) {
                     setRange(d->m_minCategory, d->m_categories.last());
                 } else {
                     d->updateCategoryDomain();
+                    //TODO:: d->emitUpdated();
                 }
                 emit categoriesChanged();
                         setRange(newCategory, d->m_maxCategory);
                     } else if (d->m_maxCategory == oldCategory) {
                         setRange(d->m_minCategory, newCategory);
+                    } else {
+                        //TODO:: d->emitUpdated();
                     }
                     emit categoriesChanged();
                     emit countChanged();

src/axis/categoryaxis/chartcategoryaxisx.cpp +2 -1

             }
             void ChartCategoryAxisX::updateGeometry()
+            {
+                //TODO: this is not optimal when many categories :( , create only visible lables
                 setLabels(m_axis->categoriesLabels() << "");
                 HorizontalAxis::updateGeometry();
             }

src/axis/categoryaxis/chartcategoryaxisy.cpp +2 -1

             void ChartCategoryAxisY::handleAxisUpdated()
             {
                 updateGeometry();
+                //TODO:: ChartAxis::handleAxisUpdated();
             }
             QSizeF ChartCategoryAxisY::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const

src/axis/categoryaxis/qcategoryaxis.cpp +4 -2

                             range.first = d->m_categoriesMap.value(d->m_categories.at(labelIndex - 1)).second;
                             d->m_categoriesMap.insert(label, range);
                         }
+                    }
+                    //TODO:: d->emitUpdated();
                 }
             }
                     d->m_categories.replace(labelIndex, newLabel);
                     Range range = d->m_categoriesMap.value(oldLabel);
                     d->m_categoriesMap.remove(oldLabel);
                     d->m_categoriesMap.insert(newLabel, range);
+                    //TODO:: d->emitUpdated();
                 }
             }

src/axis/chartaxis.cpp +5 0

             QStringList ChartAxis::createValueLabels(qreal min, qreal max, int ticks,const QString& format)
             {
+                //TODO: Q_ASSERT(m_max > m_min);
+                //TODO: Q_ASSERT(ticks > 1);
                 QStringList labels;
                 if(max <= min || ticks < 1){
             QStringList ChartAxis::createDateTimeLabels(qreal min, qreal max,int ticks,const QString& format)
             {
+                //TODO: Q_ASSERT(m_max > m_min);
+                //TODO: Q_ASSERT(ticks > 1);
                 QStringList labels;
                 if(max <= min || ticks < 1) {

src/axis/qabstractaxis.cpp +6 -3

                 return d_ptr->m_axisPen;
             }
+            //TODO: remove me
             void QAbstractAxis::setLinePenColor(QColor color)
             {
                 QPen p = d_ptr->m_axisPen;
             {
                 return d_ptr->m_labelsAngle;
             }
+            //TODO: remove me
             void QAbstractAxis::setLabelsColor(QColor color)
             {
                 QBrush b = d_ptr->m_labelsBrush;
             /*!
               Returns the orientation in which the axis is being used (Vertical or Horizontal)
             */
+            // NOTE: should have const but it breaks BC:
+            // http://techbase.kde.org/Policies/Binary_Compatibility_Examples#Change_the_CV-qualifiers_of_a_member_function
             Qt::Orientation QAbstractAxis::orientation()
             {
                 return d_ptr->orientation();
                     if (forced || brush == m_labelsBrush){
                         q_ptr->setLabelsBrush(theme->labelBrush());
                     }
+                    //TODO: introduce axis brush
                     if (forced || brush == m_titleBrush){
                         q_ptr->setTitleBrush(theme->labelBrush());
                     }
                     if (forced || font == m_labelsFont){
                     	q_ptr->setLabelsFont(theme->labelFont());
                     }
+                    //TODO: discuss with Tero
                     if (forced || font == m_titleFont){
                         QFont font(m_labelsFont);
                         font.setBold(true);

src/axis/qabstractaxis.h +2 -2

                 Q_PROPERTY(bool labelsVisible READ labelsVisible WRITE setLabelsVisible NOTIFY labelsVisibleChanged)
                 Q_PROPERTY(QPen labelsPen READ labelsPen WRITE setLabelsPen NOTIFY labelsPenChanged)
                 Q_PROPERTY(QBrush labelsBrush READ labelsBrush WRITE setLabelsBrush NOTIFY labelsBrushChanged)
+                //TODO: fix labels angles to work with layout
                 Q_PROPERTY(int labelsAngle READ labelsAngle WRITE setLabelsAngle NOTIFY labelsAngleChanged)
                 Q_PROPERTY(QFont labelsFont READ labelsFont WRITE setLabelsFont NOTIFY labelsFontChanged)
                 Q_PROPERTY(QColor labelsColor READ labelsColor WRITE setLabelsColor NOTIFY labelsColorChanged)
                 void setShadesBorderColor(QColor color);
                 QColor shadesBorderColor() const;
-                Qt::Orientation orientation();
+                Qt::Orientation orientation(); //TODO: missing const <- BC
                 Qt::Alignment alignment() const;
                 //range handling

src/axis/valueaxis/qvalueaxis.h +1 -1

                 void setLabelFormat(const QString &format);
                 QString labelFormat() const;
+                //TODO: depreciated !
                 void setNiceNumbersEnabled(bool enable = true);
                 bool niceNumbersEnabled() const;

src/axis/valueaxis/qvalueaxis_p.h +1 -1

                 int m_tickCount;
                 QString m_format;
                 bool m_applying;
-                bool m_niceNumbersEnabled;
+                bool m_niceNumbersEnabled; //TODO: this depreciated
                 Q_DECLARE_PUBLIC(QValueAxis)
             };

src/chartthememanager.cpp +3 0

                     qreal h = color.hsvHueF();
                     qreal s = color.hsvSaturationF();
+                    // TODO: tune the algorithm to give nice results with most base colors defined in
+                    // most themes. The rest of the gradients we can define manually in theme specific
+                    // implementation.
                     QColor start = color;
                     start.setHsvF(h, 0.0, 1.0);
                     g.setColorAt(0.0, start);

src/legend/qlegendmarker_p.h +1 -1

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
+            // TODO: check these
             class QAbstractSeries;
             class QAreaSeries;
             class QXYSeries;

src/qabstractseries.cpp +5 0

                 return d_ptr->m_chart;
             }
+            //void QAbstractSeries::adjustView()
+            //{
+            //    //TODO:
+            //}
             /*!
                 \brief Sets the visibility of the series to true

src/qchart.cpp +11 0

             {
                 d_ptr->m_legend = new LegendScroller(this);
                 setTheme(QChart::ChartThemeLight);
+                //TODO: what is that ?
+                //connect(d_ptr->m_presenter, SIGNAL(marginsChanged(QRectF)), this, SIGNAL(marginsChanged(QRectF)));
                 setLayout(d_ptr->m_presenter->layout());
             }
                 return d_ptr->m_presenter->geometry();
             }
+            ///*!
+            //    TODO: Dummy.
+            //    Adjest the ranges of the axes so that all the data of the specified \a series is visible
+            // */
+            //void QChart::adjustViewToSeries(QAbstractSeries* series)
+            //{
+            //    //
+            //}
             /*!
              Sets animation \a options for the chart
              */

src/scatterchart/scatterchartitem.cpp +2 -1

                 m_shape = m_series->markerShape();
                 setOpacity(m_series->opacity());
                 if (recreate) {
+                    // TODO: optimize handleUpdate to recreate points only in case shape changed
                     deletePoints(count);
                     createPoints(count);

src/xychart/xychart.cpp +2 0

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
+            //TODO: optimize : remove points which are not visible
             XYChart::XYChart(QXYSeries *series,QGraphicsItem* item):
                   ChartItem(series->d_func(),item),
                   m_series(series),

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages