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

Fix zooming in crash...

Titta Heikkala -

r2603:1e4c29e111d4

parent child

Context file:

r2603:1e4c29e111d4

src/areachart/areachartitem.cpp +6 0

                     }
                 }
                 path.closeSubpath();
+                // 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 +14 -1

                 stroker.setCapStyle(Qt::SquareCap);
                 stroker.setMiterLimit(m_linePen.miterLimit());
+                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_shapePath = checkShapePath;
                     m_rect = m_shapePath.boundingRect();
+                } else {
+                    update();
+                }
             }
             void LineChartItem::handleUpdated()

src/scatterchart/scatterchartitem.cpp +5 0

                 QRectF clipRect(QPointF(0,0),domain()->size());
+                // Only zoom in if the clipRect fits inside int limits. QWidget::update() uses
+                // a region that has to be compatible with QRect.
+                if (clipRect.height() <= INT_MAX
+                        && clipRect.width() <= INT_MAX) {
                     QVector<bool> offGridStatus = offGridStatusVector();
                     const int seriesLastIndex = m_series->count() - 1;
                     prepareGeometryChange();
                     m_rect = clipRect;
                 }
+            }
             void ScatterChartItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
             {

src/splinechart/splinechartitem.cpp +11 -2

                     }
                     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());
+                // 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;
                     prepareGeometryChange();
-                m_fullPath = stroker.createStroke(fullPath);
+                    m_fullPath = checkShapePath;
                     m_rect = m_fullPath.boundingRect();
                 }
+            }
             /*!
               Calculates control points which are needed by QPainterPath.cubicTo function to draw the cubic Bezier cureve between two points.

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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