HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1462:62d898329cbd

Minor modifications to properties of abstract, area and bar series

Tero Ahola -

r1462:62d898329cbd

parent child

Context file:

r1462:62d898329cbd

Collapse all files

examples/presenterchart/chartview.cpp +1 -1

              m_index(-1),m_chart(chart)
              {
                  m_chart->setTitle("Charts presenter");
-                 m_chart->setBackgroundDropShadowEnabled(false);
+                 m_chart->setDropShadowEnabled(false);
                  QObject::connect(&m_timer,SIGNAL(timeout()),this,SLOT(handleTimeout()));
                  m_timer.setInterval(3000);

examples/scatterchart/chartview.cpp +1 -1

                  chart()->addSeries(series0);
                  chart()->addSeries(series1);
                  chart()->setTitle("Simple scatterchart example");
-                 chart()->setBackgroundDropShadowEnabled(false);
+                 chart()->setDropShadowEnabled(false);
                  //![3]
              }

plugins/declarative/declarativechart.cpp +44 -35

                  \clearfloat
              */
+             /*!
+               \qmlproperty Theme ChartView::theme
+               Theme defines the visual appearance of the chart, including for example colors, fonts, line
+               widths and chart background.
+             */
+             /*!
+               \qmlproperty Animation ChartView::animation
+               Animation configuration of the chart. One of ChartView.NoAnimation, ChartView.GridAxisAnimations,
+               ChartView.SeriesAnimations or ChartView.AllAnimations.
+             */
+             /*!
+               \qmlproperty string ChartView::title
+               The title of the chart, shown on top of the chart.
+             */
+             /*!
+               \qmlproperty string ChartView::titleColor
+               The color of the title text.
+             */
+             /*!
+               \qmlproperty Axis ChartView::axisX
+               The x-axis of the chart.
+             */
+             /*!
+               \qmlproperty Axis ChartView::axisY
+               The default y-axis of the chart.
+             */
+             /*!
+               \qmlmethod Axis ChartView::axisY(QAbstractSeries *series)
+               The y-axis of the series. This is the same as the default y-axis of the chart, unless you have
+               explicitly defined the series to have a non-default y-axis.
+             */
              DeclarativeChart::DeclarativeChart(QDeclarativeItem *parent)
                  : QDeclarativeItem(parent),
                    m_chart(new QChart(this))
              void DeclarativeChart::componentComplete()
              {
-             //    qDebug() << "DeclarativeChart::componentComplete(), maxX: " << axisX()->max();
                  foreach(QObject *child, children()) {
                      if (qobject_cast<QAbstractSeries *>(child)) {
              //            qDebug() << "DeclarativeChart::componentComplete(), add: " << child;
+                         // TODO: how about optional y-axis?
                          m_chart->addSeries(qobject_cast<QAbstractSeries *>(child));
                      }
                  }
-             //    qDebug() << "DeclarativeChart::componentComplete(), maxX: " << axisX()->max();
                  QDeclarativeItem::componentComplete();
              }
                  return m_chart->axisX();
              }
-             QAxis *DeclarativeChart::axisY()
+             QAxis *DeclarativeChart::axisY(QAbstractSeries *series)
              {
-                 return m_chart->axisY();
+                 return m_chart->axisY(series);
              }
              QLegend *DeclarativeChart::legend()
              void DeclarativeChart::setDropShadowEnabled(bool enabled)
              {
-                 if (enabled != m_chart->isBackgroundDropShadowEnabled()) {
-                     m_chart->setBackgroundDropShadowEnabled(enabled);
+                 if (enabled != m_chart->isDropShadowEnabled()) {
+                     m_chart->setDropShadowEnabled(enabled);
                      dropShadowEnabledChanged(enabled);
                  }
              }
              bool DeclarativeChart::dropShadowEnabled()
              {
-                 return m_chart->isBackgroundDropShadowEnabled();
+                 return m_chart->isDropShadowEnabled();
              }
              void DeclarativeChart::zoom(qreal factor)
                  m_chart->scroll(QPointF(0, -pixels));
              }
