HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2484:f6ca68eccfda

Improved handling of different serieses....

Mika Salmela -

r2484:f6ca68eccfda

parent child

Context file:

r2484:f6ca68eccfda

Collapse all files

examples/boxplotchart/main.cpp +36 -6

             #include <QBarSet>
             #include <QLegend>
             #include <QBarCategoryAxis>
+            #include <QLineSeries>
             #include <QBrush>
             #include <QColor>
                 QBarSet *set3 = new QBarSet("Apr");
                 QBarSet *set4 = new QBarSet("May");
                 QBarSet *set5 = new QBarSet("Jun");
+                QBarSet *set6 = new QBarSet("Jul");
+                QBarSet *set7 = new QBarSet("Aug");
+                QBarSet *set8 = new QBarSet("Sep");
+                QBarSet *set9 = new QBarSet("Oct");
+                QBarSet *set10 = new QBarSet("Nov");
+                QBarSet *set11 = new QBarSet("Dec");
                 //      low  bot   med   top  upp
                 *set0 << 3 << 4 << 4.4 << 6 << 7;
                 *set3 << 5 << 6 << 6.8 << 7 << 8;
                 *set4 << 4 << 5 << 5.2 << 6 << 7;
                 *set5 << 4 << 7 << 8.2 << 9 << 10;
+                *set6 << 2.5 << 5 << 5.4 << 6 << 7;
+                *set7 << 5 << 6.3 << 7.5 << 8 << 12;
+                *set8 << 2.6 << 5.1 << 5.7 << 8 << 9;
+                *set9 << 3.1 << 5.8 << 6.8 << 7 << 8;
+                *set10 << 4.2 << 5 << 5.8 << 6 << 7;
+                *set11 << 4.7 << 7 << 8.2 << 9 << 10;
-                set0->setBrush(QBrush(QColor(Qt::yellow)));
-                //set0->setColor(QColor(Qt::darkRed));
             //![1]
             //![2]
                 series->append(set3);
                 series->append(set4);
                 series->append(set5);
-                series->type();
+                series->append(set6);
+                series->append(set7);
+                series->append(set8);
+                series->append(set9);
+                series->append(set10);
+                series->append(set11);
                 series->setName("Box & Whiskers");
-                //series->setBrush(QBrush(QColor(Qt::yellow)));
             //![2]
+                QLineSeries *lineSeries = new QLineSeries();
+                lineSeries->append(0, 4.4);
+                lineSeries->append(1, 7.5);
+                lineSeries->append(2, 5.7);
+                lineSeries->append(3, 6.8);
+                lineSeries->append(4, 5.2);
+                lineSeries->append(5, 8.2);
+                lineSeries->append(6, 5.4);
+                lineSeries->append(7, 7.5);
+                lineSeries->append(8, 5.7);
+                lineSeries->append(9, 6.8);
+                lineSeries->append(10, 5.2);
+                lineSeries->append(11, 8.2);
+                lineSeries->setName("Medians");
             //![3]
                 QChart *chart = new QChart();
                 chart->addSeries(series);
+                chart->addSeries(lineSeries);
                 chart->setTitle("Simple boxplotchart example");
                 chart->setAnimationOptions(QChart::SeriesAnimations);
             //![3]
             //![4]
                 QStringList categories;
-                categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun";
+                categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun" << "Jul" << "Aug" << "Sep" << "Oct" << "Nov" << "Dec";
                 QBarCategoryAxis *axis = new QBarCategoryAxis();
                 axis->append(categories);
                 chart->createDefaultAxes();

src/boxplotchart/boxplotchartitem.cpp +9 0

                     item->setBrush(m_series->brush());
                     item->setPen(m_series->pen());
                 }
