HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2554:93cea193b2c2

Changed BoxPlot to use domain for calculating geometry points....

Mika Salmela -

r2554:93cea193b2c2

parent child

Context file:

r2554:93cea193b2c2

Collapse all files

src/boxplotchart/boxplotchartitem.cpp +7 -14

                 ChartItem(series->d_func(), item),
                 m_series(series),
                 m_animation(0),
-                m_animate(0),
+                m_animate(0)
-                m_domainMaxY(0.0),
-                m_domainMinY(0.0)
             {
                 connect(series, SIGNAL(boxsetsRemoved(QList<QBoxSet *>)), this, SLOT(handleBoxsetRemove(QList<QBoxSet *>)));
                 connect(series->d_func(), SIGNAL(restructuredBoxes()), this, SLOT(handleDataStructureChanged()));
                     }
                     updateBoxGeometry(box, s);
-                    box->updateGeometry();
+                    box->updateGeometry(domain());
                     if (m_animation)
                         m_animation->addBox(box);
                 if ((domain()->size().width() <= 0) || (domain()->size().height() <= 0))
                     return;
-                // Set my bounding rect to same as domain size
+                // Set my bounding rect to same as domain size. Add one pixel at the top (-1.0) and the bottom as 0.0 would
-                m_boundingRect.setRect(0.0, 0.0, domain()->size().width(), domain()->size().height());
+                // snip a bit off from the whisker at the grid line
+                m_boundingRect.setRect(0.0, -1.0, domain()->size().width(), domain()->size().height() + 1.0);
                 foreach (BoxWhiskers *item, m_boxTable.values()) {
-                    // Update the domain size for each BoxWhisker item
+                    item->updateGeometry(domain());
-                    item->setDomainSize(domain()->size());
-                    if (domain()->minY() != m_domainMinY || domain()->maxY() != m_domainMaxY) {
-                        item->updateGeometry();
-                        m_domainMinY = domain()->minY();
-                        m_domainMaxY = domain()->maxY();
                     // If the animation is set, start the animation for each BoxWhisker item
                     if (m_animation)
                     if (dirty && m_animation)
                         presenter()->startAnimation(m_animation->boxChangeAnimation(item));
                     else
-                        item->updateGeometry();
+                        item->updateGeometry(domain());
                 }
             }

src/boxplotchart/boxplotchartitem_p.h 0 -2

                 BoxPlotAnimation *m_animation;
                 bool m_animate;
-                qreal m_domainMaxY;
-                qreal m_domainMinY;
                 QRectF m_boundingRect;
             };

src/boxplotchart/boxwhiskers.cpp +44 -40

