HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2799:e9626fb58a47

Fix compile errors/warnings in linux...

Miikka Heikkinen -

r2799:e9626fb58a47

parent child

Context file:

r2799:e9626fb58a47

Collapse all files

src/charts/themes/chartthemesystem_p.h +1 -1

             /****************************************************************************
             **
             ** Copyright (C) 2015 The Qt Company Ltd
             ** All rights reserved.
             ** For any questions to The Qt Company, please use contact form at http://qt.io
             **
             ** This file is part of the Qt Charts module.
             **
             ** Licensees holding valid commercial license for Qt may use this file in
             ** accordance with the Qt License Agreement provided with the Software
             ** or, alternatively, in accordance with the terms contained in a written
             ** agreement between you and The Qt Company.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.io
             **
             ****************************************************************************/
             //  W A R N I N G
             //  -------------
             //
             // This file is not part of the Qt Enterprise 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 CHARTTHEMESYSTEM_P_H
             #define CHARTTHEMESYSTEM_P_H
             #include <private/charttheme_p.h>
             #ifdef Q_OS_WIN
             #include <windows.h>
             #include <stdio.h>
             #endif
             QT_CHARTS_BEGIN_NAMESPACE
             class ChartThemeSystem: public ChartTheme
             {
             public:
                 // System theme not used at the moment (the user is not able to select this theme)
                 ChartThemeSystem() : ChartTheme(QChart::ChartThemeLight /*QChart::ChartThemeSystem*/)
                 {
             #if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
                     // We could also use theme specific window frame color as a series base color (it would give more
                     // variation to the base colors in addition to the blue and black used now)
                     // First series base color from COLOR_HIGHLIGHT
                     DWORD colorHighlight;
                     colorHighlight = GetSysColor(COLOR_HIGHLIGHT);
                     m_seriesColors.append(QColor(GetRValue(colorHighlight),
                                                  GetGValue(colorHighlight),
                                                  GetBValue(colorHighlight)));
                     // Second series base color from COLOR_WINDOWFRAME
                     DWORD colorWindowFrame;
                     colorWindowFrame = GetSysColor(COLOR_WINDOWFRAME);
                     m_seriesColors.append(QColor(GetRValue(colorWindowFrame),
                                                  GetGValue(colorWindowFrame),
                                                  GetBValue(colorWindowFrame)));
                     // Third series base color from the middle of the COLOR_ACTIVECAPTION /
                     // COLOR_GRADIENTACTIVECAPTION gradient
                     DWORD colorGradientActiveCaptionLeft;
                     colorGradientActiveCaptionLeft = GetSysColor(COLOR_ACTIVECAPTION);
                     DWORD colorGradientActiveCaptionRight;
                     colorGradientActiveCaptionRight = GetSysColor(COLOR_GRADIENTACTIVECAPTION);
                     QLinearGradient g;
                     QColor start = QColor(GetRValue(colorGradientActiveCaptionLeft),
                                           GetGValue(colorGradientActiveCaptionLeft),
                                           GetBValue(colorGradientActiveCaptionLeft));
                     g.setColorAt(0.0, start);
                     QColor end = QColor(GetRValue(colorGradientActiveCaptionRight),
                                         GetGValue(colorGradientActiveCaptionRight),
                                         GetBValue(colorGradientActiveCaptionRight));
                     g.setColorAt(1.0, end);
                     m_seriesColors.append(ChartThemeManager::colorAt(g, 0.5));
                     // Generate gradients from the base colors
                     m_seriesGradients = ChartThemeManager::generateSeriesGradients(m_seriesColors);
                     // Background fill color from COLOR_WINDOW
                     QLinearGradient backgroundGradient;
                     DWORD colorWindow;
                     colorWindow = GetSysColor(COLOR_WINDOW);
                     backgroundGradient.setColorAt(0.0, QColor(GetRValue(colorWindow),
                                                   GetGValue(colorWindow),
                                                   GetBValue(colorWindow)));
                     backgroundGradient.setColorAt(1.0, QColor(GetRValue(colorWindow),
                                                   GetGValue(colorWindow),
                                                   GetBValue(colorWindow)));
                     // 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_minorGridLinePen = QPen(QRgb(0xe2e2e2));
                     m_minorGridLinePen.setWidth(1);
                     m_minorGridLinePen.setStyle(Qt::DashLine);
                     m_backgroundShades = BackgroundShadesNone;
             #elif defined(Q_OS_LINUX)
                     // Using a hard coded theme for Linux system theme
                     m_seriesColors << QRgb(0x60a6e6);
                     m_seriesColors << QRgb(0x92ca66);
                     m_seriesColors << QRgb(0xeba85f);
                     m_seriesColors << QRgb(0xfc5751);
                     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_axisLinePen = QPen(0xd6d6d6);
                     m_axisLinePen.setWidth(1);
                     m_labelBrush = QBrush(QRgb(0x404044));
                     m_gridLinePen = QPen(QRgb(0xe2e2e2));
                     m_gridLinePen.setWidth(1);
-                    m_minorGridLinePen = QBrush(QRgb(0x404044));
+                    m_minorGridLinePen = QPen(QRgb(0x404044));
                     m_minorGridLinePen.setWidth(1);
                     m_minorGridLinePen.setStyle(Qt::DashLine);
                     m_backgroundShades = BackgroundShadesNone;
             #elif defined(Q_OS_MAC)
                     // Using a hard coded theme for OSX system theme; the colors match the OSX 10.7 colors
                     m_seriesColors << QRgb(0x60a6e6);
                     m_seriesColors << QRgb(0x92ca66);
                     m_seriesColors << QRgb(0xeba85f);
                     m_seriesColors << QRgb(0xfc5751);
                     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_axisLinePen = QPen(0xd6d6d6);
                     m_axisLinePen.setWidth(1);
                     m_labelBrush = QBrush(QRgb(0x404044));
                     m_gridLinePen = QPen(QRgb(0xe2e2e2));
                     m_gridLinePen.setWidth(1);
                     m_minorGridLinePen = QPen(QRgb(0xe2e2e2));
                     m_minorGridLinePen.setWidth(1);
                     m_minorGridLinePen.setStyle(Qt::DashLine);
                     m_backgroundShades = BackgroundShadesNone;
             #else
                     // Hard coded theme
                     m_seriesColors << QRgb(0x60a6e6);
                     m_seriesColors << QRgb(0x92ca66);
                     m_seriesColors << QRgb(0xeba85f);
                     m_seriesColors << QRgb(0xfc5751);
                     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_axisLinePen = QPen(0xd6d6d6);
                     m_axisLinePen.setWidth(1);
                     m_labelBrush = QBrush(QRgb(0x404044));
                     m_gridLinePen = QPen(QRgb(0xe2e2e2));
                     m_gridLinePen.setWidth(1);
                     m_minorGridLinePen = QPen(QRgb(0xe2e2e2));
                     m_minorGridLinePen.setWidth(1);
                     m_minorGridLinePen.setStyle(Qt::DashLine);
                     m_backgroundShades = BackgroundShadesNone;
             #endif
                 }
             };
             QT_CHARTS_END_NAMESPACE
             #endif // CHARTTHEMESYSTEM_P_H