-             //void DeclarativeChart::scrollLeft(qreal ticks)
-             //{
-             //    m_chart->scroll(QPointF(ticksToPixels(m_chart->axisX(), ticks), 0));
-             //}
-             //void DeclarativeChart::scrollRight(qreal ticks)
-             //{
-             //    m_chart->scroll(QPointF(-ticksToPixels(m_chart->axisX(), ticks), 0));
-             //}
-             //void DeclarativeChart::scrollUp(qreal ticks)
-             //{
-             //    m_chart->scroll(QPointF(0, ticksToPixels(m_chart->axisY(), ticks)));
-             //}
-             //void DeclarativeChart::scrollDown(qreal ticks)
-             //{
-             //    m_chart->scroll(QPointF(0, -ticksToPixels(m_chart->axisY(), ticks)));
-             //}
-             //qreal DeclarativeChart::ticksToPixels(QAxis *axis, qreal ticks)
-             //{
-             //    qreal tickCount = axis->max() - axis->min();
-             //    qreal tickPixels = (m_chart->size().width() - m_chart->margins().width() * 2) / tickCount;
-             //    return tickPixels * ticks;
-             //}
              QAbstractSeries *DeclarativeChart::series(int index)
              {
                  if (index < m_chart->series().count()) {

plugins/declarative/declarativechart.h +1 -1

                  void setTitle(QString title);
                  QString title();
                  QAxis *axisX();
-                 QAxis *axisY();
+                 Q_INVOKABLE QAxis *axisY(QAbstractSeries *series = 0);
                  QLegend *legend();
                  QVariantList axisXLabels();
                  void setAxisXLabels(QVariantList list);

src/areachart/qareaseries.cpp +5 -5

              */
              /*!
-                \fn QLineSeries* QAreaSeries::upperSeries() const
-                \brief Returns upperSeries used to define one of area boundaries.
+                \property QAreaSeries::upperSeries
+                \brief The upper one of the two line series used to define area series boundaries.
              */
              /*!
-                \fn QLineSeries* QAreaSeries::lowerSeries() const
-                \brief Returns lowerSeries used to define one of area boundaries. Note if QAreaSeries where counstucted wihtout a\ lowerSeries
-                 this function return Null pointer.
+                 \property QAreaSeries::lowerSeries
+                 The lower one of the two line series used to define are series boundaries. Note if
+                 QAreaSeries was counstucted wihtout a\ lowerSeries this is null.
              */
              /*!

src/areachart/qareaseries.h +2 0

              class QTCOMMERCIALCHART_EXPORT QAreaSeries : public QAbstractSeries
              {
                  Q_OBJECT
+                 Q_PROPERTY(QAbstractSeries *upperSeries READ upperSeries)
+                 Q_PROPERTY(QAbstractSeries *lowerSeries READ lowerSeries)
              public:
                  explicit QAreaSeries(QObject *parent = 0);

src/barchart/barchartitem.cpp +2 -2

                  // Create new graphic items for bars
                  for (int c = 0; c < m_series->d_func()->categoryCount(); c++) {
-                     for (int s = 0; s < m_series->barsetCount(); s++) {
+                     for (int s = 0; s < m_series->count(); s++) {
                          QBarSet *set = m_series->d_func()->barsetAt(s);
                          // Bars
                  // Use temporary qreals for accuracy
                  qreal categoryCount = m_series->d_func()->categoryCount();
-                 qreal setCount = m_series->barsetCount();
+                 qreal setCount = m_series->count();
                  bool barsVisible = m_series->isVisible();
                  // Domain:

src/barchart/groupedbarchartitem.cpp +1 -1

                  // Use temporary qreals for accuracy
                  qreal categoryCount = m_series->d_func()->categoryCount();
-                 qreal setCount = m_series->barsetCount();
+                 qreal setCount = m_series->count();
                  bool barsVisible = m_series->isVisible();
                  // Domain:

src/barchart/percentbarchartitem.cpp +1 -1

                  // Use temporary qreals for accuracy
                  qreal categoryCount = m_series->d_func()->categoryCount();
-                 qreal setCount = m_series->barsetCount();
+                 qreal setCount = m_series->count();
                  bool barsVisible = m_series->isVisible();
                  // Domain:

src/barchart/qbarseries.cpp +7 -7

              */
              /*!
-                 \fn void QBarSeries::barsetCountChanged()
+                 \fn void QBarSeries::countChanged()
                  This signal is emitted when barset count has been changed, for example by append or remove.
              */
                      QList<QBarSet*> sets;
                      sets.append(set);
                      emit barsetsAdded(sets);
-                     emit barsetCountChanged();
+                     emit countChanged();
                  }
                  return success;
              }
                      QList<QBarSet*> sets;
                      sets.append(set);
                      emit barsetsRemoved(sets);