+                // Override with QBarSet specific settings
+                foreach (QBarSet *set, m_boxTable.keys()) {
+                    if (set->brush().style() != Qt::NoBrush)
+                        m_boxTable.value(set)->setBrush(set->brush());
+                    if (set->pen().style() != Qt::NoPen)
+                        m_boxTable.value(set)->setPen(set->pen());
+                }
             }
             void BoxPlotChartItem::handleBarsetRemove(QList<QBarSet*> barSets)
             QVector<QRectF> BoxPlotChartItem::calculateLayout()
             {
+                qDebug() << "ALERT EMPTY: BoxPlotChartItem::calculateLayout()";
                 return QVector<QRectF>();
             }

src/boxplotchart/boxwhiskers.cpp +2 0

             void BoxWhiskers::setBrush(const QBrush &brush)
             {
                 m_brush = brush;
+                update();
             }
             void BoxWhiskers::setPen(const QPen &pen)
             {
                 m_pen = pen;
+                update();
             }
             void BoxWhiskers::setLayout(const BoxWhiskersData &data)

src/boxplotchart/qboxplotseries.cpp +6 -8

                     connect(m_chart->d_ptr->m_dataset, SIGNAL(seriesRemoved(QAbstractSeries*)), this, SLOT(handleSeriesRemove(QAbstractSeries*)) );
                     QList<QAbstractSeries *> serieses = m_chart->series();
-                    boxPlot->m_seriesCount = serieses.count();
                     // Tries to find this series from the Chart's list of serieses and deduce the index
                     int index = 0;
                     foreach (QAbstractSeries *s, serieses) {
+                        if (s->type() == QAbstractSeries::SeriesTypeBoxPlot) {
                             if (q == static_cast<QBoxPlotSeries *>(s)) {
                                 boxPlot->m_seriesIndex = index;
                                 m_index = index;
                             index++;
                         }
                     }
+                    boxPlot->m_seriesCount = index;
+                }
                 // Make BoxPlotChartItem to instantiate box & whisker items
                 boxPlot->handleDataStructureChanged();
                 if (forced || m_pen == QPen(Qt::NoPen)) {
                     QPen pen = theme->outlinePen();
                     pen.setCosmetic(true);
-            //        QPen pen;
-            //        pen.setColor(ChartThemeManager::colorAt(gradients.at(index % gradients.size()), 1.0));
-            //        pen.setWidthF(2.0);
-            //        pen.setCosmetic(true);
                     q->setPen(pen);
                 }
             }
                 if (m_chart) {
                     QList<QAbstractSeries *> serieses = m_chart->series();
-                    boxPlot->m_seriesCount = serieses.count();
                     // Tries to find this series from the Chart's list of serieses and deduce the index
                     int index = 0;
                     foreach (QAbstractSeries *s, serieses) {
+                        if (s->type() == QAbstractSeries::SeriesTypeBoxPlot) {
                             if (q == static_cast<QBoxPlotSeries *>(s)) {
                                 boxPlot->m_seriesIndex = index;
                                 m_index = index;
                             index++;
                         }
                     }
+                    boxPlot->m_seriesCount = index;
+                }
                 boxPlot->handleDataStructureChanged();
             }

tests/boxplottester/mainwidget.cpp +57 -1

@@ -76,11 +76,26 MainWidget::MainWidget(QWidget *parent) :
76	connect(addBoxButton, SIGNAL(clicked()), this, SLOT(addBox()));	76	connect(addBoxButton, SIGNAL(clicked()), this, SLOT(addBox()));
77	grid->addWidget(addBoxButton, rowPos++, 1);	77	grid->addWidget(addBoxButton, rowPos++, 1);
78		78
		79	// Create insert a box button
		80	QPushButton *insertBoxButton = new QPushButton("Insert a box");
		81	connect(insertBoxButton, SIGNAL(clicked()), this, SLOT(insertBox()));
		82	grid->addWidget(insertBoxButton, rowPos++, 1);
		83
