HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r447:44996c7702b8

Fixed scatter after the latest refactorings

Tero Ahola -

r447:44996c7702b8

parent child

Context file:

r447:44996c7702b8

Collapse all files

src/chartdataset.cpp +12 -4

@@ -213,12 +213,20 void ChartDataSet::calculateDomain(QSeries* series,Domain* domain) const
213	case QSeries::SeriesTypeScatter: {	213	case QSeries::SeriesTypeScatter: {
214	QScatterSeries scatterSeries = qobject_cast<QScatterSeries >(series);	214	QScatterSeries scatterSeries = qobject_cast<QScatterSeries >(series);
215	Q_ASSERT(scatterSeries);	215	Q_ASSERT(scatterSeries);
		216	qreal minX(domain->minX());
		217	qreal minY(domain->minY());
		218	qreal maxX(domain->maxX());
		219	qreal maxY(domain->maxY());
216	foreach (QPointF point, scatterSeries->data()) {	220	foreach (QPointF point, scatterSeries->data()) {
217	~~domain~~->~~setMinX~~(qMin(~~domain~~->minX(), point.x()));	221	minX = qMin(minX, point.x());
218	~~domain~~->~~setMinY~~(~~qMax~~(~~domain~~->~~maxX~~(), point.x()));	222	minY = qMin(minY, point.y());
219	~~domain~~->~~setMaxX~~(~~qMin~~(~~domain~~->~~minY~~(), point.y()));	223	maxX = qMax(maxX, point.x());
220	~~domain~~->~~setMaxY~~(qMax(~~domain~~->maxY(), point.y()));	224	maxY = qMax(maxY, point.y());
221	}	225	}
		226	domain->setMinX(minX);
		227	domain->setMinY(minY);
		228	domain->setMaxX(maxX);
		229	domain->setMaxY(maxY);
222	break;	230	break;
223	}	231	}
224		232

src/chartpresenter.cpp +5 -1

                                      scatterSeries, SIGNAL(clicked(QPointF)));
                     QObject::connect(this, SIGNAL(geometryChanged(const QRectF&)),
                                      scatterPresenter, SLOT(handleGeometryChanged(const QRectF&)));
+                    QObject::connect(domain, SIGNAL(domainChanged(qreal,qreal,qreal,qreal)),
+                                     scatterPresenter, SLOT(handleDomainChanged(qreal,qreal,qreal,qreal)));
                     m_chartTheme->decorate(scatterPresenter, scatterSeries, m_chartItems.count());
                     m_chartItems.insert(scatterSeries, scatterPresenter);
-                    if(m_rect.isValid()) scatterPresenter->handleGeometryChanged(m_rect);
+                    if (m_rect.isValid())
+                        scatterPresenter->handleGeometryChanged(m_rect);
+                    scatterPresenter->handleDomainChanged(domain->minX(), domain->maxX(), domain->minY(), domain->maxY());
                     break;
                 }
                 case QSeries::SeriesTypePie: {

src/scatterseries/scatterpresenter.cpp +14 -14

                 m_minY(0),
                 m_maxY(0),
                 m_series(series),
-                m_boundingRect()
+                m_clippingRect()
             {
                 if (parent)
-                    m_boundingRect = parent->boundingRect();
+                    m_clippingRect = parent->boundingRect();
                 if (series) {
                     connect(series, SIGNAL(changed()), this, SLOT(handleModelChanged()));
             void ScatterPresenter::handleDomainChanged(qreal minX, qreal maxX, qreal minY, qreal maxY)
             {
-                m_minX=minX;
+                m_minX = minX;
-                m_maxX=maxX;
+                m_maxX = maxX;
-                m_minY=minY;
+                m_minY = minY;
-                m_maxY=maxY;
+                m_maxY = maxY;
                 changeGeometry();
             }
             void ScatterPresenter::handleGeometryChanged(const QRectF& rect)
             {
-                m_boundingRect = rect.translated(-rect.topLeft());
+                m_clippingRect = rect.translated(-rect.topLeft());
                 changeGeometry();
                 setPos(rect.topLeft());
             }
             void ScatterPresenter::paint(QPainter *painter, const QStyleOptionGraphicsItem */*option*/, QWidget */*widget*/)
             {
                 painter->save();
-                painter->setClipRect(m_boundingRect);
+                painter->setClipRect(m_clippingRect);
                 // TODO: how to draw a drop shadow?
                 // Now using a custom implementation for drop shadow instead of QGraphicsDropShadowEffect.
             void ScatterPresenter::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
             {
                 QPointF clickedPoint(
-                    m_minX + (event->lastPos().x() / m_boundingRect.width()) * (m_maxX-m_minX),
+                    m_minX + (event->lastPos().x() / m_clippingRect.width()) * (m_maxX-m_minX),
-                    m_maxY - (event->lastPos().y() / m_boundingRect.height()) * (m_maxY-m_minY));
+                    m_maxY - (event->lastPos().y() / m_clippingRect.height()) * (m_maxY-m_minY));
                 emit clicked(clickedPoint);
             }
             void ScatterPresenter::changeGeometry()
             {
-                if (m_boundingRect.isValid()) {
+                if (m_clippingRect.isValid()) {
                     prepareGeometryChange();
-                    qreal scalex = m_boundingRect.width() / (m_maxX-m_minX);
+                    qreal scalex = m_clippingRect.width() / (m_maxX - m_minX);
-                    qreal scaley = m_boundingRect.height() / (m_maxY-m_minY);
+                    qreal scaley = m_clippingRect.height() / (m_maxY - m_minY);
                     int shape = m_series->shape();
                     m_path = QPainterPath();
                     foreach (QPointF point, m_series->data()) {
                         // Convert relative coordinates to absolute pixel coordinates that can be used for drawing
                         qreal x = point.x() * scalex - m_minX * scalex - size / 2;
-                        qreal y = m_boundingRect.height() - point.y() * scaley + m_minY * scaley - size / 2;
+                        qreal y = m_clippingRect.height() - point.y() * scaley + m_minY * scaley - size / 2;
                         if (x < scene()->width() && y < scene()->height()) {
                             switch (shape) {

src/scatterseries/scatterpresenter_p.h +1 -1

                 qreal m_minY;
                 qreal m_maxY;
                 QScatterSeries *m_series;
-                QRectF m_boundingRect;
+                QRectF m_clippingRect;
                 QPen m_markerPen;
                 QBrush m_markerBrush;
                 QPainterPath m_path;

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