-                     emit barsetCountChanged();
+                     emit countChanged();
                  }
                  return success;
              }
                  bool success = d->append(sets);
                  if (success) {
                      emit barsetsAdded(sets);
-                     emit barsetCountChanged();
+                     emit countChanged();
                  }
                  return success;
              }
                      QList<QBarSet*> sets;
                      sets.append(set);
                      emit barsetsAdded(sets);
-                     emit barsetCountChanged();
+                     emit countChanged();
                  }
                  return success;
              }
                  bool success = d->remove(sets);
                  if (success) {
                      emit barsetsRemoved(sets);
-                     emit barsetCountChanged();
+                     emit countChanged();
                  }
              }
              /*!
                  Returns number of sets in series.
              */
-             int QBarSeries::barsetCount() const
+             int QBarSeries::count() const
              {
                  Q_D(const QBarSeries);
                  return d->m_barSets.count();

src/barchart/qbarseries.h +3 -3

              {
                  Q_OBJECT
                  Q_PROPERTY(qreal barWidth READ barWidth WRITE setBarWidth NOTIFY barWidthChanged)
-                 Q_PROPERTY(int count READ barsetCount NOTIFY barsetCountChanged)
+                 Q_PROPERTY(int count READ count NOTIFY countChanged)
                  Q_PROPERTY(bool labelsVisible READ isLabelsVisible WRITE setLabelsVisible NOTIFY labelsVisibleChanged)
              public:
                  bool remove(QBarSet *set);
                  bool append(QList<QBarSet* > sets);
                  bool insert(int index, QBarSet *set);
-                 int barsetCount() const;
+                 int count() const;
                  QList<QBarSet*> barSets() const;
                  void clear();
                  void clicked(QBarSet *barset, int index);
                  void hovered(QBarSet* barset, bool status);
                  void barWidthChanged();
-                 void barsetCountChanged();
+                 void countChanged();
                  void labelsVisibleChanged();
                  void barsetsAdded(QList<QBarSet*> sets);

src/barchart/stackedbarchartitem.cpp +1 -1

                  QVector<QRectF> layout;
                  // Use temporary qreals for accuracy
                  qreal categoryCount = m_series->d_func()->categoryCount();
-                 qreal setCount = m_series->barsetCount();
+                 qreal setCount = m_series->count();
                  bool barsVisible = m_series->isVisible();
                  // Domain:

src/charttheme.cpp +1 -1

                      chart->setBackgroundBrush(m_chartBackgroundGradient);
                  chart->setTitleFont(m_masterFont);
                  chart->setTitleBrush(m_titleBrush);
-                 chart->setBackgroundDropShadowEnabled(m_backgroundDropShadowEnabled);
+                 chart->setDropShadowEnabled(m_backgroundDropShadowEnabled);
              }
              void ChartTheme::decorate(QLegend *legend)

src/qabstractseries.cpp +2 -2

              */
              /*!
-                 \fn QSeriesType QAbstractSeries::type() const
-                 \brief The type of the series.
+                 \property QAbstractSeries::type
+                 The type of the series.
              */
              /*!

src/qabstractseries.h +1 0

                  Q_OBJECT
                  Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
                  Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged)
+                 Q_PROPERTY(SeriesType type READ type)
                  Q_ENUMS(SeriesType)
              public:

src/qchart.cpp +2 -2

              /*!
                  Sets the background drop shadow effect state to \a enabled.
              */
-             void QChart::setBackgroundDropShadowEnabled(bool enabled)
+             void QChart::setDropShadowEnabled(bool enabled)
              {
                  d_ptr->m_presenter->createChartBackgroundItem();
                  d_ptr->m_presenter->m_backgroundItem->setDropShadowEnabled(enabled);
              /*!
                  Returns true if the drop shadow effect is enabled for the chart background.
              */
-             bool QChart::isBackgroundDropShadowEnabled() const
+             bool QChart::isDropShadowEnabled() const
              {
                  if (!d_ptr->m_presenter->m_backgroundItem)
                      return false;

src/qchart.h +2 -2

                  QPen backgroundPen() const;
                  void setBackgroundVisible(bool visible = true);
                  bool isBackgroundVisible() const;
-                 void setBackgroundDropShadowEnabled(bool enabled = true);
-                 bool isBackgroundDropShadowEnabled() const;
+                 void setDropShadowEnabled(bool enabled = true);
+                 bool isDropShadowEnabled() const;
                  void setAnimationOptions(AnimationOptions options);
                  AnimationOptions animationOptions() const;

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