@@ -71,11 +71,10 void BoxWhiskers::setLayout(const BoxWhiskersData &data)
71	{	71	{
72	m_data = data;	72	m_data = data;
73		73
74	updateGeometry();	74	updateGeometry(m_domain);
75	update();	75	update();
76	}	76	}
77		77
78
79	QSizeF BoxWhiskers::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const	78	QSizeF BoxWhiskers::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
80	{	79	{
81	Q_UNUSED(which)	80	Q_UNUSED(which)
@@ -89,13 +88,6 void BoxWhiskers::setGeometry(const QRectF &rect)
89	Q_UNUSED(rect)	88	Q_UNUSED(rect)
90	}	89	}
91		90
92	void BoxWhiskers::setDomainSize(const QSizeF &size)
93	{
94	m_domainSize = size;
95
96	updateBoundingRect();
97	}
98
99	QRectF BoxWhiskers::boundingRect() const	91	QRectF BoxWhiskers::boundingRect() const
100	{	92	{
101	return m_boundingRect;	93	return m_boundingRect;
@@ -109,57 +101,69 void BoxWhiskers::paint(QPainter painter, const QStyleOptionGraphicsItem optio
109	painter->setPen(m_pen);	101	painter->setPen(m_pen);
110	painter->setBrush(m_brush);	102	painter->setBrush(m_brush);
111	painter->setClipRect(parentItem()->boundingRect());	103	painter->setClipRect(parentItem()->boundingRect());
112	painter->scale(m_domainSize.width() / m_data.m_boxItems, m_domainSize.height() / m_domain->spanY());
113	painter->drawPath(m_boxPath);	104	painter->drawPath(m_boxPath);
114	}	105	}
115		106
116	void BoxWhiskers::updateGeometry()	107	void BoxWhiskers::updateGeometry(AbstractDomain *domain)
117	{	108	{
		109	m_domain = domain;
		110
118	prepareGeometryChange();	111	prepareGeometryChange();
119		112
120	QPainterPath path;	113	QPainterPath path;
		114	m_boxPath = path;
		115	m_boundingRect = m_boxPath.boundingRect();
121		116
122	qreal columnWidth = 1.0 / m_data.m_seriesCount;	117	qreal columnWidth = 1.0 / m_data.m_seriesCount;
123	qreal left = 0.25 * columnWidth + columnWidth * m_data.m_seriesIndex;	118	qreal left = 0.25 * columnWidth + columnWidth * m_data.m_seriesIndex + m_data.m_index - 0.5;
124	qreal right = 0.75 * columnWidth + columnWidth * m_data.m_seriesIndex;	119	qreal barWidth = columnWidth / 2.0;
125	qreal middle = 0.5 * columnWidth + columnWidth * m_data.m_seriesIndex;	120
126	qreal domainMaxY = m_domain->maxY();	121	QPointF geometryPoint = m_domain->calculateGeometryPoint(QPointF(left, m_data.m_upperExtreme), m_validData);
		122	if (!m_validData)
		123	return;
		124	qreal geometryLeft = geometryPoint.x();
		125	qreal geometryUpperExtreme = geometryPoint.y();
		126	geometryPoint = m_domain->calculateGeometryPoint(QPointF(left + barWidth, m_data.m_upperQuartile), m_validData);
		127	if (!m_validData)
		128	return;
		129	qreal geometryRight = geometryPoint.x();
		130	qreal geometryUpperQuartile = geometryPoint.y();
		131	geometryPoint = m_domain->calculateGeometryPoint(QPointF(left, m_data.m_lowerQuartile), m_validData);
		132	if (!m_validData)
		133	return;
		134	qreal geometryLowerQuartile = geometryPoint.y();
		135	geometryPoint = m_domain->calculateGeometryPoint(QPointF(left, m_data.m_lowerExtreme), m_validData);
		136	if (!m_validData)
		137	return;
		138	qreal geometryLowerExtreme = geometryPoint.y();
		139	geometryPoint = m_domain->calculateGeometryPoint(QPointF(left, m_data.m_median), m_validData);
		140	if (!m_validData)
		141	return;
		142	qreal geometryMedian = geometryPoint.y();
127		143
128	// Upper whisker	144	// Upper whisker
129	path.moveTo(left + m_data.m_index, domainMaxY - m_data.m_upperExtreme);	145	path.moveTo(geometryLeft, geometryUpperExtreme);
130	path.lineTo(right + ~~m_data~~.~~m_index~~, ~~domainMaxY~~ - ~~m_data~~.~~m_u~~pperExtreme);	146	path.lineTo(geometryRight, geometryUpperExtreme);
131	path.moveTo(middle + m_data.m_index, domainMaxY - m_data.m_upperExtreme);	147	path.moveTo((geometryLeft + geometryRight) / 2.0, geometryUpperExtreme);
132	path.lineTo(middle + m_data.m_index, domainMaxY - m_data.m_upperQuartile);	148	path.lineTo((geometryLeft + geometryRight) / 2.0, geometryUpperQuartile);
133		149
134	// Middle Box	150	// Middle Box
135	path.addRect(left + m_data.m_index, domainMaxY - m_data.m_upperQuartile,	151	path.addRect(geometryLeft, geometryUpperQuartile, geometryRight - geometryLeft, geometryLowerQuartile - geometryUpperQuartile);
136	0.5 * columnWidth, m_data.m_upperQuartile - m_data.m_lowerQuartile);
137		152
138	// Median~~/mean~~ line	153	// Median line
139	path.moveTo(left + m_data.m_index, domainMaxY - m_data.m_median);	154	path.moveTo(geometryLeft, geometryMedian);
140	path.lineTo(right + m_data.m_index, domainMaxY - m_data.m_median);	155	path.lineTo(geometryRight, geometryMedian);
141		156
142	// Lower whisker	157	// Lower whisker
143	path.moveTo(left + m_data.m_index, domainMaxY - m_data.m_lowerExtreme);	158	path.moveTo(geometryLeft, geometryLowerExtreme);
144	path.lineTo(right + ~~m_data~~.~~m_index~~, ~~domainMaxY~~ - ~~m_data~~.~~m_l~~owerExtreme);	159	path.lineTo(geometryRight, geometryLowerExtreme);
145	path.moveTo(middle + m_data.m_index, domainMaxY - m_data.m_lowerExtreme);	160	path.moveTo((geometryLeft + geometryRight) / 2.0, geometryLowerQuartile);
146	path.lineTo(middle + m_data.m_index, domainMaxY - m_data.m_lowerQuartile);	161	path.lineTo((geometryLeft + geometryRight) / 2.0, geometryLowerExtreme);
147		162
148	path.closeSubpath();	163	path.closeSubpath();
149		164
150	m_boxPath = path;	165	m_boxPath = path;
151		166	m_boundingRect = m_boxPath.boundingRect();
152	updateBoundingRect();
153	}
154
155	void BoxWhiskers::updateBoundingRect()
156	{
157	qreal scaleY = m_domainSize.height() / (m_domain->maxY() - m_domain->minY());
158	qreal scaleX = m_domainSize.width() / m_data.m_boxItems;
159	QRectF br = m_boxPath.boundingRect();
160
161	m_boundingRect = QRectF(br.x() * scaleX, br.y() * scaleY,
162	br.width() * scaleX, br.height() * scaleY);
163	}	167	}
164		168
165	#include "moc_boxwhiskers_p.cpp"	169	#include "moc_boxwhiskers_p.cpp"

src/boxplotchart/boxwhiskers_p.h +1 -5

                 void setBrush(const QBrush &brush);
                 void setPen(const QPen &pen);
                 void setLayout(const BoxWhiskersData &data);
-                void setDomainSize(const QSizeF &size);
                 void mousePressEvent(QGraphicsSceneMouseEvent *event);
                 void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
                 QRectF boundingRect() const;
                 void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0);
