HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2135:c8d5b77f686a

Adds chart parser to cherviewer options

Michal Klocek -

r2135:c8d5b77f686a

parent child

Context file:

r2135:c8d5b77f686a

Collapse all files

demos/chartviewer/grid.cpp +81 -11

@@ -57,15 +57,11 void Grid::createCharts(const QString &category)
57		57
58	if (category.isEmpty()) {	58	if (category.isEmpty()) {
59	for (int i = 0; i < m_size * m_size; ++i) {	59	for (int i = 0; i < m_size * m_size; ++i) {
60	QChart *chart = 0;	60	QChart *chart = new QChart();
61	if (i < list.size()) {	61	chart->setTitle(QObject::tr("Empty"));
62	chart = list.at(i)->createChart(m_dataTable);
63	} else {
64	chart = new QChart();
65	chart->setTitle(QObject::tr("Empty"));
66	}
67	m_gridLayout->addItem(chart, i / m_size, i % m_size);	62	m_gridLayout->addItem(chart, i / m_size, i % m_size);
68	m_chartHash[chart] = i;	63	m_chartHash[chart] = i;
		64	m_chartHashRev[i] = chart;
69	}	65	}
70	} else {	66	} else {
71	int j = 0;	67	int j = 0;
@@ -75,6 +71,7 void Grid::createCharts(const QString &category)
75	qchart = list.at(i)->createChart(m_dataTable);	71	qchart = list.at(i)->createChart(m_dataTable);
76	m_gridLayout->addItem(qchart, j / m_size, j % m_size);	72	m_gridLayout->addItem(qchart, j / m_size, j % m_size);
77	m_chartHash[qchart] = j;	73	m_chartHash[qchart] = j;
		74	m_chartHashRev[j] = qchart;
78	j++;	75	j++;
79	}	76	}
80	}	77	}
@@ -83,19 +80,58 void Grid::createCharts(const QString &category)
83	qchart->setTitle(QObject::tr("Empty"));	80	qchart->setTitle(QObject::tr("Empty"));
84	m_gridLayout->addItem(qchart, j / m_size, j % m_size);	81	m_gridLayout->addItem(qchart, j / m_size, j % m_size);
85	m_chartHash[qchart] = j;	82	m_chartHash[qchart] = j;
		83	m_chartHashRev[j] = qchart;
86	}	84	}
87	}	85	}
88	m_category = category;	86	m_gridLayout->activate();
		87	}
		88
		89	void Grid::createCharts(const QString &category, const QString &subcategory, const QString &name)
		90	{
		91	clear();
		92
		93	QChart *qchart(0);
		94	Charts::ChartList list = Charts::chartList();
		95	Chart *chart;
		96
		97	//find chart
		98	for (int i = 0; i < list.size(); ++i) {
		99
		100	chart = list.at(i);
		101	if (chart->category() == category &&
		102	chart->subCategory() == subcategory &&
		103	chart->name() == name) {
		104	break;
		105	}
		106	chart = 0;
		107	}
		108
		109	//create charts
		110	for (int j = 0; j < m_size * m_size; ++j) {
		111
		112	if(!chart){
		113	qchart = new QChart();
		114	}else{
		115	qchart = chart->createChart(m_dataTable);
		116	}
		117	qchart->setTitle(QObject::tr("Empty"));
		118	m_gridLayout->addItem(qchart, j / m_size, j % m_size);
		119	m_chartHash[qchart] = j;
		120	m_chartHashRev[j] = qchart;
		121	}
		122
89	m_gridLayout->activate();	123	m_gridLayout->activate();
90	}	124	}
91		125
92	void Grid::clear()	126	void Grid::clear()
93	{	127	{
94	~~for~~ (int i = 0; i < m_gridLayout->count(); ++i)	128	int count = m_gridLayout->count();
95	m_gridLayout->removeAt(i);	129	for (int i = 0; i < count; ++i)
		130	m_gridLayout->removeAt(0);
96		131
97	qDeleteAll(m_chartHash.keys());	132	qDeleteAll(m_chartHash.keys());
98	m_chartHash.clear();	133	m_chartHash.clear();
		134	m_chartHashRev.clear();
99	}	135	}
100		136
101	QList<QChart *> Grid::charts()	137	QList<QChart *> Grid::charts()
@@ -111,8 +147,40 void Grid::setState(State state)
111	void Grid::setSize(int size)	147	void Grid::setSize(int size)
112	{	148	{
113	if (m_size != size) {	149	if (m_size != size) {
		150
		151	//remove old;
		152	int count = m_gridLayout->count();
		153	for (int i = 0; i < count; ++i) {
		154	m_gridLayout->removeAt(0);
		155	}
		156
		157
		158	QChart* qchart = 0;
		159	int j = 0;
		160
		161	for (; j < size * size; ++j) {
		162
		163	qchart = m_chartHashRev[j];
		164
		165	if (!qchart){
		166	qchart = new QChart();
		167	qchart->setTitle(QObject::tr("Empty"));
		168	}
		169
		170	m_chartHash[qchart] = j;
		171	m_chartHashRev[j] = qchart;
		172	m_gridLayout->addItem(qchart, j / size, j % size);
		173	}
		174
		175	//delete rest
		176	while (j < m_size * m_size) {
		177	QChart* qchart = m_chartHashRev.take(j);
		178	delete(qchart);
		179	m_chartHash.remove(qchart);
		180	j++;
		181	}
		182
114	m_size = size;	183	m_size = size;
115	createCharts(m_category);
116	}	184	}
117	}	185	}
118		186
@@ -132,9 +200,11 void Grid::replaceChart(QChart oldChart, Chart newChart)
132	}	200	}
133	}	201	}
134	m_chartHash.remove(oldChart);	202	m_chartHash.remove(oldChart);
		203	m_chartHashRev.remove(index);
