QuickGraphLib 0.1.0a16__tar.gz → 0.1.0a17__tar.gz

{quickgraphlib-0.1.0a16 → quickgraphlib-0.1.0a17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: QuickGraphLib
-Version: 0.1.0a16
+Version: 0.1.0a17
 Summary: A scientific graphing library for QtQuick
 Author-Email: Matthew Joyce <matthew.joyce@refeyn.com>
 License: MIT License

{quickgraphlib-0.1.0a16 → quickgraphlib-0.1.0a17}/QuickGraphLib/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.1.0a16'
-__version_tuple__ = version_tuple = (0, 1, 0, 'a16')
+__version__ = version = '0.1.0a17'
+__version_tuple__ = version_tuple = (0, 1, 0, 'a17')
 
-__commit_id__ = commit_id = 'g44df4fafd'
+__commit_id__ = commit_id = 'g5ab61e44b'

{quickgraphlib-0.1.0a16 → quickgraphlib-0.1.0a17}/QuickGraphLib/doc/export.qdoc

@@ -42,6 +42,8 @@ If an element is not rendered correctly, create a \l {https://github.com/refeyn/
 
 \list
     \li \l Rectangle items must have \l {Rectangle::border.width} {border.width} set to zero if the border should be hidden. This is because the border width defaults to 1, and there is no public API for checking if the width or color has been set.
+    \li For \l Image items, the \c Image.Tile, \c Image.TileVertically, and \c Image.TileHorizontally options for \l {Image::fillMode} are not yet supported.
+    \li Network sources are not supported for \l Image and \l VectorImage items.
 \endlist
 
 */

{quickgraphlib-0.1.0a16 → quickgraphlib-0.1.0a17}/QuickGraphLib/helpers/Helpers.cpp

@@ -3,12 +3,15 @@
 
 #include "Helpers.hpp"
 
+#include <QAbstractTextDocumentLayout>
 #include <QFile>
 #include <QMatrix4x4>
 #include <QPainter>
 #include <QPainterPath>
+#include <QQmlContext>
 #include <QTextDocument>
 #include <QtSvg/QSvgGenerator>
+#include <QtSvg/QSvgRenderer>
 
 #include "ImageView.hpp"
 
@@ -264,6 +267,31 @@ void exportShapePathToPainter(QObject* shapePath, QPainter* painter) {
     painter->restore();
 }
 
+QRectF alignSizeInsideRect(QRectF area, QSizeF size, Qt::Alignment alignment) {
+    qreal x;
+    if (alignment & Qt::AlignLeft) {
+        x = 0;
+    }
+    else if (alignment & Qt::AlignRight) {
+        x = area.width() - size.width();
+    }
+    else {
+        x = (area.width() - size.width()) / 2;
+    }
+
+    qreal y;
+    if (alignment & Qt::AlignTop) {
+        y = 0;
+    }
+    else if (alignment & Qt::AlignBottom) {
+        y = area.height() - size.height();
+    }
+    else {
+        y = (area.height() - size.height()) / 2;
+    }
+    return QRectF(QPointF(x, y), size);
+}
+
 void exportItemToPainter(QQuickItem* item, QPainter* painter) {
     if (!item->isVisible()) {
         return;
@@ -313,7 +341,8 @@ void exportItemToPainter(QQuickItem* item, QPainter* painter) {
     if (item->inherits("QQuickText")) {
         painter->save();
         painter->setFont(item->property("font").value<QFont>());
-        painter->setPen(item->property("color").value<QColor>());
+        auto color = item->property("color").value<QColor>();
+        painter->setPen(color);
         auto textFormat = static_cast<Qt::TextFormat>(item->property("textFormat").toInt());
         auto text = item->property("text").toString();
         auto alignment = static_cast<Qt::AlignmentFlag>(
@@ -340,7 +369,9 @@ void exportItemToPainter(QQuickItem* item, QPainter* painter) {
             option.setAlignment(alignment);
             doc.setDefaultTextOption(option);
             doc.setDefaultFont(painter->font());
-            doc.drawContents(painter, rect);
+            QAbstractTextDocumentLayout::PaintContext ctx{};
+            ctx.palette.setColor(QPalette::Text, color);
+            doc.documentLayout()->draw(painter, ctx);
         }
         painter->restore();
     }
@@ -385,6 +416,95 @@ void exportItemToPainter(QQuickItem* item, QPainter* painter) {
         painter->drawImage(imageView->paintedRect(), imageView->image().flipped(flippedFlags));
     }
 
+    else if (item->inherits("QQuickImage")) {
+        if (item->property("smooth").toBool()) {
+            painter->setRenderHint(QPainter::RenderHint::SmoothPixmapTransform, true);
+        }
+        auto flippedFlags = Qt::Orientations();
+        flippedFlags.setFlag(Qt::Horizontal, item->property("mirror").toBool());
+        flippedFlags.setFlag(Qt::Vertical, item->property("mirrorVertically").toBool());
+        auto source = item->property("source").toString();
+        auto ctx = qmlContext(item);
+        if (ctx) {
+            auto url = ctx->resolvedUrl(source);
+            source = url.scheme() == "file" ? url.toLocalFile() : url.toString();
+        }
+        auto image = QImage(source);
+        if (image.isNull()) {
+            qWarning() << __func__ << "Could not load" << source;
+        }
+        auto sourceClipRect = item->property("sourceClipRect").toRectF();
+        if (!sourceClipRect.isValid()) {
+            sourceClipRect = QRectF(0, 0, image.width(), image.height());
+        }
+        auto alignment = static_cast<Qt::Alignment>(
+            item->property("horizontalAlignment").toUInt() | item->property("verticalAlignment").toUInt()
+        );
+        auto sourceSize = item->property("sourceSize").toSizeF();
+        if (sourceSize.isNull()) {
+            sourceSize = sourceClipRect.size();
+        }
+        else {
+            sourceSize = sourceClipRect.size().scaled(sourceSize, Qt::KeepAspectRatio);
+        }
+        switch (item->property("fillMode").toInt()) {
+            case 0:     // QQuickImage::FillMode::Stretch
+                break;  // Don't need to do anything
+            case 1:     // QQuickImage::FillMode::PreserveAspectFit
+                rect = alignSizeInsideRect(
+                    rect, sourceClipRect.size().scaled(rect.size(), Qt::KeepAspectRatio), alignment
+                );
+                break;
+            case 2:  // QQuickImage::FillMode::PreserveAspectCrop
+                sourceClipRect = alignSizeInsideRect(
+                    sourceClipRect, rect.size().scaled(sourceClipRect.size(), Qt::KeepAspectRatio), alignment
+                );
+                break;
+            case 3:  // QQuickImage::FillMode::Tile
+            case 4:  // QQuickImage::FillMode::TileVertically
+            case 5:  // QQuickImage::FillMode::TileHorizontally
+                qWarning() << __func__ << "Unsupported fillMode for QQuickImage";
+                break;
+            case 6:  // QQuickImage::FillMode::Pad
+                rect = alignSizeInsideRect(rect, sourceSize, alignment);
+                break;
+        }
+        painter->drawImage(rect, image.flipped(flippedFlags), sourceClipRect);
+    }
+
+    else if (item->inherits("QQuickVectorImage")) {
+        auto source = item->property("source").toString();
+        auto ctx = qmlContext(item);
+        if (ctx) {
+            auto url = ctx->resolvedUrl(source);
+            source = url.scheme() == "file" ? url.toLocalFile() : url.toString();
+        }
+        QSvgRenderer renderer(source);
+        if (!renderer.isValid()) {
+            qWarning() << __func__ << "Could not load" << source;
+        }
+        switch (item->property("fillMode").toInt()) {
+            case 0:  // QQuickVectorImage::FillMode::NoResize
+                rect = renderer.viewBoxF();
+                break;
+            case 1:  // QQuickVectorImage::FillMode::PreserveAspectFit
+                rect = alignSizeInsideRect(
+                    rect, renderer.viewBoxF().size().scaled(rect.size(), Qt::KeepAspectRatio),
+                    Qt::AlignLeft | Qt::AlignTop
+                );
+                break;
+            case 2:  // QQuickVectorImage::FillMode::PreserveAspectCrop
+                rect = alignSizeInsideRect(
+                    rect, renderer.viewBoxF().size().scaled(rect.size(), Qt::KeepAspectRatioByExpanding),
+                    Qt::AlignLeft | Qt::AlignTop
+                );
+                break;
+            case 3:     // QQuickVectorImage::FillMode::Stretch
+                break;  // Don't need to do anything
+        }
+        renderer.render(painter, rect);
+    }
+
     for (auto c : children) {
         if (c->z() >= 0) {
             exportItemToPainter(c, painter);

quickgraphlib-0.1.0a17/ci/fixup_qt.py

@@ -0,0 +1,16 @@
+# SPDX-FileCopyrightText: Copyright (c) 2024 Refeyn Ltd and other QuickGraphLib contributors
+# SPDX-License-Identifier: MIT
+
+import os
+import pathlib
+import shutil
+import sys
+
+import PySide6
+
+# Fix for PYSIDE-3267 (for some reason the linux tests don't need a fixup)
+
+if sys.platform == "win32":
+    from_ = pathlib.Path(os.environ["QT_PATH"]) / "bin/Qt6QuickVectorImageHelpers.dll"
+    print("Copying", from_, "to", PySide6.__path__[0])
+    shutil.copy(from_, PySide6.__path__[0])

{quickgraphlib-0.1.0a16 → quickgraphlib-0.1.0a17}/examples/LogGraph.qdoc

@@ -4,7 +4,7 @@
 /*!
     \title Log graph
     \ingroup quickgraphlibdemos
-    \brief A tan graph with a logarithmic axis
+    \brief A tan graph with a logarithmic axis.
     \example loggraph
 
     \image examples/LogGraph.png

{quickgraphlib-0.1.0a16 → quickgraphlib-0.1.0a17}/pyproject.toml

@@ -69,10 +69,11 @@ build = [
 before-all = "python ci/setup_qt.py"
 repair-wheel-command = ""
 build-frontend = "build"
-test-command = "pytest -sv {project}/tests --import-mode=append"
+test-command = "python {project}/ci/fixup_qt.py && pytest -sv {project}/tests --import-mode=append"
 test-extras = ["analyse"]
 
 [tool.cibuildwheel.environment]
+QT_PATH = "\"$(python ci/find_qt.py)\""
 SKBUILD_CMAKE_DEFINE = "CMAKE_PREFIX_PATH=\"$(python ci/find_qt.py)/lib/cmake\""
 
 [tool.cibuildwheel.macos]

quickgraphlib-0.1.0a17/tests/extra_examples/ImageExport.qml

@@ -0,0 +1,63 @@
+pragma ComponentBehavior: Bound
+// SPDX-FileCopyrightText: Copyright (c) 2024 Refeyn Ltd and other QuickGraphLib contributors
+// SPDX-License-Identifier: MIT
+// Tests for exporting Image items
+
+import QtQuick
+import QtQuick.Layouts as QQL
+
+QQL.GridLayout {
+    id: root
+
+    property url source: "500px-Kittyply_edit1.jpg"
+
+    columnSpacing: 10
+    columns: 3
+    rowSpacing: 10
+    uniformCellHeights: true
+    uniformCellWidths: true
+
+    Image {
+        QQL.Layout.fillHeight: true
+        QQL.Layout.fillWidth: true
+        fillMode: Image.Stretch
+        source: root.source
+    }
+    Image {
+        QQL.Layout.fillHeight: true
+        QQL.Layout.fillWidth: true
+        fillMode: Image.PreserveAspectFit
+        source: root.source
+    }
+    Image {
+        QQL.Layout.fillHeight: true
+        QQL.Layout.fillWidth: true
+        fillMode: Image.PreserveAspectCrop
+        source: root.source
+    }
+    Image {
+        QQL.Layout.fillHeight: true
+        QQL.Layout.fillWidth: true
+        fillMode: Image.Pad
+        source: root.source
+        sourceSize: Qt.size(100, 100)
+    }
+    Image {
+        QQL.Layout.fillHeight: true
+        QQL.Layout.fillWidth: true
+        fillMode: Image.Pad
+        horizontalAlignment: Image.AlignLeft
+        source: root.source
+        sourceSize: Qt.size(100, 100)
+        verticalAlignment: Image.AlignTop
+    }
+    Image {
+        QQL.Layout.fillHeight: true
+        QQL.Layout.fillWidth: true
+        fillMode: Image.Pad
+        horizontalAlignment: Image.AlignRight
+        source: root.source
+        sourceSize: Qt.size(100, 100)
+        verticalAlignment: Image.AlignBottom
+    }
+}

quickgraphlib-0.1.0a17/tests/extra_examples/SVG_Logo.svg

@@ -0,0 +1,56 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100%" height="100%" viewBox="0 0 300 300">
+
+  <title>SVG Logo</title>
+  <desc>Designed for the SVG Logo Contest in 2006 by Harvey Rayner, and adopted by W3C in 2009. It is available under the Creative Commons license for those who have an SVG product or who are using SVG on their site.</desc>
+ 
+   <metadata id="license">
+     <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://web.resource.org/cc/">
+       <cc:Work rdf:about="">
+         <dc:title>SVG Logo</dc:title>
+         <dc:date>14-08-2009</dc:date>
+         <dc:creator>
+           <cc:Agent><dc:title>W3C</dc:title></cc:Agent>
+           <cc:Agent><dc:title>Harvey Rayner, designer</dc:title></cc:Agent>
+         </dc:creator>
+         <dc:description>See document description</dc:description>
+         <cc:license rdf:resource="http://creativecommons.org/licenses/by-nc-sa/2.5/"/>
+         <dc:format>image/svg+xml</dc:format>
+         <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+       </cc:Work>
+       <cc:License rdf:about="http://creativecommons.org/licenses/by-nc-sa/2.5/">
+         <cc:permits rdf:resource="http://web.resource.org/cc/Reproduction"/>
+         <cc:permits rdf:resource="http://web.resource.org/cc/Distribution"/>
+         <cc:requires rdf:resource="http://web.resource.org/cc/Notice"/>
+         <cc:requires rdf:resource="http://web.resource.org/cc/Attribution"/>
+         <cc:prohibits rdf:resource="http://web.resource.org/cc/CommercialUse"/>
+         <cc:permits rdf:resource="http://web.resource.org/cc/DerivativeWorks"/>
+         <cc:requires rdf:resource="http://web.resource.org/cc/ShareAlike"/>
+       </cc:License>
+     </rdf:RDF>
+   </metadata>
+   
+
+   <defs>
+     <g id="SVG" fill="#ffffff" transform="scale(2) translate(20,79)">
+        <path id="S" d="M 5.482,31.319 C2.163,28.001 0.109,23.419 0.109,18.358 C0.109,8.232 8.322,0.024 18.443,0.024 C28.569,0.024 36.782,8.232 36.782,18.358 L26.042,18.358 C26.042,14.164 22.638,10.765 18.443,10.765 C14.249,10.765 10.850,14.164 10.850,18.358 C10.850,20.453 11.701,22.351 13.070,23.721 L13.075,23.721 C14.450,25.101 15.595,25.500 18.443,25.952 L18.443,25.952 C23.509,26.479 28.091,28.006 31.409,31.324 L31.409,31.324 C34.728,34.643 36.782,39.225 36.782,44.286 C36.782,54.412 28.569,62.625 18.443,62.625 C8.322,62.625 0.109,54.412 0.109,44.286 L10.850,44.286 C10.850,48.480 14.249,51.884 18.443,51.884 C22.638,51.884 26.042,48.480 26.042,44.286 C26.042,42.191 25.191,40.298 23.821,38.923 L23.816,38.923 C22.441,37.548 20.468,37.074 18.443,36.697 L18.443,36.692 C13.533,35.939 8.800,34.638 5.482,31.319 L5.482,31.319 L5.482,31.319 Z"/>
+
+        <path id="V" d="M 73.452,0.024 L60.482,62.625 L49.742,62.625 L36.782,0.024 L47.522,0.024 L55.122,36.687 L62.712,0.024 L73.452,0.024 Z"/>
+
+        <path id="G" d="M 91.792,25.952 L110.126,25.952 L110.126,44.286 L110.131,44.286 C110.131,54.413 101.918,62.626 91.792,62.626 C81.665,62.626 73.458,54.413 73.458,44.286 L73.458,44.286 L73.458,18.359 L73.453,18.359 C73.453,8.233 81.665,0.025 91.792,0.025 C101.913,0.025 110.126,8.233 110.126,18.359 L99.385,18.359 C99.385,14.169 95.981,10.765 91.792,10.765 C87.597,10.765 84.198,14.169 84.198,18.359 L84.198,44.286 L84.198,44.286 C84.198,48.481 87.597,51.880 91.792,51.880 C95.981,51.880 99.380,48.481 99.385,44.291 L99.385,44.286 L99.385,36.698 L91.792,36.698 L91.792,25.952 L91.792,25.952 Z"/>
+      </g>
+   </defs>
+
+   <path id="base" fill="#000" d="M8.5,150 H291.5 V250 C291.5,273.5 273.5,291.5 250,291.5 H50 C26.5,291.5 8.5,273.5 8.5,250 Z"/>
+   <g stroke-width="38.0086" stroke="#000">
+     <g id="svgstar" transform="translate(150, 150)">
+       <path id="svgbar" fill="#ffb13b" d="M-84.1487,-15.8513 a22.4171,22.4171 0 1 0 0,31.7026 h168.2974 a22.4171,22.4171 0 1 0 0,-31.7026 Z"/>
+       <use xlink:href="#svgbar" transform="rotate(45)"/>
+       <use xlink:href="#svgbar" transform="rotate(90)"/>
+       <use xlink:href="#svgbar" transform="rotate(135)"/>
+     </g>
+   </g>
+   <use xlink:href="#svgstar"/>
+   <use xlink:href="#base" opacity="0.85"/>
+   <use xlink:href="#SVG"/>
+
+</svg>

quickgraphlib-0.1.0a17/tests/extra_examples/VectorImageExport.qml

@@ -0,0 +1,49 @@
+pragma ComponentBehavior: Bound
+// SPDX-FileCopyrightText: Copyright (c) 2024 Refeyn Ltd and other QuickGraphLib contributors
+// SPDX-License-Identifier: MIT
+// Tests for exporting Image items
+
+import QtQuick
+import QtQuick.Layouts as QQL
+import QtQuick.VectorImage as QQV
+
+Item {
+    QQL.GridLayout {
+        id: root
+
+        property url source: "SVG_Logo.svg"
+
+        anchors.fill: parent
+        anchors.margins: 100
+        columnSpacing: 10
+        columns: 2
+        rowSpacing: 10
+        uniformCellHeights: true
+        uniformCellWidths: true
+
+        QQV.VectorImage {
+            QQL.Layout.fillHeight: true
+            QQL.Layout.fillWidth: true
+            fillMode: QQV.VectorImage.NoResize
+            source: root.source
+        }
+        QQV.VectorImage {
+            QQL.Layout.fillHeight: true
+            QQL.Layout.fillWidth: true
+            fillMode: QQV.VectorImage.Stretch
+            source: root.source
+        }
+        QQV.VectorImage {
+            QQL.Layout.fillHeight: true
+            QQL.Layout.fillWidth: true
+            fillMode: QQV.VectorImage.PreserveAspectFit
+            source: root.source
+        }
+        QQV.VectorImage {
+            QQL.Layout.fillHeight: true
+            QQL.Layout.fillWidth: true
+            fillMode: QQV.VectorImage.PreserveAspectCrop
+            source: root.source
+        }
+    }
+}

{quickgraphlib-0.1.0a16 → quickgraphlib-0.1.0a17}/tests/reference_images/Contours.svg

@@ -125,7 +125,7 @@ font-family="DejaVuSans" font-size="14.6667" font-weight="400" font-style="norma
 <g clip-path="url(#clipPath1)"><g fill="#000000" fill-opacity="0" stroke="#008000" stroke-opacity="1" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" transform="matrix(1,0,0,1,64,15)"
 font-family="DejaVuSans" font-size="14.6667" font-weight="400" font-style="normal" 
 >
-<path vector-effect="none" fill-rule="evenodd" d="M0,203.25 L240.333,29.0357 L471.423,271 L480.667,325.2 L587.481,542 M480.667,0 L560.778,271 L721,348.429"/>
+<path vector-effect="none" fill-rule="evenodd" d="M587.481,542 L480.667,325.2 L471.423,271 L240.333,29.0357 L0,203.25 M480.667,0 L560.778,271 L721,348.429"/>
 </g>
 </g>