HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2479:e5122ae0e714

src/boxplotchart/qboxplotseries.cpp +9 -4

             void QBoxPlotSeriesPrivate::initializeTheme(int index, ChartTheme* theme, bool forced)
             {
                 Q_Q(QBoxPlotSeries);
+                qDebug() << "QBoxPlotSeriesPrivate::initializeTheme";
                 const QList<QGradient> gradients = theme->seriesGradients();
                 if (forced || m_brush == QBrush(Qt::NoBrush)) {
-                    QColor brushColor = ChartThemeManager::colorAt(gradients.at(index % gradients.size()), 0.1);
+                    QColor brushColor = ChartThemeManager::colorAt(gradients.at(index % gradients.size()), 0.5);
                     q->setBrush(brushColor);
                 }
                 if (forced || m_pen == QPen(Qt::NoPen)) {
-                    QPen pen;
+                    QPen pen = theme->outlinePen();
-                    pen.setColor(ChartThemeManager::colorAt(gradients.at(index % gradients.size()), 1.0));
-                    pen.setWidthF(1.0);
                     pen.setCosmetic(true);
+            //        QPen pen;
+            //        pen.setColor(ChartThemeManager::colorAt(gradients.at(index % gradients.size()), 1.0));
+            //        pen.setWidthF(2.0);
+            //        pen.setCosmetic(true);
                     q->setPen(pen);
                 }
             }

src/boxplotchart/qboxplotseries.h 0 -2

                 QAbstractSeries::SeriesType type() const;
-                void mika();
                 void setBrush(const QBrush &brush);
                 QBrush brush() const;
                 void setPen(const QPen &pen);

src/themes/charttheme_p.h +2 0

                 QBrush labelBrush() const { return m_labelBrush; }
                 QPen axisLinePen() const { return m_axisLinePen; }
                 QPen backgroundShadesPen() const { return m_backgroundShadesPen; }
+                QPen outlinePen() const { return m_outlinePen; }
                 QBrush backgroundShadesBrush() const { return m_backgroundShadesBrush; }
                 BackgroundShadesMode backgroundShades() const { return m_backgroundShades; }
                 bool isBackgroundDropShadowEnabled() const { return m_backgroundDropShadowEnabled; }
                 QBrush m_labelBrush;
                 QPen m_axisLinePen;
                 QPen m_backgroundShadesPen;
+                QPen m_outlinePen;
                 QBrush m_backgroundShadesBrush;
                 BackgroundShadesMode m_backgroundShades;
                 bool m_backgroundDropShadowEnabled;

src/themes/chartthemebluecerulean_p.h +2 0

                     m_gridLinePen = QPen(QRgb(0x84a2b0));
                     m_gridLinePen.setWidth(1);
                     m_backgroundShades = BackgroundShadesNone;
+                    m_outlinePen = QPen(QRgb(0xd6d6d6));
+                    m_outlinePen.setWidthF(2.0);
                 }
             };

src/themes/chartthemeblueicy_p.h +2 0

                     m_gridLinePen = QPen(QRgb(0xe2e2e2));
                     m_gridLinePen.setWidth(1);
                     m_backgroundShades = BackgroundShadesNone;
+                    m_outlinePen = QPen(QColor(Qt::black));
+                    m_outlinePen.setWidthF(2.0);
                 }
             };

src/themes/chartthemebluencs_p.h +2 0

                     m_gridLinePen = QPen(QRgb(0xe2e2e2));
                     m_gridLinePen.setWidth(1);
                     m_backgroundShades = BackgroundShadesNone;
+                    m_outlinePen = QPen(QColor(Qt::black));
+                    m_outlinePen.setWidthF(2.0);
                 }
             };

src/themes/chartthemebrownsand_p.h +2 0

                     m_gridLinePen = QPen(QRgb(0xd4cec3));
                     m_gridLinePen.setWidth(1);
                     m_backgroundShades = BackgroundShadesNone;
+                    m_outlinePen = QPen(QColor(Qt::black));
+                    m_outlinePen.setWidthF(2.0);
                 }
             };

src/themes/chartthemedark_p.h +2 0

                     m_gridLinePen = QPen(QRgb(0x86878c));
                     m_gridLinePen.setWidth(1);
                     m_backgroundShades = BackgroundShadesNone;
+                    m_outlinePen = QPen(QRgb(0xd6d6d6));
+                    m_outlinePen.setWidthF(1.0);
                 }
             };

src/themes/chartthemehighcontrast_p.h +2 0

                     m_gridLinePen.setWidth(1);
                     m_backgroundShadesBrush = QBrush(QRgb(0xffeecd));
                     m_backgroundShades = BackgroundShadesHorizontal;
+                    m_outlinePen = QPen(QColor(Qt::black));
+                    m_outlinePen.setWidthF(1.0);
                 }
             };

src/themes/chartthemelight_p.h +2 0

                     m_gridLinePen = QPen(QRgb(0xe2e2e2));
                     m_gridLinePen.setWidth(1);
                     m_backgroundShades = BackgroundShadesNone;
+                    m_outlinePen = QPen(QColor(Qt::black));
+                    m_outlinePen.setWidthF(2.0);
                 }
             };

tests/boxplottester/mainwidget.cpp +20 -8

             QTCOMMERCIALCHART_USE_NAMESPACE
+            QString addCategories[] = {"Jul", "Aug", "Sep", "Nov", "Dec"};
             MainWidget::MainWidget(QWidget *parent) :
                 QWidget(parent),
                 m_chart(0),
                 rowPos(0),
-                nSeries(0)
+                nSeries(0),
+                nNewBoxes(0)
             {
                 m_chart = new QChart();
                 m_chart->addSeries(m_series[nSeries]);
-                QStringList categories;
+                if (nSeries == 0) {
-                categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun";
+                    QStringList categories;
-                QBarCategoryAxis *axis = new QBarCategoryAxis();
+                    categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun";
-                axis->append(categories);
+                    m_axis = new QBarCategoryAxis();
-                m_chart->createDefaultAxes();
+                    m_axis->append(categories);
-                m_chart->setAxisX(axis, m_series[nSeries]);
+                    m_chart->createDefaultAxes();
+                    m_chart->setAxisX(m_axis, m_series[nSeries]);
+                }
                 nSeries++;
             }
                 *newSet << 5 << 6 << 6.8 << 7 << 8;
                 m_series[0]->append(newSet);
+                m_axis->append(addCategories[nNewBoxes]);
+                nNewBoxes++;
             }
             void MainWidget::animationToggled(bool enabled)
             void MainWidget::changeChartTheme(int themeIndex)
             {
                 qDebug() << "BoxPlotTester::changeChartTheme: " << themeIndex;
-                m_chart->setTheme((QChart::ChartTheme) themeIndex);
+                if (themeIndex == 0)
+                    m_chart->setTheme(QChart::ChartThemeLight);
+                else
+                    m_chart->setTheme((QChart::ChartTheme) (themeIndex - 1));
             }

tests/boxplottester/mainwidget.h +3 0

             #include "qchartview.h"
             #include <QWidget>
             #include <QBoxPlotSeries>
+            #include <QBarCategoryAxis>
             class QGridLayout;
                 QChart *m_chart;
                 QChartView *m_chartView;
                 QGridLayout *m_scatterLayout;
+                QBarCategoryAxis *m_axis;
                 int rowPos;
                 int nSeries;
+                int nNewBoxes;
                 QBoxPlotSeries *m_series[10];
             };

	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