HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2708:b421e87aa00a

Added QChart::locale property...

Miikka Heikkinen -

r2708:b421e87aa00a

parent child

Context file:

r2708:b421e87aa00a

Collapse all files

plugins/declarative/declarativechart.cpp +1 -1

                When \c{true}, all generated numbers appearing in various series and axis labels will be
                localized using the default QLocale of the application, which defaults to the system locale.
                When \c{false}, the "C" locale is always used.
-               Defaults to \c{false}.
+               Defaults to \c{true}.
              */
              /*!

plugins/declarative/declarativechart.h +1 -1

                  void seriesRemoved(QAbstractSeries *series);
                  Q_REVISION(3) void plotAreaColorChanged();
                  Q_REVISION(3) void backgroundRoundnessChanged(qreal diameter);
-                 Q_REVISION(4) bool localizeNumbersChanged();
+                 Q_REVISION(4) void localizeNumbersChanged();
              private Q_SLOTS:
                  void changeMinimumMargins(int top, int bottom, int left, int right);

src/axis/chartaxiselement.cpp +1 -1

                  n++;
                  for (int i = 0; i < ticks; i++) {
                      qreal value = min + (i * (max - min) / (ticks - 1));
-                     labels << QDateTime::fromMSecsSinceEpoch(value).toString(format);
+                     labels << presenter()->locale().toString(QDateTime::fromMSecsSinceEpoch(value), format);
                  }
                  return labels;
              }

src/axis/datetimeaxis/qdatetimeaxis.cpp +2 0

                \property QDateTimeAxis::format
                The format string that is used when creating label for the axis out of a QDateTime object.
                Check QDateTime documentation for information on how the string should be defined.
+               \sa QChart::locale
              */
              /*!
                \qmlproperty string DateTimeAxis::format

src/chartpresenter.cpp +4 -4

                    m_background(0),
                    m_plotAreaBackground(0),
                    m_title(0),
-                   m_localizeNumbers(false)
+                   m_localizeNumbers(true)
              {
                  if (type == QChart::ChartTypeCartesian)
                      m_layout = new CartesianChartLayout(this);
                  m_layout->invalidate();
              }
-             bool ChartPresenter::localizeNumbers() const
+             void ChartPresenter::setLocale(const QLocale &locale)
              {
-                 return m_localizeNumbers;
+                 m_locale = locale;
+                 m_layout->invalidate();
              }
              AbstractChartLayout *ChartPresenter::layout()
              {
                  return m_layout;

src/chartpresenter_p.h +3 -2

                  bool isBackgroundDropShadowEnabled() const;
                  void setLocalizeNumbers(bool localize);
-                 bool localizeNumbers() const;
+                 inline bool localizeNumbers() const { return m_localizeNumbers; }
+                 void setLocale(const QLocale &locale);
+                 inline const QLocale &locale() const { return m_locale; }
                  void setVisible(bool visible);
                  inline static qreal textMargin() { return qreal(0.5); }
                  QString numberToString(double value, char f = 'g', int prec = 6);
-                 inline const QLocale &locale() const { return m_locale; }
              private:
                  void createBackgroundItem();

src/qchart.cpp +27 -2

                \property QChart::localizeNumbers
                \since QtCharts 2.0
                When \c{true}, all generated numbers appearing in various series and axis labels will be
-               localized using the default QLocale of the application, which defaults to the system locale.
+               localized using the QLocale set with the locale property.
                When \c{false}, the "C" locale is always used.
-               Defaults to \c{false}.
+               Defaults to \c{true}.
+               \note This property doesn't affect QDateTimeAxis labels, which always use the QLocale set with
+               the locale property.
+               \sa locale
+             */
+             /*!
+               \property QChart::locale
+               \since QtCharts 2.0
+               Sets the locale used to format various chart labels when localizeNumbers is \c{true}.
+               This also determines the locale used to format QDateTimeAxis labels regardless of
+               localizeNumbers property.
+               Defaults to application default locale at the time the chart is constructed.
+               \sa localizeNumbers
              */
              /*!
                  return d_ptr->m_presenter->localizeNumbers();
              }
+             void QChart::setLocale(const QLocale &locale)
+             {
+                 d_ptr->m_presenter->setLocale(locale);
+             }
+             QLocale QChart::locale() const
+             {
+                 return d_ptr->m_presenter->locale();
+             }
              void QChart::setAnimationOptions(AnimationOptions options)
              {
                  d_ptr->m_presenter->setAnimationOptions(options);

src/qchart.h +3 0

                  Q_PROPERTY(QChart::ChartType chartType READ chartType)
                  Q_PROPERTY(bool plotAreaBackgroundVisible READ isPlotAreaBackgroundVisible WRITE setPlotAreaBackgroundVisible)
                  Q_PROPERTY(bool localizeNumbers READ localizeNumbers WRITE setLocalizeNumbers)
+                 Q_PROPERTY(QLocale locale READ locale WRITE setLocale)
                  Q_ENUMS(ChartTheme)
                  Q_ENUMS(AnimationOption)
                  Q_ENUMS(ChartType)
                  bool isPlotAreaBackgroundVisible() const;
                  void setLocalizeNumbers(bool localize);
                  bool localizeNumbers() const;
+                 void setLocale(const QLocale &locale);
+                 QLocale locale() const;
                  QPointF mapToValue(const QPointF &position, QAbstractSeries *series = 0);
                  QPointF mapToPosition(const QPointF &value, QAbstractSeries *series = 0);

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