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

Theme modifications....

Mika Salmela -

r2479:e5122ae0e714

parent child

Context file:

r2479:e5122ae0e714

Collapse all files

src/boxplotchart/qboxplotseries.cpp +9 -4

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "qboxplotseries.h"
             #include "qboxplotseries_p.h"
             #include "qboxplotlegendmarker.h"
             #include "boxplotchartitem_p.h"
             #include "chartdataset_p.h"
             #include "charttheme_p.h"
             #include "qvalueaxis.h"
             #include "charttheme_p.h"
             #include "boxplotanimation_p.h"
             #include "qchart_p.h"
             #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             /*!
                 \class QBoxPlotSeries
                 \brief Series for creating stacked bar chart
                 \mainclass
                 QBoxPlotSeries represents a series of data shown as bars. The purpose of this class is to draw bars
                 as stacks, where bars in same category are stacked on top of each other.
                 QBoxPlotSeries groups the data from sets to categories, which are defined by QStringList.
                 See the \l {BoxPlotChart Example} {stacked bar chart example} to learn how to create a stacked bar chart.
                 \image examples_boxplotchart.png
                 \sa QBarSet, QPercentBarSeries, QAbstractBarSeries
             */
             /*!
                 \qmlclass BoxPlotSeries QBoxPlotSeries
                 \inherits AbstractBarSeries
                 The following QML shows how to create a simple stacked bar chart:
                 \snippet ../demos/qmlchart/qml/qmlchart/View7.qml 1
                 \beginfloatleft
                 \image demos_qmlchart7.png
                 \endfloat
                 \clearfloat
             */
             /*!
                 Constructs empty QBoxPlotSeries.
                 QBoxPlotSeries is QObject which is a child of a \a parent.
             */
             QBoxPlotSeries::QBoxPlotSeries(QObject *parent)
                 : QAbstractBarSeries(*new QBoxPlotSeriesPrivate(this), parent)
             {
             }
             /*!
                 Destructor. Removes series from chart.
             */
             QBoxPlotSeries::~QBoxPlotSeries()
             {
                 qDebug() << "QBoxPlotSeries::~QBoxPlotSeries";
                 Q_D(QBoxPlotSeries);
                 if (d->m_chart)
                     d->m_chart->removeSeries(this);
             }
             /*!
                 Returns QChartSeries::SeriesTypeBoxPlot.
             */
             QAbstractSeries::SeriesType QBoxPlotSeries::type() const
             {
                 return QAbstractSeries::SeriesTypeBoxPlot;
             }
             void QBoxPlotSeries::setBrush(const QBrush &brush)
             {
                 Q_D(QBoxPlotSeries);
                 if (d->m_brush != brush) {
                     d->m_brush = brush;
                     emit d->updated();
                 }
             }
             QBrush QBoxPlotSeries::brush() const
             {
                 Q_D(const QBoxPlotSeries);
                 return d->m_brush;
             }
             void QBoxPlotSeries::setPen(const QPen &pen)
             {
                 Q_D(QBoxPlotSeries);
                 if (d->m_pen != pen) {
                     d->m_pen = pen;
                     emit d->updated();
                 }
             }
             QPen QBoxPlotSeries::pen() const
             {
                 Q_D(const QBoxPlotSeries);
                 return d->m_pen;
             }
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             QBoxPlotSeriesPrivate::QBoxPlotSeriesPrivate(QBoxPlotSeries *q)
                 : QAbstractBarSeriesPrivate(q),
                   m_pen(QPen(Qt::NoPen)),
                   m_brush(QBrush(Qt::NoBrush))
             {
             }
             QBoxPlotSeriesPrivate::~QBoxPlotSeriesPrivate()
             {
                 qDebug() << "QBoxPlotSeriesPrivate::~QBoxPlotSeriesPrivate()";
                 disconnect(this, 0, 0, 0);
             }
             void QBoxPlotSeriesPrivate::initializeDomain()
             {
                 qreal minX(domain()->minX());
                 qreal minY(domain()->minY());
                 qreal maxX(domain()->maxX());
                 qreal maxY(domain()->maxY());
                 qreal x = categoryCount();
                 minX = qMin(minX, - (qreal)0.5);
                 minY = qMin(minY, bottom());
                 maxX = qMax(maxX, x - (qreal)0.5);
                 //maxY = qMax(maxY, top());
                 maxY = qMax(maxY, max());
                 domain()->setRange(minX, maxX, minY, maxY);
             }
             void QBoxPlotSeriesPrivate::initializeGraphics(QGraphicsItem* parent)
             {
                 Q_Q(QBoxPlotSeries);
                 BoxPlotChartItem *boxPlot = new BoxPlotChartItem(q,parent);
                 m_item.reset(boxPlot);
                 QAbstractSeriesPrivate::initializeGraphics(parent);
                 if (m_chart) {
                     connect(m_chart->d_ptr->m_dataset, SIGNAL(seriesAdded(QAbstractSeries*)), this, SLOT(handleSeriesChange(QAbstractSeries*)) );
                     connect(m_chart->d_ptr->m_dataset, SIGNAL(seriesRemoved(QAbstractSeries*)), this, SLOT(handleSeriesRemove(QAbstractSeries*)) );
                     QList<QAbstractSeries *> serieses = m_chart->series();
                     boxPlot->m_seriesCount = serieses.count();
                     // Tries to find this series from the Chart's list of serieses and deduce the index
                     int index = 0;
                     foreach (QAbstractSeries *s, serieses) {
                         if (q == static_cast<QBoxPlotSeries *>(s)) {
                             boxPlot->m_seriesIndex = index;
                             m_index = index;
                         }
                         index++;
                     }
                 }
                 // Make BoxPlotChartItem to instantiate box & whisker items
                 boxPlot->handleDataStructureChanged();
             }
             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);
                 }
             }
             void QBoxPlotSeriesPrivate::initializeAnimations(QtCommercialChart::QChart::AnimationOptions options)
             {
                 BoxPlotChartItem *item = static_cast<BoxPlotChartItem *>(m_item.data());
                 Q_ASSERT(item);
                 if (options.testFlag(QChart::SeriesAnimations)) {
                     item->setAnimation(new BoxPlotAnimation(item));
                 }else{
                     item->setAnimation((BoxPlotAnimation *)0);
                 }
                 QAbstractSeriesPrivate::initializeAnimations(options);
             }
             QList<QLegendMarker*> QBoxPlotSeriesPrivate::createLegendMarkers(QLegend *legend)
             {
                 Q_Q(QBoxPlotSeries);
                 QList<QLegendMarker*> list;
                 return list << new QBoxPlotLegendMarker(q, legend);
             }
             void QBoxPlotSeriesPrivate::handleSeriesRemove(QAbstractSeries *series)
             {
                 qDebug() << "QBoxPlotSeriesPrivate::handleSeriesRemove";
                 Q_Q(QBoxPlotSeries);
                 QBoxPlotSeries *removedSeries = static_cast<QBoxPlotSeries *>(series);
                 QObject::disconnect(m_chart->d_ptr->m_dataset, 0, removedSeries->d_func(), 0);
                 // Test if series removed is me, then don't do anything
                 if (q != removedSeries) {
                     BoxPlotChartItem *item = static_cast<BoxPlotChartItem *>(m_item.data());
                     if (item) {
                         item->m_seriesCount = item->m_seriesCount - 1;
                         if (removedSeries->d_func()->m_index < m_index) {
                             m_index--;
                             item->m_seriesIndex = m_index;
                         }
                         item->handleDataStructureChanged();
                     }
                 }
             }
             void QBoxPlotSeriesPrivate::handleSeriesChange(QAbstractSeries *series)
             {
                 Q_UNUSED(series);
                 Q_Q(QBoxPlotSeries);
                 BoxPlotChartItem *boxPlot = static_cast<BoxPlotChartItem *>(m_item.data());
                 if (m_chart) {
                     QList<QAbstractSeries *> serieses = m_chart->series();
                     boxPlot->m_seriesCount = serieses.count();
                     // Tries to find this series from the Chart's list of serieses and deduce the index
                     int index = 0;
                     foreach (QAbstractSeries *s, serieses) {
                         if (q == static_cast<QBoxPlotSeries *>(s)) {
                             boxPlot->m_seriesIndex = index;
                             m_index = index;
                         }
                         index++;
                     }
                 }
                 boxPlot->handleDataStructureChanged();
             }
             #include "moc_qboxplotseries.cpp"
             #include "moc_qboxplotseries_p.cpp"
             QTCOMMERCIALCHART_END_NAMESPACE

