HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2128:d151d861ee2a

Adds view menu to chartviewer

Michal Klocek -

r2128:d151d861ee2a

parent child

Context file:

r2128:d151d861ee2a

Collapse all files

demos/chartviewer/grid.cpp +43 -35

@@ -31,6 +31,8 Grid::Grid(int size,QGraphicsItem *parent):QGraphicsWidget(parent),
31	m_valueCount(7),	31	m_valueCount(7),
32	m_size(size),	32	m_size(size),
33	m_dataTable(Model::generateRandomData(m_listCount, m_valueMax, m_valueCount)),	33	m_dataTable(Model::generateRandomData(m_listCount, m_valueMax, m_valueCount)),
		34	m_state(NoState),
		35	m_currentState(NoState),
34	m_rubberBand(new QGraphicsRectItem()),	36	m_rubberBand(new QGraphicsRectItem()),
35	m_gridLayout(new QGraphicsGridLayout())	37	m_gridLayout(new QGraphicsGridLayout())
36	{	38	{
@@ -45,28 +47,6 Grid::~Grid()
45		47
46	}	48	}
47		49
48	void Grid::createCharts()
49	{
50	clear();
51
52	Charts::ChartList list = Charts::chartList();
53
54	for (int i = 0; i < m_size * m_size; ++i) {
55	QChart *chart = 0;
56	if (i < list.size()) {
57	chart = list.at(i)->createChart(m_dataTable);
58	}
59	else {
60	chart = new QChart();
61	chart->setTitle(QObject::tr("Empty"));
62	}
63
64	m_gridLayout->addItem(chart, i / m_size, i % m_size);
65	m_chartHash[chart] = i;
66	}
67
68	}
69
70	void Grid::createCharts(const QString& category)	50	void Grid::createCharts(const QString& category)
71	{	51	{
72	clear();	52	clear();
@@ -74,23 +54,42 void Grid::createCharts(const QString& category)
74	QChart *qchart(0);	54	QChart *qchart(0);
75	Charts::ChartList list = Charts::chartList();	55	Charts::ChartList list = Charts::chartList();
76		56
77	int j = 0;	57	if (category.isEmpty()) {
78	for (int i = 0; i < list.size(); ++i) {	58
79	Chart *chart = list.at(i);	59	for (int i = 0; i < m_size * m_size; ++i) {
80	if (chart->category() == category && j < m_size * m_size) {	60	QChart *chart = 0;
81	qchart = list.at(i)->createChart(m_dataTable);	61	if (i < list.size()) {
		62	chart = list.at(i)->createChart(m_dataTable);
		63	}
		64	else {
		65	chart = new QChart();
		66	chart->setTitle(QObject::tr("Empty"));
		67	}
		68
		69	m_gridLayout->addItem(chart, i / m_size, i % m_size);
		70	m_chartHash[chart] = i;
		71	}
		72	}
		73	else {
		74
		75	int j = 0;
		76	for (int i = 0; i < list.size(); ++i) {
		77	Chart *chart = list.at(i);
		78	if (chart->category() == category && j < m_size * m_size) {
		79	qchart = list.at(i)->createChart(m_dataTable);
		80	m_gridLayout->addItem(qchart, j / m_size, j % m_size);
		81	m_chartHash[qchart] = j;
		82	j++;
		83	}
		84	}
		85	for (; j < m_size * m_size; ++j) {
		86	qchart = new QChart();
		87	qchart->setTitle(QObject::tr("Empty"));
82	m_gridLayout->addItem(qchart, j / m_size, j % m_size);	88	m_gridLayout->addItem(qchart, j / m_size, j % m_size);
83	m_chartHash[qchart] = j;	89	m_chartHash[qchart] = j;
84	j++;
85	}	90	}
86	}	91	}
87	for (; j < m_size * m_size; ++j) {	92	m_category = category;
88	qchart = new QChart();
89	qchart->setTitle(QObject::tr("Empty"));
90	m_gridLayout->addItem(qchart, j / m_size, j % m_size);
91	m_chartHash[qchart] = j;
92	}
93
94	m_gridLayout->activate();	93	m_gridLayout->activate();
95	}	94	}
96		95
@@ -114,6 +113,15 void Grid::setState(State state)
114	m_state = state;	113	m_state = state;
115	}	114	}
116		115
		116	void Grid::setSize(int size)
		117	{
		118	if(m_size !=size)
		119	{
		120	m_size = size;
		121	createCharts(m_category);
		122	}
		123	}
		124
