HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1755:1a6e0b1256e1

Add horizontal charts to chartviewer

Michal Klocek -

r1755:1a6e0b1256e1

parent child

Context file:

r1755:1a6e0b1256e1

Collapse all files

demos/chartviewer/charts/horizontalbarchart.cpp created 644 +60 0

@@ -0,0 +1,60
	1	/****************************************************************************
	2	**
	3	** Copyright (C) 2012 Digia Plc
	4	** All rights reserved.
	5	** For any questions to Digia, please use contact form at http://qt.digia.com
	6	**
	7	** This file is part of the Qt Commercial Charts Add-on.
	8	**
	9	** $QT_BEGIN_LICENSE$
	10	** Licensees holding valid Qt Commercial licenses may use this file in
	11	** accordance with the Qt Commercial License Agreement provided with the
	12	** Software or, alternatively, in accordance with the terms contained in
	13	** a written agreement between you and Digia.
	14	**
	15	** If you have questions regarding the use of this file, please use
	16	** contact form at http://qt.digia.com
	17	** $QT_END_LICENSE$
	18	**
	19	****************************************************************************/
	20
	21	#include "charts.h"
	22	#include "qchart.h"
	23	#include "qhorizontalbarseries.h"
	24	#include "qbarset.h"
	25
	26	class HorizontalBarChart: public Chart
	27	{
	28	public:
	29
	30	HorizontalBarChart(){
	31	initialize();
	32	}
	33
	34	QString name() { return QObject::tr("HorizontalBarChart"); }
	35	QString category() { return QObject::tr("BarSeries"); }
	36	QString subCategory() { return QObject::tr("Vertical"); }
	37
	38	QChart* createChart(const DataTable& table)
	39	{
	40
	41	QChart* chart = new QChart();
	42
	43	chart->setTitle("Horizontal bar chart");
	44
	45	QHorizontalBarSeries* series = new QHorizontalBarSeries(chart);
	46	for (int i(0); i < table.count(); i++) {
	47	QBarSet *set = new QBarSet("Bar set " + QString::number(i));
	48	foreach (Data data, table[i])
	49	*set << data.first.y();
	50	series->append(set);
	51	}
	52	chart->addSeries(series);
	53	chart->createDefaultAxes();
	54	return chart;
	55	}
	56
	57	};
	58
	59	DECLARE_CHART(HorizontalBarChart)
	60

demos/chartviewer/charts/horizontalstackedbarchart.cpp created 644 +60 0

@@ -0,0 +1,60
	1	/****************************************************************************
	2	**
	3	** Copyright (C) 2012 Digia Plc
	4	** All rights reserved.
	5	** For any questions to Digia, please use contact form at http://qt.digia.com
	6	**
	7	** This file is part of the Qt Commercial Charts Add-on.
	8	**
	9	** $QT_BEGIN_LICENSE$
	10	** Licensees holding valid Qt Commercial licenses may use this file in
	11	** accordance with the Qt Commercial License Agreement provided with the
	12	** Software or, alternatively, in accordance with the terms contained in
	13	** a written agreement between you and Digia.
	14	**
	15	** If you have questions regarding the use of this file, please use
	16	** contact form at http://qt.digia.com
	17	** $QT_END_LICENSE$
	18	**
	19	****************************************************************************/
	20
	21	#include "charts.h"
	22	#include "qchart.h"
	23	#include "qhorizontalstackedbarseries.h"
	24	#include "qbarset.h"
	25
	26	class HorizontalStackedBarChart: public Chart
	27	{
	28	public:
	29
	30	HorizontalStackedBarChart(){
	31	initialize();
	32	}
	33
	34	QString name() { return QObject::tr("HorizontalStackedBarChart"); }
	35	QString category() { return QObject::tr("BarSeries"); }
	36	QString subCategory() { return QObject::tr("Vertical"); }
	37
	38	QChart* createChart(const DataTable& table)
	39	{
	40
	41	QChart* chart = new QChart();
	42
	43	chart->setTitle("Horizontal stacked chart");
	44
	45	QHorizontalStackedBarSeries* series = new QHorizontalStackedBarSeries(chart);
	46	for (int i(0); i < table.count(); i++) {
	47	QBarSet *set = new QBarSet("Bar set " + QString::number(i));
	48	foreach (Data data, table[i])
	49	*set << data.first.y();
	50	series->append(set);
	51	}
	52	chart->addSeries(series);
	53	chart->createDefaultAxes();
	54	return chart;
	55	}
	56
	57	};
	58
	59	DECLARE_CHART(HorizontalStackedBarChart)
	60

