##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Fix crash when removing pie series from chart...
Fix crash when removing pie series from chart Connections cleanup in PieChartItem destructor didn't account for the possibility of series already having been destroyed. Changed m_series to QPointer so that it'll notice when series gets destroyed, and also added cleaning of slices to series destructor. Task-number: QTRD-1946 Change-Id: I651347bfcfbe7cd78dd26220a811fea5c8071fce Reviewed-by: Mika Salmela Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Miikka Heikkinen - - Load All Authors

File last commit:

r2432:53927f716a3d
r2475:9e35a3a169ed
Show More
chartthemesystem_p.h
177 lines | 7.0 KiB | text/x-c | CLexer
/ src / themes / chartthemesystem_p.h
History | Source | Raw |Copy content |Copy permalink
Tero Ahola
Added missing system theme file
 r854 /****************************************************************************
**
Miikka Heikkinen
Fixed the copyright year 2012 -> 2013
 r2432 ** Copyright (C) 2013 Digia Plc
Tero Ahola
Added missing system theme file
 r854 ** 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$
**
****************************************************************************/
unknown
Added missing warning about private implementation
 r1366 // 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.
Tero Ahola
Added missing system theme file
 r854 #ifndef CHARTTHEMESYSTEM_P_H
#define CHARTTHEMESYSTEM_P_H
#include "charttheme_p.h"
#ifdef Q_OS_WIN
#include <windows.h>
#include <stdio.h>
#endif
QTCOMMERCIALCHART_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*/)
{
#ifdef Q_OS_WIN
Tero Ahola
Removed a few unnecessary TODOs
 r1911 // We could also use theme specific window frame color as a series base color (it would give more
Tero Ahola
Added missing system theme file
 r854 // 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),
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 GetGValue(colorGradientActiveCaptionRight),
GetBValue(colorGradientActiveCaptionRight));
Tero Ahola
Added missing system theme file
 r854 g.setColorAt(1.0, end);
Jani Honkonen
Some fixes for Qt5, vs2010 build and qml
 r2277 m_seriesColors.append(ChartThemeManager::colorAt(g, 0.5));
Tero Ahola
Added missing system theme file
 r854
// Generate gradients from the base colors
Tero Ahola
Added axisXTop and axisYRight properties to QML series APIs
 r2296 m_seriesGradients = ChartThemeManager::generateSeriesGradients(m_seriesColors);
Tero Ahola
Added missing system theme file
 r854
// Background fill color from COLOR_WINDOW
QLinearGradient backgroundGradient;
DWORD colorWindow;
colorWindow = GetSysColor(COLOR_WINDOW);
backgroundGradient.setColorAt(0.0, QColor(GetRValue(colorWindow),
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 GetGValue(colorWindow),
GetBValue(colorWindow)));
Tero Ahola
Added missing system theme file
 r854 backgroundGradient.setColorAt(1.0, QColor(GetRValue(colorWindow),
Jani Honkonen
astyle and manual coding style fixes for src-folder
 r2097 GetGValue(colorWindow),
GetBValue(colorWindow)));
Tero Ahola
Added missing system theme file
 r854 // Axes and other
m_axisLinePen = QPen(0xd6d6d6);
m_axisLinePen.setWidth(1);
Tero Ahola
Removed QLegend::setLabelPen, clean up theme label brushes
 r1528 m_labelBrush = QBrush(QRgb(0x404044));
Tero Ahola
Added missing system theme file
 r854 m_gridLinePen = QPen(QRgb(0xe2e2e2));
m_gridLinePen.setWidth(1);
m_backgroundShades = BackgroundShadesNone;
#elif defined(Q_OS_LINUX)
Tero Ahola
Removed a few unnecessary TODOs
 r1911 // Using a hard coded theme for Linux system theme
Tero Ahola
Added missing system theme file
 r854 m_seriesColors << QRgb(0x60a6e6);
m_seriesColors << QRgb(0x92ca66);
m_seriesColors << QRgb(0xeba85f);
m_seriesColors << QRgb(0xfc5751);
Michal Klocek
Refactors internals...
 r2273 m_seriesGradients = ChartThemeManager::generateSeriesGradients(m_seriesColors);
Tero Ahola
Added missing system theme file
 r854
// 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);
Tero Ahola
Removed QLegend::setLabelPen, clean up theme label brushes
 r1528 m_labelBrush = QBrush(QRgb(0x404044));
Tero Ahola
Added missing system theme file
 r854 m_gridLinePen = QPen(QRgb(0xe2e2e2));
m_gridLinePen.setWidth(1);
m_backgroundShades = BackgroundShadesNone;
#elif defined(Q_OS_MAC)
Tero Ahola
Removed a few unnecessary TODOs
 r1911 // Using a hard coded theme for OSX system theme; the colors match the OSX 10.7 colors
Tero Ahola
Added missing system theme file
 r854 m_seriesColors << QRgb(0x60a6e6);
m_seriesColors << QRgb(0x92ca66);
m_seriesColors << QRgb(0xeba85f);
m_seriesColors << QRgb(0xfc5751);
Tero Ahola
Added axisXTop and axisYRight properties to QML series APIs
 r2296 m_seriesGradients = ChartThemeManager::generateSeriesGradients(m_seriesColors);
Tero Ahola
Added missing system theme file
 r854
// 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);
Tero Ahola
Removed QLegend::setLabelPen, clean up theme label brushes
 r1528 m_labelBrush = QBrush(QRgb(0x404044));
Tero Ahola
Added missing system theme file
 r854 m_gridLinePen = QPen(QRgb(0xe2e2e2));
m_gridLinePen.setWidth(1);
m_backgroundShades = BackgroundShadesNone;
#else
Tero Ahola
Removed a few unnecessary TODOs
 r1911 // Hard coded theme
Tero Ahola
Added missing system theme file
 r854 m_seriesColors << QRgb(0x60a6e6);
m_seriesColors << QRgb(0x92ca66);
m_seriesColors << QRgb(0xeba85f);
m_seriesColors << QRgb(0xfc5751);
Michal Klocek
Refactors internals...
 r2273 m_seriesGradients = ChartThemeManager::generateSeriesGradients(m_seriesColors);
Tero Ahola
Added missing system theme file
 r854
// 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);
Tero Ahola
Removed QLegend::setLabelPen, clean up theme label brushes
 r1528 m_labelBrush = QBrush(QRgb(0x404044));
Tero Ahola
Added missing system theme file
 r854 m_gridLinePen = QPen(QRgb(0xe2e2e2));
m_gridLinePen.setWidth(1);
m_backgroundShades = BackgroundShadesNone;
#endif
}
};
QTCOMMERCIALCHART_END_NAMESPACE
#endif // CHARTTHEMESYSTEM_P_H