HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2439:8946feb2c29e

0

plugins/designer/qchartsplugin.cpp 0 -2

              QChartsPlugin::QChartsPlugin(QObject *parent) :
                  QObject(parent)
              {
-                 // TODO Auto-generated constructor stub
              }
              QChartsPlugin::~QChartsPlugin()
              {
-                 // TODO Auto-generated destructor stub
              }
              QString QChartsPlugin::name() const

0

src/areachart/areachartitem.cpp +1 -1

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

0

src/areachart/qareaseries.cpp +1 -3

              void QAreaSeries::setUpperSeries(QLineSeries *series)
              {
                  Q_D(QAreaSeries);
-                 if(d->m_upperSeries!=series){
+                 if (d->m_upperSeries != series)
                  	d->m_upperSeries = series;
-                 	//TODO:
+                 }
              }
              QLineSeries *QAreaSeries::upperSeries() const

0

src/axis/categoryaxis/chartcategoryaxisx.cpp 0 -1

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

0

src/axis/categoryaxis/chartcategoryaxisy.cpp 0 -1

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

0

src/axis/chartaxis.cpp +2 -8

              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){
+                 if (max <= min || ticks < 1)
                      return labels;
+                 }
                  int n = qMax(int(-qFloor(log10((max - min) / (ticks - 1)))), 0);
                  n++;
              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) {
+                 if (max <= min || ticks < 1) {
                      return labels;
                  }

0

src/axis/qabstractaxis.cpp +2 -3

                  return d_ptr->m_axisPen;
              }
-             //TODO: remove me
+             //TODO: remove me 2.0
              void QAbstractAxis::setLinePenColor(QColor color)
              {
                  QPen p = d_ptr->m_axisPen;
              {
                  return d_ptr->m_labelsAngle;
              }
-             //TODO: remove me
+             //TODO: remove me 2.0
              void QAbstractAxis::setLabelsColor(QColor color)
              {
                  QBrush b = d_ptr->m_labelsBrush;
                          if (forced || pen == m_titlePen){
                              q_ptr->setTitlePen(Qt::NoPen);// Noen for performance reasons
                          }
-                         //TODO: discuss with Tero
                          if (forced || font == m_titleFont){
                              QFont font(m_labelsFont);
                              font.setBold(true);

0

src/axis/qabstractaxis.h +1 -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(); //TODO: missing const <- BC
+                 Qt::Orientation orientation(); //TODO: missing const <- BC (2.0)
                  Qt::Alignment alignment() const;
                  //range handling

0

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

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

0

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

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

0

src/chartlayout.cpp 0 -2

                  qreal bottomOffset = 0;
                  foreach(ChartElement *axisElement , axes) {
-                     //TODO fixme
                      ChartAxis* axis = qobject_cast<ChartAxis*>(axisElement);
                      if (!axis->isVisible())

0

src/chartpresenter_p.h +1 -1

              #define CHARTPRESENTER_H
              #include "qchartglobal.h"
-             #include "qchart.h" //becouse of QChart::ChartThemeId //TODO
+             #include "qchart.h" //because of QChart::ChartThemeId
              #include <QRectF>
              #include <QMargins>

0

src/qabstractseries.cpp 0 -5

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

0

src/qchart.cpp +1 -3

              {
                  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());
              }
              ///*!
              //    TODO: Dummy.
-             //    Adjest the ranges of the axes so that all the data of the specified \a series is visible
+             //    Adjust the ranges of the axes so that all the data of the specified \a series is visible
              // */
              //void QChart::adjustViewToSeries(QAbstractSeries* series)
              //{

0

tests/auto/qabstractaxis/tst_qabstractaxis.cpp 0 -4

              void tst_QAbstractAxis::qabstractaxis()
              {
                  QCOMPARE(m_axis->linePen(), QPen());
-                 //TODO QCOMPARE(m_axis->axisPenColor(), QColor());
                  QCOMPARE(m_axis->gridLinePen(), QPen());
                  QCOMPARE(m_axis->isLineVisible(), true);
                  QCOMPARE(m_axis->isGridLineVisible(), true);
                  QCOMPARE(m_axis->isVisible(), true);
                  QCOMPARE(m_axis->labelsAngle(), 0);
                  QCOMPARE(m_axis->labelsBrush(), QBrush());
-                 //TODO QCOMPARE(m_axis->labelsColor(), QColor());
                  QCOMPARE(m_axis->labelsFont(), QFont());
                  QCOMPARE(m_axis->labelsPen(), QPen());
                  QCOMPARE(m_axis->labelsVisible(), true);
                  m_axis->setShadesPen(QPen());
                  m_axis->setShadesVisible(false);
                  m_axis->setVisible(false);
-                 //TODO QCOMPARE(m_axis->shadesBorderColor(), QColor());
                  //TODO QCOMPARE(m_axis->shadesBrush(), QBrush());
-                 //TODO QCOMPARE(m_axis->shadesColor(), QColor());
                  QCOMPARE(m_axis->shadesPen(), QPen());
                  QCOMPARE(m_axis->shadesVisible(), false);
                  m_axis->show();

0

tests/chartdesigner/engine.cpp 0 -1

                  }
                  case QAbstractSeries::SeriesTypeBar:
                  {
-                     //TODO: fix me
                      QBarSeries *bar = new QBarSeries();
                      setupBarSeries(bar,keys,minRow,maxRow);
                      result << bar;

0

tests/chartwidgettest/mainwidget.cpp 0 -1

              QList<RealList> MainWidget::generateTestData(int columnCount, int rowCount, QString dataCharacteristics)
              {
-                 // TODO: dataCharacteristics
                  QList<RealList> testData;
                  for (int j(0); j < columnCount; j++) {
                      QList <qreal> newColumn;

	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