HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2709:682630e62d58

Additional fixes to label localization...

Miikka Heikkinen -

r2709:682630e62d58

parent child

Context file:

r2709:682630e62d58

Collapse all files

src/axis/chartaxiselement.cpp +7 -5

             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             static const char *labelFormatMatchString = "%[\\-\\+#\\s\\d\\.lhjztL]*([dicuoxfegXFEG])";
-            static const char *labelFormatMatchLocalizedString = "^([^%]*)%\\.?(\\d)*([defgEG])(.*)$";
+            static const char *labelFormatMatchLocalizedString = "^([^%]*)%\\.?(\\d)*([defgiEG])(.*)$";
             static QRegExp *labelFormatMatcher = 0;
             static QRegExp *labelFormatMatcherLocalized = 0;
             class StaticLabelFormatMatcherDeleter
                     QString formatSpec;
                     QString preStr;
                     QString postStr;
-                    int precision = 0;
+                    int precision = 6; // Six is the default precision in Qt API
                     if (presenter()->localizeNumbers()) {
                         if (!labelFormatMatcherLocalized)
                             labelFormatMatcherLocalized = new QRegExp(labelFormatMatchLocalizedString);
                         if (labelFormatMatcherLocalized->indexIn(format, 0) != -1) {
                             preStr = labelFormatMatcherLocalized->cap(1);
-                            precision = labelFormatMatcherLocalized->cap(2).toInt();
+                            if (!labelFormatMatcherLocalized->cap(2).isEmpty())
+                                precision = labelFormatMatcherLocalized->cap(2).toInt();
                             formatSpec = labelFormatMatcherLocalized->cap(3);
                             postStr = labelFormatMatcherLocalized->cap(4);
                         }
                     QString formatSpec;
                     QString preStr;
                     QString postStr;
-                    int precision = 0;
+                    int precision = 6; // Six is the default precision in Qt API
                     if (presenter()->localizeNumbers()) {
                         if (!labelFormatMatcherLocalized)
                             labelFormatMatcherLocalized = new QRegExp(labelFormatMatchLocalizedString);
                         if (labelFormatMatcherLocalized->indexIn(format, 0) != -1) {
                             preStr = labelFormatMatcherLocalized->cap(1);
-                            precision = labelFormatMatcherLocalized->cap(2).toInt();
+                            if (!labelFormatMatcherLocalized->cap(2).isEmpty())
+                                precision = labelFormatMatcherLocalized->cap(2).toInt();
                             formatSpec = labelFormatMatcherLocalized->cap(3);
                             postStr = labelFormatMatcherLocalized->cap(4);
                         }

src/axis/valueaxis/qvalueaxis.cpp +2 -2

               See QString::sprintf() for additional details.
               If the QChart::localizeNumbers is \c{true}, the supported specifiers are limited to: d, e, E, f,
-              g, and G. Also, only the precision modifier is supported. The rest of the formatting comes from
+              g, G, and i. Also, only the precision modifier is supported. The rest of the formatting comes from
               the default QLocale of the application.
             */
             /*!
               See QString::sprintf() for additional details.
               If the ChartView::localizeNumbers is \c{true}, the supported specifiers are limited to: d, e, E, f,
-              g, and G. Also, only the precision modifier is supported. The rest of the formatting comes from
+              g, G, and i. Also, only the precision modifier is supported. The rest of the formatting comes from
               the default QLocale of the application.
             */

src/barchart/qabstractbarseries.cpp +1 -1

                 QStringList categories;
                 if (axis->categories().isEmpty()) {
                     for (int i(1); i < categoryCount() + 1; i++)
-                        categories << QString::number(i);
+                        categories << presenter()->numberToString(i);
                     axis->append(categories);
                 }
             }

src/boxplotchart/qboxplotseries.cpp +1 -1

                     for (int i(1); i < m_boxSets.count() + 1; i++) {
                         QBoxSet *set = m_boxSets.at(i - 1);
                         if (set->label().isEmpty())
-                            categories << QString::number(i);
+                            categories << presenter()->numberToString(i);
                         else
                             categories << set->label();
                     }

src/chartpresenter.cpp +8 0

                     return QString::number(value, f, prec);
             }
+            QString ChartPresenter::numberToString(int value)
+            {
+                if (m_localizeNumbers)
+                    return m_locale.toString(value);
+                else
+                    return QString::number(value);
+            }
             #include "moc_chartpresenter_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/chartpresenter_p.h +1 0

                 inline static qreal textMargin() { return qreal(0.5); }
                 QString numberToString(double value, char f = 'g', int prec = 6);
+                QString numberToString(int value);
             private:
                 void createBackgroundItem();

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