79	// Create add a single box button	84	// Create add a single box button
80	QPushButton *removeBoxButton = new QPushButton("Remove a box");	85	QPushButton *removeBoxButton = new QPushButton("Remove a box");
81	connect(removeBoxButton, SIGNAL(clicked()), this, SLOT(removeBox()));	86	connect(removeBoxButton, SIGNAL(clicked()), this, SLOT(removeBox()));
82	grid->addWidget(removeBoxButton, rowPos++, 1);	87	grid->addWidget(removeBoxButton, rowPos++, 1);
83		88
		89	// Create clear button
		90	QPushButton *clearButton = new QPushButton("Clear");
		91	connect(clearButton, SIGNAL(clicked()), this, SLOT(clear()));
		92	grid->addWidget(clearButton, rowPos++, 1);
		93
		94	// Create set brush button
		95	QPushButton *setBrushButton = new QPushButton("Set brush");
		96	connect(setBrushButton, SIGNAL(clicked()), this, SLOT(setBrush()));
		97	grid->addWidget(setBrushButton, rowPos++, 1);
		98
84	initThemeCombo(grid);	99	initThemeCombo(grid);
85	initCheckboxes(grid);	100	initCheckboxes(grid);
86		101
@@ -208,6 +223,8 void MainWidget::addSeries()
208		223
209	void MainWidget::removeSeries()	224	void MainWidget::removeSeries()
210	{	225	{
		226	qDebug() << "BoxPlotTester::MainWidget::removeSeries()";
		227
211	if (nSeries > 0) {	228	if (nSeries > 0) {
212	nSeries--;	229	nSeries--;
213	m_chart->removeSeries(m_series[nSeries]);	230	m_chart->removeSeries(m_series[nSeries]);
@@ -233,9 +250,25 void MainWidget::addBox()
233	}	250	}
234	}	251	}
235		252
		253	void MainWidget::insertBox()
		254	{
		255	qDebug() << "BoxPlotTester::MainWidget::insertBox()";
		256
		257	if (nSeries > 0) {
		258	QBarSet *newSet = new QBarSet("New");
		259	*newSet << 2 << 6 << 6.8 << 7 << 10;
		260
		261	m_series[0]->insert(1, newSet);
		262
		263	m_axis->append(addCategories[nNewBoxes]);
		264
		265	nNewBoxes++;
		266	}
		267	}
		268
236	void MainWidget::removeBox()	269	void MainWidget::removeBox()
237	{	270	{
238	qDebug() << "MainWidget::removeBox";	271	qDebug() << "BoxPlotTester::MainWidget::removeBox";
239		272
240	if (nSeries > 0) {	273	if (nSeries > 0) {
241	QList<QBarSet *> sets = m_series[0]->barSets();	274	QList<QBarSet *> sets = m_series[0]->barSets();
@@ -245,6 +278,29 void MainWidget::removeBox()
245	}	278	}
246	}	279	}
247		280
		281	void MainWidget::clear()
		282	{
		283	qDebug() << "BoxPlotTester::MainWidget::clear";
		284
		285	if (nSeries > 0) {
		286	m_series[0]->clear();
		287	} else {
		288	qDebug() << "Create a series first";
		289	}
		290	}
		291
		292	void MainWidget::setBrush()
		293	{
		294	qDebug() << "BoxPlotTester::MainWidget::setBrush";
		295
		296	if (nSeries > 0) {
		297	QList<QBarSet *> sets = m_series[0]->barSets();
		298	sets.at(1)->setBrush(QBrush(QColor(Qt::yellow)));
		299	} else {
		300	qDebug() << "Create a series first";
		301	}
		302	}
		303
248	void MainWidget::animationToggled(bool enabled)	304	void MainWidget::animationToggled(bool enabled)
249	{	305	{
250	qDebug() << "BoxPlotTester::Animation toggled to " << enabled;	306	qDebug() << "BoxPlotTester::Animation toggled to " << enabled;

tests/boxplottester/mainwidget.h +3 0

                 void addSeries();
                 void removeSeries();
                 void addBox();
+                void insertBox();
                 void removeBox();
+                void clear();
+                void setBrush();
                 void animationToggled(bool enabled);
                 void legendToggled(bool enabled);
                 void titleToggled(bool enabled);

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