src/boxplotchart/qboxplotseries.h 0 -2

             /****************************************************************************
             **
             ** Copyright (C) 2012 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef QBOXPLOTSERIES_H
             #define QBOXPLOTSERIES_H
             #include <qchartglobal.h>
             #include <qabstractbarseries.h>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QBoxPlotSeriesPrivate;
             //class QBarSet;
             class QTCOMMERCIALCHART_EXPORT QBoxPlotSeries : public QAbstractBarSeries
             {
                 Q_OBJECT
             public:
                 explicit QBoxPlotSeries(QObject *parent = 0);
                 ~QBoxPlotSeries();
                 QAbstractSeries::SeriesType type() const;
-                void mika();
                 void setBrush(const QBrush &brush);
                 QBrush brush() const;
                 void setPen(const QPen &pen);
                 QPen pen() const;
             private:
                 Q_DECLARE_PRIVATE(QBoxPlotSeries)
                 Q_DISABLE_COPY(QBoxPlotSeries)
                 friend class BoxPlotChartItem;
                 friend class QBoxPlotLegendMarkerPrivate;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // QBOXPLOTSERIES_H

src/themes/charttheme_p.h +2 0

             /****************************************************************************
             **
             ** Copyright (C) 2013 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef CHARTTHEME_H
             #define CHARTTHEME_H
             #include "chartthememanager_p.h"
             #include <QColor>
             #include <QGradientStops>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartTheme
             {
             public:
                 enum BackgroundShadesMode {
                     BackgroundShadesNone = 0,
                     BackgroundShadesVertical,
                     BackgroundShadesHorizontal,
                     BackgroundShadesBoth
                 };
             protected:
                 explicit ChartTheme(QChart::ChartTheme id = QChart::ChartThemeLight):m_id(id),
                 m_backgroundShades(BackgroundShadesNone),
                 m_backgroundDropShadowEnabled(false){};
             public:
                 QChart::ChartTheme id() const { return m_id; }
                 QList<QGradient> seriesGradients() const { return m_seriesGradients; }
                 QList<QColor> seriesColors() const { return m_seriesColors; }
                 QLinearGradient chartBackgroundGradient() const { return m_chartBackgroundGradient; }
                 QFont masterFont() const { return m_masterFont; }
                 QFont labelFont() const { return m_labelFont; }
                 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; }
                 QPen girdLinePen() const { return m_gridLinePen; }
             protected:
                 QChart::ChartTheme m_id;
                 QList<QColor> m_seriesColors;
                 QList<QGradient> m_seriesGradients;
                 QLinearGradient m_chartBackgroundGradient;
                 QFont m_masterFont;
                 QFont m_labelFont;
                 QBrush m_labelBrush;
                 QPen m_axisLinePen;
                 QPen m_backgroundShadesPen;
+                QPen m_outlinePen;
                 QBrush m_backgroundShadesBrush;
                 BackgroundShadesMode m_backgroundShades;
                 bool m_backgroundDropShadowEnabled;
                 QPen m_gridLinePen;
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif // CHARTTHEME_H

src/themes/chartthemebluecerulean_p.h +2 0

             /****************************************************************************
             **
             ** Copyright (C) 2013 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef CHARTTHEMEBLUECERULEAN_P_H
             #define CHARTTHEMEBLUECERULEAN_P_H
             #include "charttheme_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartThemeBlueCerulean: public ChartTheme
             {
             public:
                 ChartThemeBlueCerulean() : ChartTheme(QChart::ChartThemeBlueCerulean) {
                     // Series colors
                     m_seriesColors << QRgb(0xc7e85b);
                     m_seriesColors << QRgb(0x1cb54f);
                     m_seriesColors << QRgb(0x5cbf9b);
                     m_seriesColors << QRgb(0x009fbf);
                     m_seriesColors << QRgb(0xee7392);
                     m_seriesGradients = ChartThemeManager::generateSeriesGradients(m_seriesColors);
                     // Background
                     QLinearGradient backgroundGradient(0.5, 0.0, 0.5, 1.0);
                     backgroundGradient.setColorAt(0.0, QRgb(0x056189));
                     backgroundGradient.setColorAt(1.0, QRgb(0x101a31));
                     backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
                     m_chartBackgroundGradient = backgroundGradient;
                     // Axes and other
                     m_labelBrush = QBrush(QRgb(0xffffff));
                     m_axisLinePen = QPen(QRgb(0xd6d6d6));
                     m_axisLinePen.setWidth(2);
                     m_gridLinePen = QPen(QRgb(0x84a2b0));
                     m_gridLinePen.setWidth(1);
                     m_backgroundShades = BackgroundShadesNone;
+                    m_outlinePen = QPen(QRgb(0xd6d6d6));
+                    m_outlinePen.setWidthF(2.0);
                 }
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/themes/chartthemeblueicy_p.h +2 0

             /****************************************************************************
             **
             ** Copyright (C) 2013 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef CHARTTHEMEBLUEICY_P_H
             #define CHARTTHEMEBLUEICY_P_H
             #include "charttheme_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartThemeBlueIcy: public ChartTheme
             {
             public:
                 ChartThemeBlueIcy() : ChartTheme(QChart::ChartThemeBlueIcy)
                 {
                     // Series colors
                     m_seriesColors << QRgb(0x3daeda);
                     m_seriesColors << QRgb(0x2685bf);
                     m_seriesColors << QRgb(0x0c2673);
                     m_seriesColors << QRgb(0x5f3dba);
                     m_seriesColors << QRgb(0x2fa3b4);
                     m_seriesGradients = ChartThemeManager::generateSeriesGradients(m_seriesColors);
                     // Background
                     QLinearGradient backgroundGradient(0.5, 0.0, 0.5, 1.0);
                     backgroundGradient.setColorAt(0.0, QRgb(0xffffff));
                     backgroundGradient.setColorAt(1.0, QRgb(0xffffff));
                     backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
                     m_chartBackgroundGradient = backgroundGradient;
                     m_backgroundDropShadowEnabled = true;
                     // Axes and other
                     m_labelBrush = QBrush(QRgb(0x404044));
                     m_axisLinePen = QPen(QRgb(0xd6d6d6));
                     m_axisLinePen.setWidth(2);
                     m_gridLinePen = QPen(QRgb(0xe2e2e2));
                     m_gridLinePen.setWidth(1);
                     m_backgroundShades = BackgroundShadesNone;
+                    m_outlinePen = QPen(QColor(Qt::black));
+                    m_outlinePen.setWidthF(2.0);
                 }
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/themes/chartthemebluencs_p.h +2 0

             /****************************************************************************
             **
             ** Copyright (C) 2013 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef CHARTTHEMEBLUENCS_P_H
             #define CHARTTHEMEBLUENCS_P_H
             #include "charttheme_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartThemeBlueNcs: public ChartTheme
             {
             public:
                 ChartThemeBlueNcs() : ChartTheme(QChart::ChartThemeBlueNcs)
                 {
                     // Series colors
                     m_seriesColors << QRgb(0x1db0da);
                     m_seriesColors << QRgb(0x1341a6);
                     m_seriesColors << QRgb(0x88d41e);
                     m_seriesColors << QRgb(0xff8e1a);
                     m_seriesColors << QRgb(0x398ca3);
                     m_seriesGradients = ChartThemeManager::generateSeriesGradients(m_seriesColors);
                     // Background
                     QLinearGradient backgroundGradient;
                     backgroundGradient.setColorAt(0.0, QRgb(0xffffff));
                     backgroundGradient.setColorAt(1.0, QRgb(0xffffff));
                     backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
                     m_chartBackgroundGradient = backgroundGradient;
                     // Axes and other
                     m_labelBrush = QBrush(QRgb(0x404044));
                     m_axisLinePen = QPen(QRgb(0xd6d6d6));
                     m_axisLinePen.setWidth(2);
                     m_gridLinePen = QPen(QRgb(0xe2e2e2));
                     m_gridLinePen.setWidth(1);
                     m_backgroundShades = BackgroundShadesNone;
+                    m_outlinePen = QPen(QColor(Qt::black));
+                    m_outlinePen.setWidthF(2.0);
                 }
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/themes/chartthemebrownsand_p.h +2 0

             /****************************************************************************
             **
             ** Copyright (C) 2013 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef CHARTTHEMEBROWNSAND_P_H
             #define CHARTTHEMEBROWNSAND_P_H
             #include "charttheme_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartThemeBrownSand: public ChartTheme
             {
             public:
                 ChartThemeBrownSand() : ChartTheme(QChart::ChartThemeBrownSand)
                 {
                     // Series colors
                     m_seriesColors << QRgb(0xb39b72);
                     m_seriesColors << QRgb(0xb3b376);
                     m_seriesColors << QRgb(0xc35660);
                     m_seriesColors << QRgb(0x536780);
                     m_seriesColors << QRgb(0x494345);
                     m_seriesGradients = ChartThemeManager::generateSeriesGradients(m_seriesColors);
                     // Background
                     QLinearGradient backgroundGradient;
                     backgroundGradient.setColorAt(0.0, QRgb(0xf3ece0));
                     backgroundGradient.setColorAt(1.0, QRgb(0xf3ece0));
                     backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
                     m_chartBackgroundGradient = backgroundGradient;
                     // Axes and other
                     m_labelBrush = QBrush(QRgb(0x404044));
                     m_axisLinePen = QPen(QRgb(0xb5b0a7));
                     m_axisLinePen.setWidth(2);
                     m_gridLinePen = QPen(QRgb(0xd4cec3));
                     m_gridLinePen.setWidth(1);
                     m_backgroundShades = BackgroundShadesNone;
+                    m_outlinePen = QPen(QColor(Qt::black));
+                    m_outlinePen.setWidthF(2.0);
                 }
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/themes/chartthemedark_p.h +2 0

             /****************************************************************************
             **
             ** Copyright (C) 2013 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef CHARTTHEMEDARK_P_H
             #define CHARTTHEMEDARK_P_H
             #include "charttheme_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartThemeDark : public ChartTheme
             {
             public:
                 ChartThemeDark() : ChartTheme(QChart::ChartThemeDark)
                 {
                     // Series colors
                     m_seriesColors << QRgb(0x38ad6b);
                     m_seriesColors << QRgb(0x3c84a7);
                     m_seriesColors << QRgb(0xeb8817);
                     m_seriesColors << QRgb(0x7b7f8c);
                     m_seriesColors << QRgb(0xbf593e);
                     m_seriesGradients = ChartThemeManager::generateSeriesGradients(m_seriesColors);
                     // Background
                     QLinearGradient backgroundGradient(0.5, 0.0, 0.5, 1.0);
                     backgroundGradient.setColorAt(0.0, QRgb(0x2e303a));
                     backgroundGradient.setColorAt(1.0, QRgb(0x121218));
                     backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
                     m_chartBackgroundGradient = backgroundGradient;
                     // Axes and other
                     m_labelBrush = QBrush(QRgb(0xffffff));
                     m_axisLinePen = QPen(QRgb(0x86878c));
                     m_axisLinePen.setWidth(2);
                     m_gridLinePen = QPen(QRgb(0x86878c));
                     m_gridLinePen.setWidth(1);
                     m_backgroundShades = BackgroundShadesNone;
+                    m_outlinePen = QPen(QRgb(0xd6d6d6));
+                    m_outlinePen.setWidthF(1.0);
                 }
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/themes/chartthemehighcontrast_p.h +2 0

             /****************************************************************************
             **
             ** Copyright (C) 2013 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef CHARTTHEMEHIGHCONTRAST_P_H
             #define CHARTTHEMEHIGHCONTRAST_P_H
             #include "charttheme_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartThemeHighContrast : public ChartTheme
             {
             public:
                 ChartThemeHighContrast() : ChartTheme(QChart::ChartThemeHighContrast)
                 {
                     // Series colors
                     m_seriesColors << QRgb(0x202020);
                     m_seriesColors << QRgb(0x596a74);
                     m_seriesColors << QRgb(0xffab03);
                     m_seriesColors << QRgb(0x038e9b);
                     m_seriesColors << QRgb(0xff4a41);
                     m_seriesGradients = ChartThemeManager::generateSeriesGradients(m_seriesColors);
                     // Background
                     QLinearGradient backgroundGradient(0.5, 0.0, 0.5, 1.0);
                     backgroundGradient.setColorAt(0.0, QRgb(0xffffff));
                     backgroundGradient.setColorAt(1.0, QRgb(0xffffff));
                     backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
                     m_chartBackgroundGradient = backgroundGradient;
                     m_backgroundDropShadowEnabled = true;
                     // Axes and other
                     m_labelBrush = QBrush(QRgb(0x181818));
                     m_axisLinePen = QPen(QRgb(0x8c8c8c));
                     m_axisLinePen.setWidth(2);
                     m_gridLinePen = QPen(QRgb(0x8c8c8c));
                     m_gridLinePen.setWidth(1);
                     m_backgroundShadesBrush = QBrush(QRgb(0xffeecd));
                     m_backgroundShades = BackgroundShadesHorizontal;
+                    m_outlinePen = QPen(QColor(Qt::black));
+                    m_outlinePen.setWidthF(1.0);
                 }
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

src/themes/chartthemelight_p.h +2 0

             /****************************************************************************
             **
             ** Copyright (C) 2013 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the QtCommercial Chart API.  It exists purely as an
             // implementation detail.  This header file may change from version to
             // version without notice, or even be removed.
             //
             // We mean it.
             #ifndef CHARTTHEMELIGHT_P_H
             #define CHARTTHEMELIGHT_P_H
             #include "charttheme_p.h"
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartThemeLight: public ChartTheme
             {
             public:
                 ChartThemeLight() : ChartTheme(QChart::ChartThemeLight)
                 {
                     // Series colors
                     m_seriesColors << QRgb(0x209fdf);
                     m_seriesColors << QRgb(0x99ca53);
                     m_seriesColors << QRgb(0xf6a625);
                     m_seriesColors << QRgb(0x6d5fd5);
                     m_seriesColors << QRgb(0xbf593e);
                     m_seriesGradients = ChartThemeManager::generateSeriesGradients(m_seriesColors);
                     // Background
                     QLinearGradient backgroundGradient;
                     backgroundGradient.setColorAt(0.0, QRgb(0xffffff));
                     backgroundGradient.setColorAt(1.0, QRgb(0xffffff));
                     backgroundGradient.setCoordinateMode(QGradient::ObjectBoundingMode);
                     m_chartBackgroundGradient = backgroundGradient;
                     // There is a performance issue in the drop shadow implementation, so disabled for now
             //        m_backgroundDropShadowEnabled = true;
                     // Axes and other
                     m_axisLinePen = QPen(0xd6d6d6);
                     m_axisLinePen.setWidth(1);
                     m_labelBrush = QBrush(QRgb(0x404044));
                     m_gridLinePen = QPen(QRgb(0xe2e2e2));
                     m_gridLinePen.setWidth(1);
                     m_backgroundShades = BackgroundShadesNone;
+                    m_outlinePen = QPen(QColor(Qt::black));
+                    m_outlinePen.setWidthF(2.0);
                 }
             };
             QTCOMMERCIALCHART_END_NAMESPACE
             #endif

tests/boxplottester/mainwidget.cpp +20 -8

             /****************************************************************************
             **
             ** Copyright (C) 2013 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #include "mainwidget.h"
             #include <QChartView>
             #include <QBoxPlotSeries>
             #include <QBarSet>
             #include <QLegend>
             #include <QBarCategoryAxis>
             #include <QBrush>
             #include <QColor>
             #include <QPushButton>
             #include <QComboBox>
             #include <QSpinBox>
             #include <QCheckBox>
             #include <QGridLayout>
             #include <QHBoxLayout>
             #include <QLabel>
             #include <QSpacerItem>
             #include <QMessageBox>
             #include <cmath>
             #include <QDebug>
             #include <QStandardItemModel>
             #include <QBarCategoryAxis>
             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();
                 // Grid layout for the controls for configuring the chart widget
                 QGridLayout *grid = new QGridLayout();
                 // Create add a series button
                 QPushButton *addSeriesButton = new QPushButton("Add a series");
                 connect(addSeriesButton, SIGNAL(clicked()), this, SLOT(addSeries()));
                 grid->addWidget(addSeriesButton, rowPos++, 1);
                 // Create remove a series button
                 QPushButton *removeSeriesButton = new QPushButton("Remove a series");
                 connect(removeSeriesButton, SIGNAL(clicked()), this, SLOT(removeSeries()));
                 grid->addWidget(removeSeriesButton, rowPos++, 1);
                 // Create add a single box button
                 QPushButton *addBoxButton = new QPushButton("Add a box");
                 connect(addBoxButton, SIGNAL(clicked()), this, SLOT(addBox()));
                 grid->addWidget(addBoxButton, rowPos++, 1);
                 initThemeCombo(grid);
                 initCheckboxes(grid);
                 // add row with empty label to make all the other rows static
                 grid->addWidget(new QLabel(""), grid->rowCount(), 0);
                 grid->setRowStretch(grid->rowCount() - 1, 1);
                 // Create chart view with the chart
                 m_chartView = new QChartView(m_chart, this);
                 //m_chartView->setRubberBand(QChartView::HorizonalRubberBand);
                 // Another grid layout as a main layout
                 QGridLayout *mainLayout = new QGridLayout();
                 mainLayout->addLayout(grid, 0, 0);
                 mainLayout->addWidget(m_chartView, 0, 1, 3, 1);
                 setLayout(mainLayout);
                 legendToggled(false);
                 animationToggled(false);
             }
             // Combo box for selecting theme
             void MainWidget::initThemeCombo(QGridLayout *grid)
             {
                 QComboBox *chartTheme = new QComboBox();
                 chartTheme->addItem("Default");
                 chartTheme->addItem("Light");
                 chartTheme->addItem("Blue Cerulean");
                 chartTheme->addItem("Dark");
                 chartTheme->addItem("Brown Sand");
                 chartTheme->addItem("Blue NCS");
                 chartTheme->addItem("High Contrast");
                 chartTheme->addItem("Blue Icy");
                 connect(chartTheme, SIGNAL(currentIndexChanged(int)),
                         this, SLOT(changeChartTheme(int)));
                 grid->addWidget(new QLabel("Chart theme:"), rowPos, 0);
                 grid->addWidget(chartTheme, rowPos++, 1);
             }
             // Different check boxes for customizing chart
             void MainWidget::initCheckboxes(QGridLayout *grid)
             {
                 QCheckBox *animationCheckBox = new QCheckBox("Animation");
                 connect(animationCheckBox, SIGNAL(toggled(bool)), this, SLOT(animationToggled(bool)));
                 animationCheckBox->setChecked(false);
                 grid->addWidget(animationCheckBox, rowPos++, 0);
                 QCheckBox *legendCheckBox = new QCheckBox("Legend");
                 connect(legendCheckBox, SIGNAL(toggled(bool)), this, SLOT(legendToggled(bool)));
                 legendCheckBox->setChecked(false);
                 grid->addWidget(legendCheckBox, rowPos++, 0);
                 QCheckBox *titleCheckBox = new QCheckBox("Title");
                 connect(titleCheckBox, SIGNAL(toggled(bool)), this, SLOT(titleToggled(bool)));
                 titleCheckBox->setChecked(false);
                 grid->addWidget(titleCheckBox, rowPos++, 0);
             }
             void MainWidget::addSeries()
             {
                 qDebug() << "BoxPlotTester::MainWidget::addSeries()";
                 if (nSeries > 9)
                     return;
                 // Initial data
                 //![1]
                 QBarSet *set0 = new QBarSet("Jan");
                 QBarSet *set1 = new QBarSet("Feb");
                 QBarSet *set2 = new QBarSet("Mar");
                 QBarSet *set3 = new QBarSet("Apr");
                 QBarSet *set4 = new QBarSet("May");
                 QBarSet *set5 = new QBarSet("Jun");
                 //      low  bot   med   top  upp
                 *set0 << 3 << 4 << 4.4 << 6 << 7;
                 *set1 << 5 << 6 << 7.5 << 8 << 12;
                 *set2 << 3 << 5 << 5.7 << 8 << 9;
                 *set3 << 5 << 6 << 6.8 << 7 << 8;
                 *set4 << 4 << 5 << 5.2 << 6 << 7;
                 *set5 << 4 << 7 << 8.2 << 9 << 10;
                 m_series[nSeries] = new QBoxPlotSeries();
                 m_series[nSeries]->append(set0);
                 m_series[nSeries]->append(set1);
                 m_series[nSeries]->append(set2);
                 m_series[nSeries]->append(set3);
                 m_series[nSeries]->append(set4);
                 m_series[nSeries]->append(set5);
                 m_series[nSeries]->type();
                 m_series[nSeries]->setName("Box & Whiskers");
                 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++;
             }
             void MainWidget::removeSeries()
             {
                 if (nSeries > 0) {
                     nSeries--;
                     m_chart->removeSeries(m_series[nSeries]);
                     delete m_series[nSeries];
                 }
             }
             void MainWidget::addBox()
             {
                 qDebug() << "BoxPlotTester::MainWidget::addBox()";
                 QBarSet *newSet = new QBarSet("New");
                 *newSet << 5 << 6 << 6.8 << 7 << 8;
                 m_series[0]->append(newSet);
+                m_axis->append(addCategories[nNewBoxes]);
+                nNewBoxes++;
             }
             void MainWidget::animationToggled(bool enabled)
             {
                 qDebug() << "BoxPlotTester::Animation toggled to " << enabled;
                 if (enabled)
                     m_chart->setAnimationOptions(QChart::SeriesAnimations);
                 else
                     m_chart->setAnimationOptions(QChart::NoAnimation);
             }
             void MainWidget::legendToggled(bool enabled)
             {
                 qDebug() << "BoxPlotTester::Legend toggled to " << enabled;
                 m_chart->legend()->setVisible(enabled);
                 if (enabled)
                     m_chart->legend()->setAlignment(Qt::AlignBottom);
             }
             void MainWidget::titleToggled(bool enabled)
             {
                 qDebug() << "BoxPlotTester::Title toggled to " << enabled;
                 if (enabled)
                     m_chart->setTitle("Simple boxplotchart example");
                 else
                     m_chart->setTitle("");
             }
             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

             /****************************************************************************
             **
             ** Copyright (C) 2013 Digia Plc
             ** All rights reserved.
             ** For any questions to Digia, please use contact form at http://qt.digia.com
             **
             ** This file is part of the Qt Commercial Charts Add-on.
             **
             ** $QT_BEGIN_LICENSE$
             ** Licensees holding valid Qt Commercial licenses may use this file in
             ** accordance with the Qt Commercial License Agreement provided with the
             ** Software or, alternatively, in accordance with the terms contained in
             ** a written agreement between you and Digia.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.digia.com
             ** $QT_END_LICENSE$
             **
             ****************************************************************************/
             #ifndef MAINWIDGET_H
             #define MAINWIDGET_H
             #include "qchartglobal.h"
             #include "qchart.h"
             #include "qchartview.h"
             #include <QWidget>
             #include <QBoxPlotSeries>
+            #include <QBarCategoryAxis>
             class QGridLayout;
             QTCOMMERCIALCHART_USE_NAMESPACE
             class MainWidget : public QWidget
             {
                 Q_OBJECT
             public:
                 explicit MainWidget(QWidget *parent = 0);
             signals:
             private:
                 void initThemeCombo(QGridLayout *grid);
                 void initCheckboxes(QGridLayout *grid);
             private slots:
                 void addSeries();
                 void removeSeries();
                 void addBox();
                 void animationToggled(bool enabled);
                 void legendToggled(bool enabled);
                 void titleToggled(bool enabled);
                 void changeChartTheme(int themeIndex);
             private:
                 QChart *m_chart;
                 QChartView *m_chartView;
                 QGridLayout *m_scatterLayout;
+                QBarCategoryAxis *m_axis;
                 int rowPos;
                 int nSeries;
+                int nNewBoxes;
                 QBoxPlotSeries *m_series[10];
             };
             #endif // MAINWIDGET_H

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