117	void Grid::setRubberPen(const QPen& pen)	125	void Grid::setRubberPen(const QPen& pen)
118	{	126	{
119	m_rubberBand->setPen(pen);	127	m_rubberBand->setPen(pen);

demos/chartviewer/grid.h +5 -5

             #include <QChartGlobal>
             class QGraphicsGridLayout;
-            class GridControl;
             class Chart;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
                 Grid(int size , QGraphicsItem *parent = 0 );
                 ~Grid();
                 QList<QChart*> charts();
-                void createCharts();
+                void createCharts(const QString& category = QString());
-                void createCharts(const QString& category);
                 void replaceChart(QChart* oldChart, Chart* newChart);
                 void setState(State state);
-                State state(){ return m_state; };
+                State state() const { return m_state; };
                 void setRubberPen(const QPen& pen);
+                void setSize(int size);
+                int size() const {return m_size;}
             Q_SIGNAL
                 void chartSelected(QChart* chart);
             protected:
                 int m_size;
                 DataTable m_dataTable;
                 QHash<QChart *, int> m_chartHash;
-                GridControl* m_control;
                 State m_state;
                 State m_currentState;
                 QPointF m_origin;
                 QGraphicsRectItem *m_rubberBand;
                 QGraphicsGridLayout* m_gridLayout;
+                QString m_category;
             };
             #endif /* GRID_H_ */

demos/chartviewer/window.cpp +38 -2

             #include <QApplication>
             #include <QDebug>
             #include <QMenu>
+            #include <QPushButton>
             Window::Window(const QVariantHash& parameters,QWidget *parent) :
                 QMainWindow(parent),
                 m_animatedComboBox(0),
                 m_legendComboBox(0),
                 m_templateComboBox(0),
+                m_viewComboBox(0),
                 m_openGLCheckBox(0),
                 m_zoomCheckBox(0),
                 m_scrollCheckBox(0),
                 m_baseLayout(new QGraphicsLinearLayout()),
                 m_menu(createMenu()),
                 m_template(0),
-                m_grid(new Grid(3))
+                m_grid(new Grid(1))
             {
                 createProxyWidgets();
                 // create layout
                 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["viewLabel"]);
+                settingsLayout->addItem(m_widgetHash["viewComboBox"]);
                 settingsLayout->addItem(m_widgetHash["themeLabel"]);
                 settingsLayout->addItem(m_widgetHash["themeComboBox"]);
                 settingsLayout->addItem(m_widgetHash["animationsLabel"]);
                 m_antialiasCheckBox->setChecked(true);
                 initializeFromParamaters(parameters);
                 updateUI();
+                handleGeometryChanged();
                 setCentralWidget(m_view);
                 connectSignals();
             void Window::connectSignals()
             {
                 QObject::connect(m_form, SIGNAL(geometryChanged()), this , SLOT(handleGeometryChanged()));
+                QObject::connect(m_viewComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(updateUI()));
                 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()));
             void Window::createProxyWidgets()
             {
                 m_themeComboBox = createThemeBox();
+                m_viewComboBox = createViewBox();
                 m_antialiasCheckBox = new QCheckBox(tr("Anti-aliasing"));
                 m_animatedComboBox = createAnimationBox();
                 m_legendComboBox = createLegendBox();
                 m_zoomCheckBox = new QCheckBox(tr("Zoom"));
                 m_scrollCheckBox = new QCheckBox(tr("Scroll"));
                 m_templateComboBox = createTempleteBox();
+                m_widgetHash["viewLabel"] = m_scene->addWidget(new QLabel("View"));
+                m_widgetHash["viewComboBox"] = m_scene->addWidget(m_viewComboBox);
                 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["templateComboBox"] = m_scene->addWidget(m_templateComboBox);
                 m_widgetHash["zoomCheckBox"] = m_scene->addWidget(m_zoomCheckBox);
                 m_widgetHash["scrollCheckBox"] = m_scene->addWidget(m_scrollCheckBox);
             }
             QComboBox *Window::createThemeBox()
                 return themeComboBox;
             }
+            QComboBox *Window::createViewBox()
+            {
+                QComboBox *viewComboBox = new ComboBox(this);
+                viewComboBox->addItem("1 chart", 1);
+                viewComboBox->addItem("4 charts", 2);
+                viewComboBox->addItem("9 charts", 3);
+                viewComboBox->addItem("16 charts", 4);
+                return viewComboBox;
+            }
             QComboBox *Window::createAnimationBox()
             {
                 QComboBox *animationComboBox = new ComboBox(this);
                         }
                     }
                 }
+                if (parameters.contains("view")) {
+                      int t = parameters["view"].toInt();
+                      for (int i = 0; i < m_viewComboBox->count(); ++i) {
+                          if (m_viewComboBox->itemData(i).toInt() == t) {
+                              m_viewComboBox->setCurrentIndex(i);
+                              break;
+                          }
+                      }
+                  }
             }
             void Window::updateUI()
             {
                 checkTemplate();
+                checkView();
                 checkOpenGL();
                 checkTheme();
                 checkAnimationOptions();
                 checkState();
             }
+            void Window::checkView()
+            {
+                int count(m_viewComboBox->itemData(m_viewComboBox->currentIndex()).toInt());
+                m_grid->setSize(count);
+            }
             void Window::checkLegend()
             {
                 Qt::Alignment alignment(m_legendComboBox->itemData(m_legendComboBox->currentIndex()).toInt());

demos/chartviewer/window.h +4 -5

             class QGraphicsLinearLayout;
             class Chart;
             class Grid;
+            class QPushButton;
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class QChart;
                 void handleGeometryChanged();
                 void handleChartSelected(QChart *chart);
             private:
+                QComboBox *createViewBox();
                 QComboBox *createThemeBox();
                 QComboBox *createAnimationBox();
                 QComboBox *createLegendBox();
                 void createProxyWidgets();
                 void comboBoxFocused(QComboBox *combox);
                 inline void checkAnimationOptions();
+                inline void checkView();
                 inline void checkLegend();
                 inline void checkOpenGL();
                 inline void checkTheme();
                 QAction *createMenuAction(QMenu *menu, const QIcon &icon, const QString &text, const QVariant &data);
                 void initializeFromParamaters(const QVariantHash& parameters);
-            protected:
-                //void mousePressEvent(QMouseEvent *event);
-                //void mouseMoveEvent(QMouseEvent *event);
-                //void mouseReleaseEvent(QMouseEvent *event);
             private:
                 QGraphicsScene *m_scene;
                 View *m_view;
                 QComboBox *m_animatedComboBox;
                 QComboBox *m_legendComboBox;
                 QComboBox *m_templateComboBox;
+                QComboBox *m_viewComboBox;
                 QCheckBox *m_openGLCheckBox;
                 QCheckBox *m_zoomCheckBox;
                 QCheckBox *m_scrollCheckBox;

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