demos/chartviewer/charts/verticalbarchart.cpp created 644 +60 0

@@ -0,0 +1,60
	1	/****************************************************************************
	2	**
	3	** Copyright (C) 2012 Digia Plc
	4	** All rights reserved.
	5	** For any questions to Digia, please use contact form at http://qt.digia.com
	6	**
	7	** This file is part of the Qt Commercial Charts Add-on.
	8	**
	9	** $QT_BEGIN_LICENSE$
	10	** Licensees holding valid Qt Commercial licenses may use this file in
	11	** accordance with the Qt Commercial License Agreement provided with the
	12	** Software or, alternatively, in accordance with the terms contained in
	13	** a written agreement between you and Digia.
	14	**
	15	** If you have questions regarding the use of this file, please use
	16	** contact form at http://qt.digia.com
	17	** $QT_END_LICENSE$
	18	**
	19	****************************************************************************/
	20
	21	#include "charts.h"
	22	#include "qchart.h"
	23	#include "qbarseries.h"
	24	#include "qbarset.h"
	25
	26	class VerticalBarChart: public Chart
	27	{
	28	public:
	29
	30	VerticalBarChart(){
	31	initialize();
	32	}
	33
	34	QString name() { return QObject::tr("VerticalBarChart"); }
	35	QString category() { return QObject::tr("BarSeries"); }
	36	QString subCategory() { return QObject::tr("Vertical"); }
	37
	38	QChart* createChart(const DataTable& table)
	39	{
	40
	41	QChart* chart = new QChart();
	42
	43	chart->setTitle("Vertical bar chart");
	44
	45	QBarSeries* series = new QBarSeries(chart);
	46	for (int i(0); i < table.count(); i++) {
	47	QBarSet *set = new QBarSet("Bar set " + QString::number(i));
	48	foreach (Data data, table[i])
	49	*set << data.first.y();
	50	series->append(set);
	51	}
	52	chart->addSeries(series);
	53	chart->createDefaultAxes();
	54	return chart;
	55	}
	56
	57	};
	58
	59	DECLARE_CHART(VerticalBarChart)
	60

demos/chartviewer/model.h created 644 +67 0

@@ -0,0 +1,67
	1	/****************************************************************************
	2	**
	3	** Copyright (C) 2012 Digia Plc
	4	** All rights reserved.
	5	** For any questions to Digia, please use contact form at http://qt.digia.com
	6	**
	7	** This file is part of the Qt Commercial Charts Add-on.
	8	**
	9	** $QT_BEGIN_LICENSE$
	10	** Licensees holding valid Qt Commercial licenses may use this file in
	11	** accordance with the Qt Commercial License Agreement provided with the
	12	** Software or, alternatively, in accordance with the terms contained in
	13	** a written agreement between you and Digia.
	14	**
	15	** If you have questions regarding the use of this file, please use
	16	** contact form at http://qt.digia.com
	17	** $QT_END_LICENSE$
	18	**
	19	****************************************************************************/
	20
	21	#ifndef MODEL_H_
	22	#define MODEL_H_
	23
	24	#include <QList>
	25	#include <QPair>
	26	#include <QPointF>
	27	#include <QTime>
	28
	29	typedef QPair<QPointF, QString> Data;
	30	typedef QList<Data> DataList;
	31	typedef QList<DataList> DataTable;
	32
	33
	34	class Model
	35	{
	36	private:
	37	Model(){}
	38
	39	public:
	40	static DataTable generateRandomData(int listCount, int valueMax, int valueCount)
	41	{
	42	DataTable dataTable;
	43
	44	// set seed for random stuff
	45	qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime()));
	46
	47	// generate random data
	48	for (int i(0); i < listCount; i++) {
	49	DataList dataList;
	50	qreal yValue(0);
	51	for (int j(0); j < valueCount; j++) {
	52	yValue = yValue + (qreal) (qrand() % valueMax) / (qreal) valueCount;
	53	QPointF value(
	54	(j + (qreal) qrand() / (qreal) RAND_MAX)
	55	* ((qreal) valueMax / (qreal) valueCount), yValue);
	56	QString label = "Slice " + QString::number(i) + ":" + QString::number(j);
	57	dataList << Data(value, label);
	58	}
	59	dataTable << dataList;
	60	}
	61
	62	return dataTable;
	63	}
	64
	65	};
	66
	67	#endif