src/chartsqml2/declarativecategoryaxis.cpp +2 -3

             /****************************************************************************
             **
             ** Copyright (C) 2015 The Qt Company Ltd
             ** All rights reserved.
             ** For any questions to The Qt Company, please use contact form at http://qt.io
             **
             ** This file is part of the Qt Charts module.
             **
             ** Licensees holding valid commercial license for Qt may use this file in
             ** accordance with the Qt License Agreement provided with the Software
             ** or, alternatively, in accordance with the terms contained in a written
             ** agreement between you and The Qt Company.
             **
             ** If you have questions regarding the use of this file, please use
             ** contact form at http://qt.io
             **
             ****************************************************************************/
             #include "declarativecategoryaxis.h"
             #include <QtCore/QDebug>
             QT_CHARTS_BEGIN_NAMESPACE
             /*!
                 \qmltype CategoryRange
                 \inqmlmodule QtCharts
                 \brief With CategoryRange you can define a range used by a CategoryAxis.
                 \sa CategoryAxis
             */
             DeclarativeCategoryRange::DeclarativeCategoryRange(QObject *parent) :
                 QObject(parent),
                 m_endValue(0),
                 m_label(QString())
             {
             }
             DeclarativeCategoryAxis::DeclarativeCategoryAxis(QObject *parent) :
                 QCategoryAxis(parent)
             {
             }
             void DeclarativeCategoryAxis::classBegin()
             {
             }
             void DeclarativeCategoryAxis::componentComplete()
             {
                 QList<QPair<QString, qreal> > ranges;
                 foreach (QObject *child, children()) {
                     if (qobject_cast<DeclarativeCategoryRange *>(child)) {
                         DeclarativeCategoryRange *range = qobject_cast<DeclarativeCategoryRange *>(child);
                         ranges.append(QPair<QString, qreal>(range->label(), range->endValue()));
                     }
                 }
                 // Sort and append the range objects according to end value
                 qSort(ranges.begin(), ranges.end(), endValueLessThan);
                 for (int i(0); i < ranges.count(); i++)
                     append(ranges.at(i).first, ranges.at(i).second);
             }
             bool DeclarativeCategoryAxis::endValueLessThan(const QPair<QString, qreal> &value1, const QPair<QString, qreal> &value2)
             {
                 return value1.second < value2.second;
             }
             QQmlListProperty<QObject> DeclarativeCategoryAxis::axisChildren()
             {
                 return QQmlListProperty<QObject>(this, 0, &DeclarativeCategoryAxis::appendAxisChildren ,0,0,0);
             }
             void DeclarativeCategoryAxis::append(const QString &label, qreal categoryEndValue)
             {
                 QCategoryAxis::append(label, categoryEndValue);
             }
             void DeclarativeCategoryAxis::remove(const QString &label)
             {
                 QCategoryAxis::remove(label);
             }
             void DeclarativeCategoryAxis::replace(const QString &oldLabel, const QString &newLabel)
             {
                 QCategoryAxis::replaceLabel(oldLabel, newLabel);
             }
             void DeclarativeCategoryAxis::appendAxisChildren(QQmlListProperty<QObject> *list, QObject *element)
             {
                 // Empty implementation; the children are parsed in componentComplete instead
                 Q_UNUSED(list)
                 Q_UNUSED(element)
             }
             DeclarativeCategoryAxis::AxisLabelsPosition DeclarativeCategoryAxis::labelsPosition() const
             {
                 return (DeclarativeCategoryAxis::AxisLabelsPosition) QCategoryAxis::labelsPosition();
             }
             void DeclarativeCategoryAxis::setLabelsPosition(AxisLabelsPosition position)
             {
-                QCategoryAxis::AxisLabelsPosition labelsPosition = (QCategoryAxis::AxisLabelsPosition) position;
+                if (position != m_labelsPosition) {
-                if (labelsPosition != m_labelsPosition) {
+                    QCategoryAxis::setLabelsPosition((QCategoryAxis::AxisLabelsPosition)position);
-                    QCategoryAxis::setLabelsPosition(labelsPosition);
                     emit labelsPositionChanged(position);
                 }
             }
             #include "moc_declarativecategoryaxis.cpp"
             QT_CHARTS_END_NAMESPACE

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