QuickGraphLib 0.1.0a2__tar.gz → 0.1.0a4__tar.gz

{quickgraphlib-0.1.0a2 → quickgraphlib-0.1.0a4}/CMakeLists.txt

@@ -9,6 +9,12 @@ project(qmlmodule VERSION 1.0.0 LANGUAGES CXX)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
+if(MSVC)
+    add_compile_options(/W4)
+else()
+    add_compile_options(-Wextra -Wpedantic -Werror -fno-visibility-inlines-hidden)
+endif()
+
 if(NOT INSTALL_SUBPATH)
     set(INSTALL_SUBPATH ${CMAKE_INSTALL_LIBDIR}/qml CACHE STRING "Install subpath (defaults to lib/qml)")
 endif()

{quickgraphlib-0.1.0a2/QuickGraphLib.egg-info → quickgraphlib-0.1.0a4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: QuickGraphLib
-Version: 0.1.0a2
+Version: 0.1.0a4
 Summary: A scientific graphing library for QtQuick
 Author-email: Matthew Joyce <matthew.joyce@refeyn.com>
 License: MIT License

{quickgraphlib-0.1.0a2 → quickgraphlib-0.1.0a4}/QuickGraphLib/Axis.qml

@@ -78,7 +78,8 @@ Item {
         case Axis.Direction.Bottom:
             let height = 0;
             if (ticks.length > 0) {
-                height += root.tickLength + Math.max(0, ...[...Array(tickLabels.count).keys()].map(i => tickLabels.itemAt(i)?.height));
+                // Can't use childrenRect due to the binding loop it causes
+                height += root.tickLength + Math.max(0, ...tickLabelsContainer.children.map(x => x.height));
             }
             if (label !== "") {
                 height += labelText.height + root.spacing;
@@ -92,7 +93,8 @@ Item {
         case Axis.Direction.Right:
             let width = 0;
             if (ticks.length > 0) {
-                width += root.tickLength + Math.max(0, ...[...Array(tickLabels.count).keys()].map(i => tickLabels.itemAt(i)?.width));
+                // Can't use childrenRect due to the binding loop it causes
+                width += root.tickLength + Math.max(0, ...tickLabelsContainer.children.map(x => x.width));
             }
             if (label !== "") {
                 width += labelText.height + root.spacing;
@@ -128,11 +130,13 @@ Item {
             }
         }
     }
-    Repeater {
-        id: tickLabels
+    Item {
+        id: tickLabelsContainer
 
-        delegate: root.tickDelegate
-        model: root.showTickLabels ? helper.tickModel : null
+        Repeater {
+            delegate: root.tickDelegate
+            model: root.showTickLabels ? helper.tickModel : null
+        }
     }
     Text {
         id: labelText

{quickgraphlib-0.1.0a2 → quickgraphlib-0.1.0a4}/QuickGraphLib/PreFabs/XYAxes.qml

@@ -49,6 +49,7 @@ QuickGraphLib.AntialiasingContainer {
         id: background
 
         anchors.fill: parent
+        border.width: 0
     }
     QQL.GridLayout {
         id: axes

{quickgraphlib-0.1.0a2 → quickgraphlib-0.1.0a4}/QuickGraphLib/ShapeRepeater.qml

@@ -17,6 +17,6 @@ QQM.Instantiator {
     onObjectAdded: (i, obj) => graphArea.data.push(obj)
     onObjectRemoved: (i, obj) => {
         // Remove everything into a JS array and then add back in all items except for `obj`
-        graphArea.data.splice(0, graphArea.data.length).filter(o => o !== obj).map(graphArea.data.push);
+        graphArea.data.splice(0, graphArea.data.length).filter(o => o !== obj).map(x => graphArea.data.push(x));
     }
 }

{quickgraphlib-0.1.0a2 → quickgraphlib-0.1.0a4}/QuickGraphLib/helpers/AxisHelper.cpp

@@ -7,6 +7,7 @@ enum Direction { Left, Right, Top, Bottom };
 
 AxisHelper::AxisHelper(QObject *parent) : QObject{parent} {
     _tickModel = new AxisTickModel(this);
+    connect(this, &AxisHelper::pathChanged, _tickModel, &AxisTickModel::_updateToNewTicks);
 
     pathProp.setBinding([&]() -> QPolygonF {
         auto direction = directionProp.value();
@@ -16,7 +17,8 @@ AxisHelper::AxisHelper(QObject *parent) : QObject{parent} {
         auto dataTransform = dataTransformProp.value();
         auto tickLength = tickLengthProp.value();
 
-        auto longAxis = direction == Top || direction == Bottom ? width : height;
+        auto isVertical = direction == Top || direction == Bottom;
+        auto longAxis = isVertical ? width : height;
 
         // Calculate everything as if we were a bottom axis
         auto points = QList{QPointF{0, 0}};
@@ -24,8 +26,7 @@ AxisHelper::AxisHelper(QObject *parent) : QObject{parent} {
         QList<int> tickPositions;
         tickPositions.reserve(ticks.size());
         for (auto tick : ticks) {
-            auto t = direction == Top || direction == Bottom ? dataTransform.map(QPointF{tick, 0}).x()
-                                                             : dataTransform.map(QPointF{0, tick}).y();
+            auto t = isVertical ? dataTransform.map(QPointF{tick, 0}).x() : dataTransform.map(QPointF{0, tick}).y();
             if (t >= -0.5 && t <= longAxis + 0.5) {
                 points.emplaceBack(t, 0);
                 points.emplaceBack(t, tickLength);
@@ -76,7 +77,7 @@ AxisHelper::AxisHelper(QObject *parent) : QObject{parent} {
             }
             ++tickIndex;
         }
-        _tickModel->_setTicks(std::move(tickDatas));
+        _tickModel->_setNewTicks(tickDatas);
 
         return points;
     });
@@ -109,14 +110,30 @@ QVariant AxisTickModel::data(const QModelIndex &index, int role) const {
 
 QHash<int, QByteArray> AxisTickModel::roleNames() const {
     return {
-        {Qt::DisplayRole, {"display"}},
-        {AxisTickModel::PositionRole, {"position"}},
-        {AxisTickModel::ValueRole, {"value"}}
+        {Qt::DisplayRole, "display"},
+        {AxisTickModel::PositionRole, "position"},
+        {AxisTickModel::ValueRole, "value"},
     };
 }
 
-void AxisTickModel::_setTicks(QList<AxisTickModel::TickData> &&ticks) {
-    beginResetModel();
-    _ticks = std::move(ticks);
-    endResetModel();
+void AxisTickModel::_setNewTicks(const QList<AxisTickModel::TickData> &ticks) { _newTicks = ticks; }
+
+void AxisTickModel::_updateToNewTicks() {
+    auto oldCount = _ticks.count();
+    if (oldCount < _newTicks.count()) {
+        beginInsertRows({}, oldCount, _newTicks.count() - 1);
+    }
+    else if (oldCount > _newTicks.count()) {
+        beginRemoveRows({}, _newTicks.count(), oldCount - 1);
+    }
+    _ticks = _newTicks;
+    if (oldCount < _newTicks.count()) {
+        endInsertRows();
+    }
+    else if (oldCount > _newTicks.count()) {
+        endRemoveRows();
+    }
+    if (_newTicks.count()) {
+        emit dataChanged(index(0), index(_newTicks.count() - 1));
+    }
 }

{quickgraphlib-0.1.0a2 → quickgraphlib-0.1.0a4}/QuickGraphLib/helpers/AxisHelper.hpp

@@ -19,9 +19,13 @@ class AxisTickModel : public QAbstractListModel {
         qreal value;
     };
     QList<TickData> _ticks;
-    void _setTicks(QList<TickData> &&ticks);
+    QList<TickData> _newTicks;
+    void _setNewTicks(const QList<TickData> &ticks);
     friend class AxisHelper;
 
+   private slots:
+    void _updateToNewTicks();
+
    public:
     enum Roles { PositionRole = Qt::UserRole, ValueRole };
 
@@ -49,7 +53,7 @@ class AxisHelper : public QObject {
     Q_PROPERTY(AxisTickModel *tickModel READ tickModel CONSTANT)
 
     QList<int> _cachedTickPositions;
-    AxisTickModel *_tickModel;
+    AxisTickModel *_tickModel = nullptr;
 
    public:
     explicit AxisHelper(QObject *parent = nullptr);

{quickgraphlib-0.1.0a2 → quickgraphlib-0.1.0a4}/QuickGraphLib/helpers/Helpers.cpp

@@ -23,6 +23,9 @@ QList<qreal> Helpers::linspace(qreal min, qreal max, int num) const {
         Returns a list of \a num values equally spaced from \a min and \a max (inclusive).
     */
     auto result = QList<qreal>();
+    if (num <= 0) {
+        return result;
+    }
     result.reserve(num);
     for (auto i = 0; i < num; ++i) {
         result.append(static_cast<qreal>(i) / (num - 1) * (max - min) + min);
@@ -37,7 +40,14 @@ QList<int> Helpers::range(int min, int max, int step /* = 1 */) const {
         Returns a list of values from \a min to \a max (exclusive) with a gap of \a step between each one.
     */
     auto result = QList<int>();
-    result.reserve((max - min) / step);
+    if (step == 0) {
+        return result;
+    }
+    auto num = (max - min) / step;
+    if (num <= 0) {
+        return result;
+    }
+    result.reserve(num);
     for (auto i = min; i < max; i += step) {
         result.append(i);
     }
@@ -50,7 +60,7 @@ QList<qreal> Helpers::tickLocator(qreal min, qreal max, int maxNum) const {
 
         Returns a list of at most \a maxNum nice tick locations values equally spaced between \a min and \a max.
     */
-    if (min == max || !std::isfinite(min) || !std::isfinite(max) || maxNum == 0) {
+    if (min == max || !std::isfinite(min) || !std::isfinite(max) || maxNum <= 0) {
         return {};
     }
     if (max < min) {
@@ -104,37 +114,22 @@ QPolygonF Helpers::mapPoints(QVariant points, QMatrix4x4 dataTransform) const {
     }
 }
 
-void exportPathElementToPainter(QObject* element, QPainter* painter) {
+void exportPathElementToPainterPath(QObject* element, QPainterPath& path) {
     if (element->inherits("QQuickPathPolyline")) {
-        auto brush = painter->brush();
-        auto pen = painter->pen();
-        auto path = element->property("path").value<QList<QPointF>>();
-        painter->setPen(Qt::PenStyle::NoPen);
-        painter->drawPolygon(path);
-        painter->setPen(pen);
-        painter->setBrush(Qt::BrushStyle::NoBrush);
-        painter->drawPolyline(path);
-        painter->setBrush(brush);
+        path.addPolygon(element->property("path").value<QList<QPointF>>());
     }
     else if (element->inherits("QQuickPathMultiline")) {
-        auto brush = painter->brush();
-        auto pen = painter->pen();
         auto paths = element->property("paths").value<QList<QList<QPointF>>>();
 
-        QPainterPath fill_path;
-        for (auto& path : paths) {
-            fill_path.addPolygon(QPolygonF(path));
-            fill_path.closeSubpath();
+        for (auto& p : paths) {
+            path.addPolygon(p);
         }
-
-        painter->setPen(Qt::PenStyle::NoPen);
-        painter->drawPath(fill_path);
-        painter->setPen(pen);
-        painter->setBrush(Qt::BrushStyle::NoBrush);
-        for (auto& path : paths) {
-            painter->drawPolyline(path);
-        }
-        painter->setBrush(brush);
+    }
+    else if (element->inherits("QQuickPathLine")) {
+        path.lineTo(element->property("x").toDouble(), element->property("y").toDouble());
+    }
+    else if (element->inherits("QQuickPathMove")) {
+        path.moveTo(element->property("x").toDouble(), element->property("y").toDouble());
     }
 }
 
@@ -172,15 +167,29 @@ void exportShapePathToPainter(QObject* shapePath, QPainter* painter) {
     painter->save();
     auto pen = QPen(shapePath->property("strokeColor").value<QColor>());
     pen.setWidth(shapePath->property("strokeWidth").toDouble());
+    auto strokeStyle = static_cast<Qt::PenStyle>(shapePath->property("strokeStyle").toInt());
+    pen.setStyle(strokeStyle);
+    if (strokeStyle == Qt::PenStyle::DashLine) {
+        pen.setDashOffset(shapePath->property("dashOffset").toDouble());
+        pen.setDashPattern(shapePath->property("dashPattern").value<QList<qreal>>());
+    }
+    pen.setCapStyle(static_cast<Qt::PenCapStyle>(shapePath->property("capStyle").toInt()));
+    pen.setJoinStyle(static_cast<Qt::PenJoinStyle>(shapePath->property("joinStyle").toInt()));
+    pen.setMiterLimit(shapePath->property("miterLimit").toDouble());
     painter->setPen(pen);
+
     auto brush = brushFromColorAndGradient(shapePath->property("fillGradient"), shapePath->property("fillColor"), {});
     painter->setBrush(brush);
 
+    QPainterPath path({shapePath->property("startX").toDouble(), shapePath->property("startY").toDouble()});
+    path.setFillRule(static_cast<Qt::FillRule>(shapePath->property("fillRule").toInt()));
+
     auto elements = QQmlListReference(shapePath, "pathElements");
     for (auto elIndex = 0; elIndex < elements.count(); ++elIndex) {
         auto element = elements.at(elIndex);
-        exportPathElementToPainter(element, painter);
+        exportPathElementToPainterPath(element, path);
     }
+    painter->drawPath(path);
     painter->restore();
 }
 
@@ -301,11 +310,13 @@ bool Helpers::exportToSvg(QQuickItem* item, QUrl path) const {
             PathPolyline). Other elements will be rendered incorrectly or not at all. If an element is not rendered
             correctly, create a new issue and we'll see if it can be added.
 
-        \sa Helpers::exportToPng
+        \sa Helpers::exportToPng, Helpers::exportToPicture
     */
 
     QSvgGenerator device;
     device.setFileName(path.toLocalFile());
+    device.setViewBox(QRectF(0, 0, item->width(), item->height()));
+    device.setResolution(96);
     exportToPaintDevice(item, &device);
     return true;  // TODO How do we detect IO errors?
 }
@@ -321,7 +332,7 @@ bool Helpers::exportToPng(QQuickItem* item, QUrl path, int dpi /* = 96 * 2 */) c
             PathPolyline). Other elements will be rendered incorrectly or not at all. If an element is not rendered
             correctly, create a new issue and we'll see if it can be added.
 
-        \sa Helpers::exportToSvg
+        \sa Helpers::exportToSvg, Helpers::exportToPicture
     */
 
     auto device = QPixmap(std::ceil(item->width() * dpi / 96), std::ceil(item->height() * dpi / 96));
@@ -330,3 +341,21 @@ bool Helpers::exportToPng(QQuickItem* item, QUrl path, int dpi /* = 96 * 2 */) c
     exportToPaintDevice(item, &device);
     return device.save(path.toLocalFile());
 }
+
+QPicture Helpers::exportToPicture(QQuickItem* item) const {
+    /*!
+        \qmlmethod QPicture Helpers::exportToPicture(Item obj)
+
+         Exports the graph in \a obj to a QPicture.
+
+          \note Only some QML elements are supported by this export method (e.g. \l {QtQuick::Rectangle} {Rectangle},
+              PathPolyline). Other elements will be rendered incorrectly or not at all. If an element is not rendered
+              correctly, create a new issue and we'll see if it can be added.
+
+         \sa Helpers::exportToPng, Helpers::exportToSvg
+     */
+
+    QPicture device;
+    exportToPaintDevice(item, &device);
+    return device;
+}

{quickgraphlib-0.1.0a2 → quickgraphlib-0.1.0a4}/QuickGraphLib/helpers/Helpers.hpp

@@ -4,6 +4,7 @@
 #pragma once
 
 #include <QObject>
+#include <QPicture>
 #include <QQmlEngine>
 #include <QQuickItem>
 
@@ -18,4 +19,5 @@ class Helpers : public QObject {
     Q_INVOKABLE QPolygonF mapPoints(QVariant points, QMatrix4x4 dataTransform) const;
     Q_INVOKABLE bool exportToSvg(QQuickItem* item, QUrl path) const;
     Q_INVOKABLE bool exportToPng(QQuickItem* item, QUrl path, int dpi = 96 * 2) const;
+    Q_INVOKABLE QPicture exportToPicture(QQuickItem* item) const;
 };

{quickgraphlib-0.1.0a2 → quickgraphlib-0.1.0a4/QuickGraphLib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: QuickGraphLib
-Version: 0.1.0a2
+Version: 0.1.0a4
 Summary: A scientific graphing library for QtQuick
 Author-email: Matthew Joyce <matthew.joyce@refeyn.com>
 License: MIT License

{quickgraphlib-0.1.0a2 → quickgraphlib-0.1.0a4}/QuickGraphLib.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ LICENCE
 MANIFEST.in
 README.md
 pyproject.toml
+setup.cfg
 setup.py
 ./CMakeLists.txt
 ./QuickGraphLib/CMakeLists.txt

{quickgraphlib-0.1.0a2 → quickgraphlib-0.1.0a4}/examples/SpansAndLines.qml

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 import QtQuick
+import QtQuick.Shapes as QQS
 import QuickGraphLib.GraphItems as QGLGraphItems
 import QuickGraphLib.PreFabs as QGLPreFabs
 
@@ -27,9 +28,12 @@ QGLPreFabs.XYAxes {
         xMin: 1
     }
     QGLGraphItems.AxVLine {
+        dashOffset: 10
+        dashPattern: [10, 5]
         dataTransform: axes.dataTransform
         position: 0.5
         strokeColor: "blue"
+        strokeStyle: QQS.ShapePath.DashLine
         strokeWidth: 5
         viewRect: axes.viewRect
     }

{quickgraphlib-0.1.0a2 → quickgraphlib-0.1.0a4}/pyproject.toml

@@ -48,6 +48,33 @@ enabled = true
 [tool.setuptools.packages.find]
 include = ["quickgraphlib_helpers*"]
 
+[tool.cibuildwheel]
+build = [
+    "cp37-macosx_x86_64",
+    "cp37-win_amd64",
+    "cp37-manylinux_x86_64",
+    # "cp37-manylinux_aarch64",
+]
+before-all = "python ci/setup_qt.py"
+repair-wheel-command = ""
+build-frontend = "build"
+# test-command = "pytest {project}/tests"
+# test-extras = ["tests"]
+
+[tool.cibuildwheel.environment]
+CMAKE_BUILD_FLAGS = "-DCMAKE_PREFIX_PATH=\"$(python ci/find_qt.py)/lib/cmake\""
+
+[tool.cibuildwheel.macos]
+archs = ["universal2"]
+
+[tool.cibuildwheel.linux]
+archs = ["x86_64"]                         # , "aarch64"]
+manylinux-x86_64-image = "manylinux_2_28"
+manylinux-aarch64-image = "manylinux_2_28"
+
+[tool.cibuildwheel.windows]
+archs = ["AMD64"]
+
 [tool.isort]
 profile = "black"
 force_alphabetical_sort_within_sections = true

quickgraphlib-0.1.0a4/setup.cfg

@@ -0,0 +1,7 @@
+[bdist_wheel]
+py_limited_api = cp37
+
+[egg_info]
+tag_build = 
+tag_date = 0
+

quickgraphlib-0.1.0a2/setup.cfg

@@ -1,4 +0,0 @@
-[egg_info]
-tag_build = 
-tag_date = 0
-