-                void updateGeometry();
+                void updateGeometry(AbstractDomain *domain);
             protected:
                 QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const;
                 void setGeometry(const QRectF &rect);
-            private:
-                void updateBoundingRect();
             Q_SIGNALS:
                 void clicked(QBoxSet *boxset);
                 void hovered(bool status, QBoxSet *boxset);

src/boxplotchart/qboxplotseries.cpp +2 -2

                 qreal maxY(domain()->maxY());
                 qreal x = m_boxSets.count();
-                minX = qMin(minX, - (qreal)0.5);
+                minX = qMin(minX, qreal(-0.5));
                 minY = qMin(minY, min());
-                maxX = qMax(maxX, x - (qreal)0.5);
+                maxX = qMax(maxX, x - qreal(0.5));
                 maxY = qMax(maxY, max());
                 domain()->setRange(minX, maxX, minY, maxY);

tests/boxplottester/mainwidget.cpp +12 -9

             #include <QDebug>
             #include <QStandardItemModel>
             #include <QBarCategoryAxis>
+            #include <QLogValueAxis>
             QTCOMMERCIALCHART_USE_NAMESPACE
             QString addCategories[] = {"Jul", "Aug", "Sep", "Nov", "Dec"};
+            static const int maxAddCategories = 5;
             MainWidget::MainWidget(QWidget *parent) :
                 QWidget(parent),
                 m_chart(0),
+                m_axis(0),
                 rowPos(0),
                 nSeries(0),
                 nNewBoxes(0)
                 // Create chart view with the chart
                 m_chartView = new QChartView(m_chart, this);
-                //m_chartView->setRubberBand(QChartView::HorizonalRubberBand);
                 // Another grid layout as a main layout
                 QGridLayout *mainLayout = new QGridLayout();
                     return;
                 // Initial data
-                //![1]
                 QBoxSet *set0 = new QBoxSet();
                 QBoxSet *set1 = new QBoxSet();
                 QBoxSet *set2 = new QBoxSet();
                 QBoxSet *set5 = new QBoxSet();
                 //      low  bot   med   top  upp
-                *set0 << 1 << 2 << 4.4 << 13 << 15;
+                *set0 << -1 << 2 << 4 << 13 << 15;
                 *set1 << 5 << 6 << 7.5 << 8 << 12;
                 *set2 << 3 << 5 << 5.7 << 8 << 9;
                 *set3 << 5 << 6 << 6.8 << 7 << 8;
                 m_chart->addSeries(m_series[nSeries]);
-                if (nSeries == 0) {
+                if (!m_axis) {
                     QStringList categories;
                     categories << "Jan" << "Feb" << "Mar" << "Apr" << "May" << "Jun";
                     m_axis = new QBarCategoryAxis();
                     m_axis->append(categories);
                     m_chart->createDefaultAxes();
-                    m_chart->setAxisX(m_axis, m_series[nSeries]);
                 }
+                m_chart->setAxisX(m_axis, m_series[nSeries]);
                 nSeries++;
             }
             {
                 qDebug() << "BoxPlotTester::MainWidget::addBox()";
-                if (nSeries > 0) {
+                if (nSeries > 0 && nNewBoxes < maxAddCategories) {
                     QBoxSet *newSet = new QBoxSet();
                     newSet->setValue(QBoxSet::LowerExtreme, 5.0);
                     newSet->setValue(QBoxSet::LowerQuartile, 6.0);
                     newSet->setValue(QBoxSet::UpperQuartile, 7.0);
                     newSet->setValue(QBoxSet::UpperExtreme, 8.0);
-                    for (int i = 0; i < nSeries; i++)
+                    m_series[0]->append(newSet);
-                        m_series[i]->append(newSet);
                     m_axis->append(addCategories[nNewBoxes]);
                 if (nSeries > 0) {
                     for (int i = 0; i < nSeries; i++) {
+                        qDebug() << "m_series[i]->count() = " << m_series[i]->count();
+                        if (m_series[i]->count() > 3) {
                             QList<QBoxSet *> sets = m_series[i]->boxSets();
                             m_series[i]->remove(sets.at(m_series[i]->count() - 3));
                         }
+                    }
+                    if (m_axis->count() > 3)
                         m_axis->remove(m_axis->at(1));
                 } else {
                     qDebug() << "Create a series first";

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