HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2603:1e4c29e111d4

Fix zooming in crash...

Titta Heikkala -

r2603:1e4c29e111d4

parent child

Context file:

r2603:1e4c29e111d4

Collapse all files

src/areachart/areachartitem.cpp +10 -4

                      }
                  }
                  path.closeSubpath();
-                 prepareGeometryChange();
-                 m_path = path;
-                 m_rect = path.boundingRect();
-                 update();
+                 // Only zoom in if the bounding rect of the path fits inside int limits. QWidget::update() uses
+                 // a region that has to be compatible with QRect.
+                 if (path.boundingRect().height() <= INT_MAX
+                         && path.boundingRect().width() <= INT_MAX) {
+                     prepareGeometryChange();
+                     m_path = path;
+                     m_rect = path.boundingRect();
+                     update();
+                 }
              }
              void AreaChartItem::handleUpdated()

src/linechart/linechartitem.cpp +18 -5

                  stroker.setCapStyle(Qt::SquareCap);
                  stroker.setMiterLimit(m_linePen.miterLimit());
-                 prepareGeometryChange();
+                 QPainterPath checkShapePath = stroker.createStroke(fullPath);
+                 // Only zoom in if the bounding rects of the paths fit inside int limits. QWidget::update() uses
+                 // a region that has to be compatible with QRect.
+                 if (checkShapePath.boundingRect().height() <= INT_MAX
+                         && checkShapePath.boundingRect().width() <= INT_MAX
+                         && linePath.boundingRect().height() <= INT_MAX
+                         && linePath.boundingRect().width() <= INT_MAX
+                         && fullPath.boundingRect().height() <= INT_MAX
+                         && fullPath.boundingRect().width() <= INT_MAX) {
+                     prepareGeometryChange();
-                 m_linePath = linePath;
-                 m_fullPath = fullPath;
-                 m_shapePath = stroker.createStroke(fullPath);
+                     m_linePath = linePath;
+                     m_fullPath = fullPath;
+                     m_shapePath = checkShapePath;
-                 m_rect = m_shapePath.boundingRect();
+                     m_rect = m_shapePath.boundingRect();
+                 } else {
+                     update();
+                 }
              }
              void LineChartItem::handleUpdated()

src/scatterchart/scatterchartitem.cpp +29 -24

		@@ -126,31 +126,36 void ScatterChartItem::updateGeometry()
126	126
127	127	QRectF clipRect(QPointF(0,0),domain()->size());
128	128
129		QVector<bool> offGridStatus = offGridStatusVector();
130		const int seriesLastIndex = m_series->count() - 1;
131
132		for (int i = 0; i < points.size(); i++) {
133		QGraphicsItem *item = items.at(i);
134		const QPointF &point = points.at(i);
135		const QRectF &rect = item->boundingRect();
136		// During remove animation series may have different number of points,
137		// so ensure we don't go over the index. Animation handling itself ensures that
138		// if there is actually no points in the series, then it won't generate a fake point,
139		// so we can be assured there is always at least one point in m_series here.
140		// Note that marker map values can be technically incorrect during the animation,
141		// if it was caused by an insert, but this shouldn't be a problem as the points are
142		// fake anyway. After remove animation stops, geometry is updated to correct one.
143		m_markerMap[item] = m_series->at(qMin(seriesLastIndex, i));
144		item->setPos(point.x() - rect.width() / 2, point.y() - rect.height() / 2);
145
146		if (!m_visible \|\| offGridStatus.at(i))
147		item->setVisible(false);
148		else
149		item->setVisible(true);
150		}
	129	// Only zoom in if the clipRect fits inside int limits. QWidget::update() uses
	130	// a region that has to be compatible with QRect.
	131	if (clipRect.height() <= INT_MAX
	132	&& clipRect.width() <= INT_MAX) {
	133	QVector<bool> offGridStatus = offGridStatusVector();
	134	const int seriesLastIndex = m_series->count() - 1;
	135
	136	for (int i = 0; i < points.size(); i++) {
	137	QGraphicsItem *item = items.at(i);
	138	const QPointF &point = points.at(i);
	139	const QRectF &rect = item->boundingRect();
	140	// During remove animation series may have different number of points,
	141	// so ensure we don't go over the index. Animation handling itself ensures that
	142	// if there is actually no points in the series, then it won't generate a fake point,
	143	// so we can be assured there is always at least one point in m_series here.
	144	// Note that marker map values can be technically incorrect during the animation,
	145	// if it was caused by an insert, but this shouldn't be a problem as the points are
	146	// fake anyway. After remove animation stops, geometry is updated to correct one.
	147	m_markerMap[item] = m_series->at(qMin(seriesLastIndex, i));
	148	item->setPos(point.x() - rect.width() / 2, point.y() - rect.height() / 2);
	149
	150	if (!m_visible \|\| offGridStatus.at(i))
	151	item->setVisible(false);
	152	else
	153	item->setVisible(true);
	154	}
151	155
152		prepareGeometryChange();
153		m_rect = clipRect;
	156	prepareGeometryChange();
	157	m_rect = clipRect;
	158	}
154	159	}
155	160
156	161	void ScatterChartItem::paint(QPainter painter, const QStyleOptionGraphicsItem option, QWidget *widget)

src/splinechart/splinechartitem.cpp +13 -4

                      }
                      fullPath = splinePath;
                  }
-                 m_path = splinePath;
                  QPainterPathStroker stroker;
                  // The full path is comprised of three separate paths.
                  stroker.setCapStyle(Qt::SquareCap);
                  stroker.setMiterLimit(m_linePen.miterLimit());
-                 prepareGeometryChange();
+                 // Only zoom in if the bounding rects of the path fit inside int limits. QWidget::update() uses
+                 // a region that has to be compatible with QRect.
+                 QPainterPath checkShapePath = stroker.createStroke(fullPath);
+                 if (checkShapePath.boundingRect().height() <= INT_MAX
+                         && checkShapePath.boundingRect().width() <= INT_MAX
+                         && splinePath.boundingRect().height() <= INT_MAX
+                         && splinePath.boundingRect().width() <= INT_MAX) {
+                     m_path = splinePath;
-                 m_fullPath = stroker.createStroke(fullPath);
-                 m_rect = m_fullPath.boundingRect();
+                     prepareGeometryChange();
+                     m_fullPath = checkShapePath;
+                     m_rect = m_fullPath.boundingRect();
+                 }
              }
              /*!

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