demos/chartviewer/charts.h +1 -1

             /****************************************************************************
             **
             ** 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 CHARTS_H
             #define CHARTS_H
-            #include "window.h"
+            #include "model.h"
             #include <QList>
             #include <QString>
             #include <qchartglobal.h>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChart;
             QTCOMMERCIALCHART_END_NAMESPACE
             QTCOMMERCIALCHART_USE_NAMESPACE
             class Chart
             {
             public:
                 Chart();
                 virtual ~Chart();
                 virtual void initialize();
                 virtual QChart* createChart(const DataTable& table) = 0;
                 virtual QString name() = 0;
                 virtual QString category() = 0;
                 virtual QString subCategory() = 0;
             };
             namespace Charts
             {
             typedef QList<Chart*> ChartList;
             inline ChartList& chartList()
             {
                 static ChartList list;
                 return list;
             }
             inline bool findChart(Chart* chart)
             {
                 ChartList& list = chartList();
                 if (list.contains(chart)) {
                     return true;
                 }
                 foreach (Chart* item, list) {
                     if (item->name() == chart->name() && item->category() == chart->category() && item->subCategory() == chart->subCategory()) {
                         return true;
                     }
                 }
                 return false;
             }
             inline void addChart(Chart* chart)
             {
                 ChartList& list = chartList();
                 if (!findChart(chart)) {
                     list.append(chart);
                 }
             }
             }
             #define DECLARE_CHART(chartName) static chartName t;
             #endif

demos/chartviewer/charts/charts.pri +10 -1

@@ -1,4 +1,13
1	INCLUDEPATH += $$PWD	1	INCLUDEPATH += $$PWD
2	DEPENDPATH += $$PWD	2	DEPENDPATH += $$PWD
3		3
4	SOURCES+= linechart.cpp scatterchart.cpp splinechart.cpp piechart.cpp barchart.cpp areachart.cpp No newline at end of file	4	SOURCES+= \
		5	linechart.cpp \
		6	scatterchart.cpp \
		7	splinechart.cpp \
		8	piechart.cpp \
		9	verticalstackedbarchart.cpp \
		10	horizontalstackedbarchart.cpp \
		11	verticalbarchart.cpp \
		12	horizontalbarchart.cpp \
		13	areachart.cpp No newline at end of file

demos/chartviewer/charts/verticalstackedbarchart.cpp ~~demos/chartviewer/charts/barchart.cpp~~ renamed +4 -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 "charts.h"
             #include "qchart.h"
             #include "qstackedbarseries.h"
             #include "qbarset.h"
-            class BarChart: public Chart
+            class VerticalStackedBarChart: public Chart
             {
             public:
-                BarChart(){
+                VerticalStackedBarChart(){
                     initialize();
                 }
                 QString name() { return QObject::tr("VerticalStackedBarChart"); }
                 QString category()  { return QObject::tr("BarSeries"); }
                 QString subCategory() { return QObject::tr("Vertical"); }
                 QChart* createChart(const DataTable& table)
                 {
                     QChart* chart = new QChart();
-                    chart->setTitle("Bar chart");
+                    chart->setTitle("Stacked bar chart");
                     QStackedBarSeries* series = new QStackedBarSeries(chart);
                     for (int i(0); i < table.count(); i++) {
                         QBarSet *set = new QBarSet("Bar set " + QString::number(i));
                         foreach (Data data, table[i])
                             *set << data.first.y();
                         series->append(set);
                     }
                     chart->addSeries(series);
                     chart->createDefaultAxes();
                     return chart;
                 }
             };
-            DECLARE_CHART(BarChart)
+            DECLARE_CHART(VerticalStackedBarChart)

demos/chartviewer/chartviewer.pro +1 -1

             !include( ../demos.pri ):error( "Couldn't find the demos.pri file!" )
             include(charts/charts.pri)
             TARGET = chartviewer
             QT += opengl
             SOURCES += main.cpp window.cpp view.cpp charts.cpp
-            HEADERS += window.h view.h charts.h
+            HEADERS += window.h view.h charts.h model.h

demos/chartviewer/window.cpp +2 -40

             /****************************************************************************
              **
              ** 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 "window.h"
             #include "view.h"
             #include "charts.h"
             #include <QChartView>
-            #include <QPieSeries>
-            #include <QPieSlice>
-            #include <QPercentBarSeries>
-            #include <QStackedBarSeries>
-            #include <QBarSeries>
-            #include <QBarSet>
-            #include <QLineSeries>
-            #include <QSplineSeries>
-            #include <QScatterSeries>
             #include <QAreaSeries>
             #include <QLegend>
             #include <QGridLayout>
             #include <QFormLayout>
             #include <QComboBox>
             #include <QSpinBox>
             #include <QCheckBox>
             #include <QGroupBox>
             #include <QLabel>
-            #include <QTime>
-            #include <QBarCategoriesAxis>
             #include <QGraphicsScene>
             #include <QGraphicsGridLayout>
             #include <QGraphicsLinearLayout>
             #include <QGraphicsProxyWidget>
             #include <QGLWidget>
             #include <QApplication>
             #include <QDebug>
             Window::Window(QWidget* parent) :
                 QMainWindow(parent),
                 m_listCount(3),
                 m_valueMax(10),
                 m_valueCount(7),
                 m_scene(new QGraphicsScene(this)),
                 m_view(0),
-                m_dataTable(generateRandomData(m_listCount, m_valueMax, m_valueCount)),
+                m_dataTable(Model::generateRandomData(m_listCount, m_valueMax, m_valueCount)),
                 m_form(0),
                 m_themeComboBox(0),
                 m_antialiasCheckBox(0),
                 m_animatedComboBox(0),
                 m_legendComboBox(0),
                 m_openGLCheckBox(0),
                 m_zoomCheckBox(0),
                 m_scrollCheckBox(0),
                 m_rubberBand(new QGraphicsRectItem()),
                 m_isScrolling(false),
                 m_isZooming(false),
                 m_scroll(false),
                 m_zoom(false)
             {
                 createProxyWidgets();
                 connectSignals();
                 // create layout
                 QGraphicsGridLayout* baseLayout = new QGraphicsGridLayout();
                 QGraphicsLinearLayout *settingsLayout = new QGraphicsLinearLayout();
                 settingsLayout->setOrientation(Qt::Vertical);
                 settingsLayout->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
                 settingsLayout->addItem(m_widgetHash["openGLCheckBox"]);
                 settingsLayout->addItem(m_widgetHash["antialiasCheckBox"]);
                 settingsLayout->addItem(m_widgetHash["themeLabel"]);
                 settingsLayout->addItem(m_widgetHash["themeComboBox"]);
                 settingsLayout->addItem(m_widgetHash["animationsLabel"]);
                 settingsLayout->addItem(m_widgetHash["animatedComboBox"]);
                 settingsLayout->addItem(m_widgetHash["legendLabel"]);
                 settingsLayout->addItem(m_widgetHash["legendComboBox"]);
                 settingsLayout->addItem(m_widgetHash["scrollCheckBox"]);
                 settingsLayout->addItem(m_widgetHash["zoomCheckBox"]);
                 settingsLayout->addStretch();
                 baseLayout->addItem(settingsLayout, 0, 3, 2, 1);
                 //create charts
                 Charts::ChartList list = Charts::chartList();
-                for(int i = 0 ; i < 6 ; ++i)
+                for(int i = 0 ; i < 9 && i<list.size() ; ++i)
                 {
-                    if(!(i<list.size()) || list.isEmpty()) break;
                     QChart* chart = list.at(i)->createChart(m_dataTable);
                     baseLayout->addItem(chart, i/3, i%3);
                     m_chartList << chart;
                 }
                 m_form = new QGraphicsWidget();
                 m_form->setLayout(baseLayout);
                 m_scene->addItem(m_form);
                 m_scene->addItem(m_rubberBand);
                 m_rubberBand->setVisible(false);
                 m_view = new View(m_scene, m_form);
                 m_view->setMinimumSize(m_form->preferredSize().toSize());
                 // Set defaults
                 m_antialiasCheckBox->setChecked(true);
                 updateUI();
                 setCentralWidget(m_view);
             }
             Window::~Window()
             {
             }
             void Window::connectSignals()
             {
                 QObject::connect(m_themeComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateUI()));
                 QObject::connect(m_antialiasCheckBox, SIGNAL(toggled(bool)), this, SLOT(updateUI()));
                 QObject::connect(m_openGLCheckBox, SIGNAL(toggled(bool)), this, SLOT(updateUI()));
                 QObject::connect(m_zoomCheckBox, SIGNAL(toggled(bool)), this, SLOT(updateUI()));
                 QObject::connect(m_scrollCheckBox, SIGNAL(toggled(bool)), this, SLOT(updateUI()));
                 QObject::connect(m_animatedComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateUI()));
                 QObject::connect(m_legendComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateUI()));
             }
-            DataTable Window::generateRandomData(int listCount, int valueMax, int valueCount) const
-                DataTable dataTable;
-                // set seed for random stuff
-                qsrand(QTime(0, 0, 0).secsTo(QTime::currentTime()));
-                // generate random data
-                for (int i(0); i < listCount; i++) {
-                    DataList dataList;
-                    qreal yValue(0);
-                    for (int j(0); j < valueCount; j++) {
-                        yValue = yValue + (qreal) (qrand() % valueMax) / (qreal) valueCount;
-                        QPointF value(
-                            (j + (qreal) qrand() / (qreal) RAND_MAX)
-                                * ((qreal) m_valueMax / (qreal) valueCount), yValue);
-                        QString label = "Slice " + QString::number(i) + ":" + QString::number(j);
-                        dataList << Data(value, label);
-                    dataTable << dataList;
-                return dataTable;
             void Window::createProxyWidgets()
             {
                 m_themeComboBox = createThemeBox();
                 m_antialiasCheckBox = new QCheckBox(tr("Anti-aliasing"));
                 m_animatedComboBox = createAnimationBox();
                 m_legendComboBox = createLegendBox();
                 m_openGLCheckBox = new QCheckBox(tr("OpenGL"));
                 m_zoomCheckBox = new QCheckBox(tr("Zoom"));
                 m_scrollCheckBox = new QCheckBox(tr("Scroll"));
                 m_widgetHash["themeComboBox"] = m_scene->addWidget(m_themeComboBox);
                 m_widgetHash["antialiasCheckBox"] = m_scene->addWidget(m_antialiasCheckBox);
                 m_widgetHash["animatedComboBox"] = m_scene->addWidget(m_animatedComboBox);
                 m_widgetHash["legendComboBox"] = m_scene->addWidget(m_legendComboBox);
                 m_widgetHash["openGLCheckBox"] = m_scene->addWidget(m_openGLCheckBox);
                 m_widgetHash["themeLabel"] = m_scene->addWidget(new QLabel("Theme"));
                 m_widgetHash["animationsLabel"] = m_scene->addWidget(new QLabel("Animations"));
                 m_widgetHash["legendLabel"] = m_scene->addWidget(new QLabel("Legend"));
                 m_widgetHash["zoomCheckBox"] = m_scene->addWidget(m_zoomCheckBox);
                 m_widgetHash["scrollCheckBox"] = m_scene->addWidget(m_scrollCheckBox);
             }
             QComboBox* Window::createThemeBox()
             {
                 // settings layoutQGLWidget’
                 QComboBox* themeComboBox = new ComboBox(this);
                 themeComboBox->addItem("Light", QChart::ChartThemeLight);
                 themeComboBox->addItem("Blue Cerulean", QChart::ChartThemeBlueCerulean);
                 themeComboBox->addItem("Dark", QChart::ChartThemeDark);
                 themeComboBox->addItem("Brown Sand", QChart::ChartThemeBrownSand);
                 themeComboBox->addItem("Blue NCS", QChart::ChartThemeBlueNcs);
                 themeComboBox->addItem("High Contrast", QChart::ChartThemeHighContrast);
                 themeComboBox->addItem("Blue Icy", QChart::ChartThemeBlueIcy);
                 return themeComboBox;
             }
             QComboBox* Window::createAnimationBox()
             {
                 // settings layout
                 QComboBox* animationComboBox = new ComboBox(this);
                 animationComboBox->addItem("No Animations", QChart::NoAnimation);
                 animationComboBox->addItem("GridAxis Animations", QChart::GridAxisAnimations);
                 animationComboBox->addItem("Series Animations", QChart::SeriesAnimations);
                 animationComboBox->addItem("All Animations", QChart::AllAnimations);
                 return animationComboBox;
             }
             QComboBox* Window::createLegendBox()
             {
                 QComboBox* legendComboBox = new ComboBox(this);
                 legendComboBox->addItem("No Legend ", 0);
                 legendComboBox->addItem("Legend Top", Qt::AlignTop);
                 legendComboBox->addItem("Legend Bottom", Qt::AlignBottom);
                 legendComboBox->addItem("Legend Left", Qt::AlignLeft);
                 legendComboBox->addItem("Legend Right", Qt::AlignRight);
                 return legendComboBox;
             }
             void Window::updateUI()
             {
                 bool opengl = m_openGLCheckBox->isChecked();
                 bool isOpengl = qobject_cast<QGLWidget*>(m_view->viewport());
                 if ((isOpengl && !opengl) || (!isOpengl && opengl)) {
                     m_view->deleteLater();
                     m_view = new View(m_scene, m_form);
                     m_view->setViewport(!opengl ? new QWidget() : new QGLWidget());
                     setCentralWidget(m_view);
                 }
                 QChart::ChartTheme theme = (QChart::ChartTheme) m_themeComboBox->itemData(
                     m_themeComboBox->currentIndex()).toInt();
                 foreach (QChart *chart, m_chartList)
                     chart->setTheme(theme);
                 QPalette pal = window()->palette();
                 if (theme == QChart::ChartThemeLight) {
                     pal.setColor(QPalette::Window, QRgb(0xf0f0f0));
                     pal.setColor(QPalette::WindowText, QRgb(0x404044));
                 }
                 else if (theme == QChart::ChartThemeDark) {
                     pal.setColor(QPalette::Window, QRgb(0x121218));
                     pal.setColor(QPalette::WindowText, QRgb(0xd6d6d6));
                 }
                 else if (theme == QChart::ChartThemeBlueCerulean) {
                     pal.setColor(QPalette::Window, QRgb(0x40434a));
                     pal.setColor(QPalette::WindowText, QRgb(0xd6d6d6));
                 }
                 else if (theme == QChart::ChartThemeBrownSand) {
                     pal.setColor(QPalette::Window, QRgb(0x9e8965));
                     pal.setColor(QPalette::WindowText, QRgb(0x404044));
                 }
                 else if (theme == QChart::ChartThemeBlueNcs) {
                     pal.setColor(QPalette::Window, QRgb(0x018bba));
                     pal.setColor(QPalette::WindowText, QRgb(0x404044));
                 }
                 else if (theme == QChart::ChartThemeHighContrast) {
                     pal.setColor(QPalette::Window, QRgb(0xffab03));
                     pal.setColor(QPalette::WindowText, QRgb(0x181818));
                 }
                 else if (theme == QChart::ChartThemeBlueIcy) {
                     pal.setColor(QPalette::Window, QRgb(0xcee7f0));
                     pal.setColor(QPalette::WindowText, QRgb(0x404044));
                 }
                 else {
                     pal.setColor(QPalette::Window, QRgb(0xf0f0f0));
                     pal.setColor(QPalette::WindowText, QRgb(0x404044));
                 }
                 foreach(QGraphicsProxyWidget* widget , m_widgetHash) {
                     widget->setPalette(pal);
                 }
                 m_view->setBackgroundBrush(pal.color((QPalette::Window)));
                 m_rubberBand->setPen(pal.color((QPalette::WindowText)));
                 QChart::AnimationOptions options(
                     m_animatedComboBox->itemData(m_animatedComboBox->currentIndex()).toInt());
                 if (!m_chartList.isEmpty() && m_chartList.at(0)->animationOptions() != options) {
                     foreach (QChart *chart, m_chartList)
                         chart->setAnimationOptions(options);
                 }
                 Qt::Alignment alignment(m_legendComboBox->itemData(m_legendComboBox->currentIndex()).toInt());
                 if (!alignment) {
                     foreach (QChart *chart, m_chartList) {
                         chart->legend()->hide();
                     }
                 }
                 else {
                     foreach (QChart *chart, m_chartList) {
                         chart->legend()->setAlignment(alignment);
                         chart->legend()->show();
                     }
                 }
                 bool antialias = m_antialiasCheckBox->isChecked();
                 if (opengl)
                     m_view->setRenderHint(QPainter::HighQualityAntialiasing, antialias);
                 else
                     m_view->setRenderHint(QPainter::Antialiasing, antialias);
                 bool scroll = m_scrollCheckBox->isChecked();
                 if(!m_scroll & scroll){
                     m_scroll=true;
                     m_zoom=false;
                     m_zoomCheckBox->setChecked(false);
                 }
                 bool zoom = m_zoomCheckBox->isChecked();
                 if(!m_zoom & zoom){
                        m_scroll=false;
                        m_zoom=true;
                        m_scrollCheckBox->setChecked(false);
                 }
             }
             void Window::mousePressEvent(QMouseEvent *event)
             {
                 if (event->button() == Qt::LeftButton) {
                     m_origin = event->pos();
                     m_isScrolling = false;
                     m_isZooming = false;
                     foreach (QChart *chart, m_chartList) {
                         QRectF geometryRect = chart->geometry();
                         QRectF plotArea = chart->plotArea();
                         plotArea.translate(geometryRect.topLeft());
                         if (plotArea.contains(m_origin)) {
                             m_isScrolling = m_scroll;
                             m_isZooming = m_zoom;
                             break;
                         }
                     }
                     if (m_isZooming) {
                         m_rubberBand->setRect(QRectF(m_origin, QSize()));
                         m_rubberBand->setVisible(true);
                     }
                     event->accept();
                 }
                 if (event->button() == Qt::RightButton) {
                     m_origin = event->pos();
                     m_isZooming = m_zoom;
                 }
             }
             void Window::mouseMoveEvent(QMouseEvent *event)
             {
                 if (m_isScrolling || m_isZooming) {
                     foreach (QChart *chart, m_chartList) {
                         QRectF geometryRect = chart->geometry();
                         QRectF plotArea = chart->plotArea();
                         plotArea.translate(geometryRect.topLeft());
                         if (plotArea.contains(m_origin)) {
                             if (m_isScrolling) {
                                 QPointF delta = m_origin - event->pos();
                                 chart->scroll(delta.x(), -delta.y());
                             }
                             if (m_isZooming && plotArea.contains(event->pos())) {
                                 m_rubberBand->setRect(QRectF(m_origin, event->pos()).normalized());
                             }
                             break;
                         }
                     }
                     if(m_isScrolling) m_origin = event->pos();
                     event->accept();
                 }
             }
             void Window::mouseReleaseEvent(QMouseEvent *event)
             {
                 if (event->button() == Qt::LeftButton) {
                     m_isScrolling = false;
                     if (m_isZooming) {
                         m_isZooming = false;
                         m_rubberBand->setVisible(false);
                         foreach (QChart *chart, m_chartList) {
                             QRectF geometryRect = chart->geometry();
                             QRectF plotArea = chart->plotArea();
                             plotArea.translate(geometryRect.topLeft());
                             if (plotArea.contains(m_origin)) {
                                 QRectF rect = m_rubberBand->rect();
                                 rect.translate(-geometryRect.topLeft());
                                 chart->zoomIn(rect);
                                 break;
                             }
                         }
                     }
                     event->accept();
                 }
                 if (event->button() == Qt::RightButton) {
                     if (m_isZooming) {
                         foreach (QChart *chart, m_chartList) {
                             QRectF geometryRect = chart->geometry();
                             QRectF plotArea = chart->plotArea();
                             plotArea.translate(geometryRect.topLeft());
                             if (plotArea.contains(m_origin)) {
                                 QRectF rect = m_rubberBand->rect();
                                 chart->zoomOut();
                                 break;
                             }
                         }
                     }
                 }
             }
             void Window::comboBoxFocused(QComboBox *combobox)
             {
                 foreach(QGraphicsProxyWidget* widget , m_widgetHash) {
                    if(widget->widget()==combobox)
                     widget->setZValue(2.0);
                    else
                     widget->setZValue(0.0);
                 }
             }

demos/chartviewer/window.h +1 -7

             /****************************************************************************
             **
             ** 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 WINDOW_H_
             #define WINDOW_H_
+            #include "model.h"
             #include <QMainWindow>
             #include <QChartGlobal>
             #include <QHash>
             #include <QComboBox>
             class QCheckBox;
             class QGraphicsRectItem;
             class QGraphicsScene;
             class QGraphicsWidget;
             class View;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChart;
             QTCOMMERCIALCHART_END_NAMESPACE
-            typedef QPair<QPointF, QString> Data;
-            typedef QList<Data> DataList;
-            typedef QList<DataList> DataTable;
             QTCOMMERCIALCHART_USE_NAMESPACE
             class Window: public QMainWindow
             {
                 Q_OBJECT
             public:
                 explicit Window(QWidget *parent = 0);
                 ~Window();
             private Q_SLOTS:
                 void updateUI();
             private:
-                DataTable generateRandomData(int listCount,int valueMax,int valueCount) const;
                 QComboBox* createThemeBox();
                 QComboBox* createAnimationBox();
                 QComboBox* createLegendBox();
                 void connectSignals();
                 void createProxyWidgets();
                 void comboBoxFocused(QComboBox *combox);
             protected:
                 void mousePressEvent(QMouseEvent *event);
                 void mouseMoveEvent(QMouseEvent *event);
                 void mouseReleaseEvent(QMouseEvent *event);
             private:
                 int m_listCount;
                 int m_valueMax;
                 int m_valueCount;
                 QGraphicsScene* m_scene;
                 View* m_view;
                 QHash<QString, QGraphicsProxyWidget*> m_widgetHash;
                 QList<QChart*> m_chartList;
                 DataTable m_dataTable;
                 QGraphicsWidget *m_form;
                 QComboBox *m_themeComboBox;
                 QCheckBox *m_antialiasCheckBox;
                 QComboBox *m_animatedComboBox;
                 QComboBox *m_legendComboBox;
                 QCheckBox *m_openGLCheckBox;
                 QCheckBox *m_zoomCheckBox;
                 QCheckBox *m_scrollCheckBox;
                 QPoint m_origin;
                 QGraphicsRectItem* m_rubberBand;
                 bool m_isScrolling;
                 bool m_isZooming;
                 bool m_scroll;
                 bool m_zoom;
                 friend class ComboBox;
             };
             class ComboBox: public QComboBox
             {
             public:
                 ComboBox(Window* window,QWidget *parent = 0):QComboBox(parent),m_window(window)
                 {}
             protected:
                 void focusInEvent(QFocusEvent *e)
                 {
                     QComboBox::focusInEvent(e);
                     m_window->comboBoxFocused(this);
                 }
             private:
                 Window* m_window;
             };
             #endif

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