135	QChart *chart = newChart->createChart(m_dataTable);	204	QChart *chart = newChart->createChart(m_dataTable);
136	m_gridLayout->addItem(chart, index / m_size, index % m_size);	205	m_gridLayout->addItem(chart, index / m_size, index % m_size);
137	m_chartHash[chart] = index;	206	m_chartHash[chart] = index;
		207	m_chartHashRev[index] = chart;
138	delete oldChart;	208	delete oldChart;
139	}	209	}
140		210

demos/chartviewer/grid.h +2 -1

                 QList<QChart *> charts();
                 void createCharts(const QString &category = QString());
+                void createCharts(const QString &category, const QString &subcategory, const QString &name);
                 void replaceChart(QChart *oldChart, Chart *newChart);
                 void setState(State state);
                 State state() const { return m_state; };
                 int m_size;
                 DataTable m_dataTable;
                 QHash<QChart *, int> m_chartHash;
+                QHash<int, QChart *> m_chartHashRev;
                 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 +36 -18

                   m_baseLayout(new QGraphicsLinearLayout()),
                   m_menu(createMenu()),
                   m_template(0),
-                  m_grid(new Grid(1))
+                  m_grid(new Grid(-1))
             {
                 createProxyWidgets();
                 // create layout
                 settingsLayout->addItem(m_widgetHash["zoomCheckBox"]);
                 settingsLayout->addStretch();
-                m_grid->createCharts();
                 m_baseLayout->setOrientation(Qt::Horizontal);
                 m_baseLayout->addItem(m_grid);
                 m_baseLayout->addItem(settingsLayout);
                 m_antialiasCheckBox->setChecked(true);
                 initializeFromParamaters(parameters);
                 updateUI();
+                if(!m_category.isEmpty() && !m_subcategory.isEmpty() && !m_name.isEmpty())
+                    m_grid->createCharts(m_category,m_subcategory,m_name);
                 handleGeometryChanged();
                 setCentralWidget(m_view);
             void Window::initializeFromParamaters(const QVariantHash &parameters)
             {
+                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;
+                           }
+                       }
+                   }
                 if (parameters.contains("chart")) {
                     QString t = parameters["chart"].toString();
-                    for (int i = 0; i < m_templateComboBox->count(); ++i) {
-                        if (m_templateComboBox->itemText(i) == t) {
+                    QRegExp rx("([a-zA-Z0-9_]*)::([a-zA-Z0-9_]*)::([a-zA-Z0-9_]*)");
-                            m_templateComboBox->setCurrentIndex(i);
+                    int pos = rx.indexIn(t);
-                            break;
+                    if (pos > -1) {
+                        m_category = rx.cap(1);
+                        m_subcategory = rx.cap(2);
+                        m_name = rx.cap(3);
+                        m_templateComboBox->setCurrentIndex(0);
+                    }
+                    else {
+                        for (int i = 0; i < m_templateComboBox->count(); ++i) {
+                            if (m_templateComboBox->itemText(i) == t) {
+                                m_templateComboBox->setCurrentIndex(i);
+                                break;
+                            }
                         }
                     }
                 }
                         }
                     }
                 }
-                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();
+                checkTemplate();
                 checkOpenGL();
                 checkTheme();
                 checkAnimationOptions();
             void Window::checkView()
             {
                 int count(m_viewComboBox->itemData(m_viewComboBox->currentIndex()).toInt());
-                m_grid->setSize(count);
+                if(m_grid->size()!=count){
+                    m_grid->setSize(count);
+                    m_template = 0;
+                }
             }
             void Window::checkLegend()

demos/chartviewer/window.h +3 0

                 QMenu *m_menu;
                 int m_template;
                 Grid *m_grid;
+                QString m_category;
+                QString m_subcategory;
+                QString m_name;
                 friend class ComboBox;
             };

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