From 3788ab533139d7bcca495d2337bfd3a979b3ee71 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Thu, 25 Apr 2024 09:39:50 +0300 Subject: Some clean ups in VectorImage code This does some general clean ups in the code: Removing unneeded line breaks, fixing style issues, removing comments that lack content, indentation, and also fixing one copy-paste issue where the wrong node info subclass was used. Change-Id: I524db7dc9a9682c67b104380804bf5ec3b4df40c Reviewed-by: Eskil Abrahamsen Blomfeldt --- .../generator/qquickitemgenerator.cpp | 44 ++++++++++------------ .../generator/qquickqmlgenerator.cpp | 5 ++- src/quickvectorimage/generator/qsvgvisitorimpl.cpp | 9 +---- src/quickvectorimage/generator/utils_p.h | 6 +-- 4 files changed, 26 insertions(+), 38 deletions(-) diff --git a/src/quickvectorimage/generator/qquickitemgenerator.cpp b/src/quickvectorimage/generator/qquickitemgenerator.cpp index 121af73130..171cb6889f 100644 --- a/src/quickvectorimage/generator/qquickitemgenerator.cpp +++ b/src/quickvectorimage/generator/qquickitemgenerator.cpp @@ -27,7 +27,6 @@ QQuickItemGenerator::QQuickItemGenerator(const QString fileName, QQuickVectorIma QQuickItemGenerator::~QQuickItemGenerator() { - } void QQuickItemGenerator::generateNodeBase(const NodeInfo &info) @@ -107,7 +106,6 @@ void QQuickItemGenerator::generatePath(const PathNodeInfo &info) m_parentShapeItem = shapeItem; m_inShapeItem = true; - // Check ?? generateNodeBase(info); optimizePaths(info); @@ -137,10 +135,8 @@ void QQuickItemGenerator::outputShapePath(const PathNodeInfo &info, const QPaint QQuickShapePath *shapePath = new QQuickShapePath; Q_ASSERT(shapePath); - if (!info.nodeId.isEmpty()) { - + if (!info.nodeId.isEmpty()) shapePath->setObjectName(QStringLiteral("svg_path:") + info.nodeId); - } if (noPen || !(pathSelector & QQuickVectorImageGenerator::StrokePath)) { shapePath->setStrokeColor(Qt::transparent); @@ -201,27 +197,25 @@ void QQuickItemGenerator::generateGradient(const QGradient *grad, QQuickShapePat QRectF gradRect(linGrad->start(), linGrad->finalStop()); QRectF logRect = linGrad->coordinateMode() == QGradient::LogicalMode ? gradRect : QQuickVectorImageGenerator::Utils::mapToQtLogicalMode(gradRect, boundingRect); - auto *quickGrad = new QQuickShapeLinearGradient(shapePath); + auto *quickGrad = new QQuickShapeLinearGradient(shapePath); + quickGrad->setX1(logRect.left()); + quickGrad->setY1(logRect.top()); + quickGrad->setX2(logRect.right()); + quickGrad->setY2(logRect.bottom()); + setStops(quickGrad, linGrad->stops()); - quickGrad->setX1(logRect.left()); - quickGrad->setY1(logRect.top()); - quickGrad->setX2(logRect.right()); - quickGrad->setY2(logRect.bottom()); - setStops(quickGrad, linGrad->stops()); - - shapePath->setFillGradient(quickGrad); + shapePath->setFillGradient(quickGrad); } else if (grad->type() == QGradient::RadialGradient) { auto *radGrad = static_cast(grad); - - auto *quickGrad = new QQuickShapeRadialGradient(shapePath); - quickGrad->setCenterX(radGrad->center().x()); - quickGrad->setCenterY(radGrad->center().y()); - quickGrad->setCenterRadius(radGrad->radius()); - quickGrad->setFocalX(radGrad->focalPoint().x()); - quickGrad->setFocalY(radGrad->focalPoint().y()); - setStops(quickGrad, radGrad->stops()); - - shapePath->setFillGradient(quickGrad); + auto *quickGrad = new QQuickShapeRadialGradient(shapePath); + quickGrad->setCenterX(radGrad->center().x()); + quickGrad->setCenterY(radGrad->center().y()); + quickGrad->setCenterRadius(radGrad->radius()); + quickGrad->setFocalX(radGrad->focalPoint().x()); + quickGrad->setFocalY(radGrad->focalPoint().y()); + setStops(quickGrad, radGrad->stops()); + + shapePath->setFillGradient(quickGrad); } } @@ -231,8 +225,8 @@ void QQuickItemGenerator::generateNode(const NodeInfo &info) return; qCWarning(lcQuickVectorImage) << "SVG NODE NOT IMPLEMENTED: " - << info.nodeId - << " type: " << info.typeName; + << info.nodeId + << " type: " << info.typeName; } void QQuickItemGenerator::generateTextNode(const TextNodeInfo &info) diff --git a/src/quickvectorimage/generator/qquickqmlgenerator.cpp b/src/quickvectorimage/generator/qquickqmlgenerator.cpp index 7313109f0d..7db7983e68 100644 --- a/src/quickvectorimage/generator/qquickqmlgenerator.cpp +++ b/src/quickvectorimage/generator/qquickqmlgenerator.cpp @@ -466,11 +466,12 @@ bool QQuickQmlGenerator::generateRootNode(const StructureNodeInfo &info) const QStringList comments = m_commentString.split(u'\n'); if (!isNodeVisible(info)) { - if (comments.isEmpty()) + if (comments.isEmpty()) { stream() << "// Generated from SVG"; - else + } else { for (const auto &comment : comments) stream() << "// " << comment; + } stream() << "import QtQuick"; stream() << "import QtQuick.Shapes" << Qt::endl; diff --git a/src/quickvectorimage/generator/qsvgvisitorimpl.cpp b/src/quickvectorimage/generator/qsvgvisitorimpl.cpp index 603c68ea33..c8dff7f518 100644 --- a/src/quickvectorimage/generator/qsvgvisitorimpl.cpp +++ b/src/quickvectorimage/generator/qsvgvisitorimpl.cpp @@ -124,7 +124,6 @@ protected: QPainter m_dummyPainter; QImage m_dummyImage; QSvgExtraStates m_svgState; - }; Q_GLOBAL_STATIC(QSvgStyleResolver, styleResolver) @@ -194,7 +193,6 @@ QSvgVisitorImpl::QSvgVisitorImpl(const QString svgFileName, QQuickGenerator *gen : m_svgFileName(svgFileName) , m_generator(generator) { - } void QSvgVisitorImpl::traverse() @@ -217,7 +215,7 @@ void QSvgVisitorImpl::visitNode(const QSvgNode *node) { handleBaseNodeSetup(node); - ImageNodeInfo info; + NodeInfo info; fillCommonNodeInfo(node, info); m_generator->generateNode(info); @@ -269,10 +267,7 @@ void QSvgVisitorImpl::visitRectNode(const QSvgRect *node) p.lineTo(x1, y1 + ry); p.arcTo(x1, y1, rx * 2, ry * 2, 180, -90); // ARC to x1 + rx, y1 - handlePathNode(node, p); - - return; } void QSvgVisitorImpl::visitEllipseNode(const QSvgEllipse *node) @@ -456,7 +451,6 @@ void QSvgVisitorImpl::visitTextNode(const QSvgText *node) } } - needsRichText = needsRichText || !styleTagContent.isEmpty(); if (!styleTagContent.isEmpty()) text += QStringLiteral("").arg(styleTagContent); @@ -749,7 +743,6 @@ void QSvgVisitorImpl::handleBaseNodeEnd(const QSvgNode *node) qCDebug(lcQuickVectorImage) << "After END" << node << "fill" << styleResolver->currentFillColor() << "stroke" << styleResolver->currentStrokeColor() << styleResolver->currentStrokeWidth() << node->nodeId(); - } void QSvgVisitorImpl::handlePathNode(const QSvgNode *node, const QPainterPath &path) diff --git a/src/quickvectorimage/generator/utils_p.h b/src/quickvectorimage/generator/utils_p.h index 0c25f3d7d3..bb65ee2b69 100644 --- a/src/quickvectorimage/generator/utils_p.h +++ b/src/quickvectorimage/generator/utils_p.h @@ -242,8 +242,8 @@ inline QString listString(QList list) if (list.isEmpty()) return QStringLiteral("[]"); - QString l; - QTextStream stream(&l); + QString listString; + QTextStream stream(&listString); stream << "["; if (list.length() > 1) { @@ -254,7 +254,7 @@ inline QString listString(QList list) } stream << list.last() << "]"; - return l; + return listString; } } -- cgit v1.2.3