QuickGraphLib 0.1.0a8__tar.gz → 0.1.0a10__tar.gz

{quickgraphlib-0.1.0a8 → quickgraphlib-0.1.0a10}/CMakeLists.txt

@@ -15,6 +15,8 @@ else()
     add_compile_options(-Wextra -Wpedantic -fno-visibility-inlines-hidden)
 endif()
 
+option(ENABLE_STUB_GENERATION "Enable .pyi stub generation (defaults to on)" ON)
+
 if(NOT INSTALL_SUBPATH)
     set(INSTALL_SUBPATH
         ${CMAKE_INSTALL_LIBDIR}/qml
@@ -24,6 +26,6 @@ if(NOT INSTALL_SUBPATH)
 endif()
 
 find_package(Qt6 REQUIRED COMPONENTS Quick Svg)
-qt_standard_project_setup(REQUIRES 6.5)
+qt_standard_project_setup(REQUIRES 6.8)
 
 add_subdirectory(QuickGraphLib)

{quickgraphlib-0.1.0a8 → quickgraphlib-0.1.0a10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: QuickGraphLib
-Version: 0.1.0a8
+Version: 0.1.0a10
 Summary: A scientific graphing library for QtQuick
 Author-Email: Matthew Joyce <matthew.joyce@refeyn.com>
 License: MIT License
@@ -38,8 +38,9 @@ Project-URL: Homepage, https://github.com/refeyn/QuickGraphLib
 Project-URL: Issues, https://github.com/refeyn/QuickGraphLib/issues
 Project-URL: Documentation, https://refeyn.github.io/QuickGraphLib
 Project-URL: Source, https://github.com/refeyn/QuickGraphLib
-Requires-Dist: PySide6
+Requires-Dist: PySide6==6.8.0.2
 Requires-Dist: contourpy
+Requires-Dist: numpy<2
 Requires-Dist: black; extra == "analyse"
 Requires-Dist: pylint; extra == "analyse"
 Requires-Dist: mypy; extra == "analyse"
@@ -48,8 +49,7 @@ Requires-Dist: lxml; extra == "analyse"
 Requires-Dist: pytest; extra == "analyse"
 Requires-Dist: pytest-cov; extra == "analyse"
 Requires-Dist: scikit-build-core; extra == "analyse"
-Requires-Dist: shiboken6_generator==6.5.3; extra == "analyse"
-Requires-Dist: PySide6==6.5.3; extra == "analyse"
+Requires-Dist: shiboken6_generator==6.8.0.2; extra == "analyse"
 Requires-Dist: setuptools_scm; extra == "analyse"
 Provides-Extra: analyse
 Description-Content-Type: text/markdown
@@ -61,6 +61,7 @@ A scientific graphing library for [QtQuick](https://doc.qt.io/qt-6/qtquick-index
 Links:
  - [Online documentation](https://refeyn.github.io/QuickGraphLib)
  - [PyPI page](https://pypi.org/project/QuickGraphLib/)
+ - [Pre-built artefacts](https://github.com/refeyn/QuickGraphLib/releases/latest)
 
 Key advantages:
 
@@ -75,7 +76,17 @@ Key advantages:
 The example gallery can be run using (provided the Python environment has [PySide6](https://pypi.org/project/PySide6/) and [contourpy](https://pypi.org/project/contourpy/) installed):
 
 ```bash
-python examples\gallery.py
+python examples/gallery.py
 ```
 
-<p align="center"><img src="https://github.com/refeyn/QuickGraphLib/assets/103422031/56fdff62-ef77-4184-9f43-59a76b92d728" width="80%"></p>
+<p align="center"><img src="https://github.com/user-attachments/assets/19fa3b50-9a86-458d-b7c2-7a6fc95f0b6c" width="80%"></p>
+
+## Qt version compatibility
+
+This version of QuickGraphLib is compatible with Qt and PySide6 6.8.0. If you use this module from C++, then Qt's ABI stability guarantees means the compiled binaries will work for any Qt version >= 6.8 and < 7.0. If you use this module from Python, there are some additional features that rely on the PySide6 library version. Therefore the PySide6 version must be 6.8.0.2 exactly. Other 6.8 versions of PySide6 may work, but there are no guarantees.
+
+The pre-built wheels aim to be compatible with the most recent recent Qt LTS version, which is currently 6.8. Pre-built wheels for higher non-LTS Qt versions will likely be available once Qt 6.9 is released.
+
+## Python version compatibility
+
+QuickGraphLib is compatible with the same Python versions and glibc versions that PySide6 is. For PySide6 6.8, the minimum Python version is 3.9.

{quickgraphlib-0.1.0a8 → quickgraphlib-0.1.0a10}/QuickGraphLib/AntialiasingContainer.qml

@@ -3,6 +3,10 @@
 
 import QtQuick
 
+@Deprecated {
+    reason: "Due to the new Qt 6.7 Curve renderer, this is no longer needed for antialiasing"
+}
+
 /*!
     \qmltype AntialiasingContainer
     \inqmlmodule QuickGraphLib
@@ -10,6 +14,9 @@ import QtQuick
     \brief Enables antialiasing for it's contents.
 
     This item turns on \l {Multisample Antialiasing}. This helps with rendering in some cases.
+
+    \deprecated [0.1.0a10] Due to the new Qt 6.7 Curve renderer, this is no longer needed for antialiasing.
+        Replace with \l Item or remove completely
 */
 
 Item {
@@ -17,7 +24,7 @@ Item {
 
     /*!
         Whether MSAA antialiasing is enabled. This can help with rendering when the target display has a
-        fractional scaling factor. It can also make rendering worse, especially with text.
+        fractional scaling factor. It can also make rendering worse, especially with text. Defaults to \c false.
     */
     property alias antialiasingEnabled: root.layer.enabled
 

{quickgraphlib-0.1.0a8 → quickgraphlib-0.1.0a10}/QuickGraphLib/Axis.qml

@@ -11,6 +11,17 @@ import QuickGraphLib as QuickGraphLib
     \inqmlmodule QuickGraphLib
     \inherits QtQuick::Item
     \brief Displays an Axis.
+
+    \sa {Basic sin graph (without prefabs)}, {Graph with all four axes}
+
+    \section2 Antialiasing
+
+    By default, the axis sets \l {Shape::preferredRendererType} to \c {Shape.CurveRenderer}.
+    This turns on high-quality antialiasing, which results in better looking axes on HiDPI systems.
+    However, if you know your application will only be viewed on LoDPI systems, the axes will look
+    slightly better without antialiasing. In addition, antialiasing may require more GPU performance,
+    so switching this back to \c {Shape.GeometryRenderer} may help on low-power systems. See
+    \l {Shape::rendererType} for more details.
 */
 
 Item {
@@ -156,10 +167,12 @@ Item {
         id: shape
 
         anchors.fill: parent
+        preferredRendererType: QQS.Shape.CurveRenderer
 
         QQS.ShapePath {
             id: myPath
 
+            pathHints: QQS.ShapePath.PathLinear
             strokeColor: "black"
             strokeWidth: 1
 

{quickgraphlib-0.1.0a8 → quickgraphlib-0.1.0a10}/QuickGraphLib/CMakeLists.txt

@@ -24,7 +24,9 @@ qt_add_qml_module(QuickGraphLib
     DEPENDENCIES QtQuick
     SOURCES
         helpers/Helpers.cpp helpers/Helpers.hpp helpers/AxisHelper.hpp helpers/AxisHelper.cpp helpers/Foreign.hpp
+        helpers/ShapeRepeaterHelper.hpp helpers/ShapeRepeaterHelper.cpp
         ImageView.hpp ImageView.cpp ColorMaps.hpp ColorMaps.cpp DataTypes.hpp DataTypes.cpp bindings/Bindings.hpp QuickGraphLib.hpp
+        Global.hpp
 )
 set_property(
     TARGET QuickGraphLib
@@ -34,6 +36,7 @@ set_property(
     TARGET QuickGraphLib
     PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 )
+target_compile_definitions(QuickGraphLib PRIVATE QGL_LIBRARY)
 
 target_compile_definitions(
     QuickGraphLib

{quickgraphlib-0.1.0a8 → quickgraphlib-0.1.0a10}/QuickGraphLib/ColorMaps.cpp

@@ -11,6 +11,8 @@
     \inqmlmodule QuickGraphLib
     \inherits QObject
     \brief Utility functions for color maps.
+
+    \sa {ImageView}, {Builtin color maps}, {Color mapped images}
 */
 
 extern const std::map<ColorMaps::ColorMapName, QList<QRgb>> DEFAULT_COLORMAPS;

{quickgraphlib-0.1.0a8 → quickgraphlib-0.1.0a10}/QuickGraphLib/DataTypes.hpp

@@ -6,7 +6,9 @@
 #include <QList>
 #include <QPolygonF>
 
-class QGLPolygonF : public QPolygonF {
+#include "Global.hpp"
+
+class QGL_EXPORT QGLPolygonF : public QPolygonF {
    public:
     using QPolygonF::QPolygonF;
     QGLPolygonF() = default;
@@ -15,19 +17,19 @@ class QGLPolygonF : public QPolygonF {
     QGLPolygonF(QList<QPointF> &&v) noexcept : QPolygonF(std::move(v)) {}
     QGLPolygonF(QPolygonF &&v) noexcept : QPolygonF(std::move(v)) {}
     inline void swap(QGLPolygonF &other) { QPolygonF::swap(other); }
-    Q_DECL_EXPORT operator QVariant() const;
+    operator QVariant() const;
 };
 Q_DECLARE_SHARED(QGLPolygonF)
 
-class QGLDoubleList : public QList<qreal> {
+class QGL_EXPORT QGLDoubleList : public QList<qreal> {
    public:
     using QList<qreal>::QList;
     QGLDoubleList() = default;
     QGLDoubleList(const QList<qreal> &v) : QList<qreal>(v) {}
     QGLDoubleList(QList<qreal> &&v) noexcept : QList<qreal>(std::move(v)) {}
     inline void swap(QGLDoubleList &other) { QList<qreal>::swap(other); }
-    Q_DECL_EXPORT operator QVariant() const;
+    operator QVariant() const;
 };
 Q_DECLARE_SHARED(QGLDoubleList)
 
-Q_DECL_EXPORT void registerConvertions();
+QGL_EXPORT void registerConvertions();

quickgraphlib-0.1.0a10/QuickGraphLib/Global.hpp

@@ -0,0 +1,12 @@
+// SPDX-FileCopyrightText: Copyright (c) 2024 Refeyn Ltd and other QuickGraphLib contributors
+// SPDX-License-Identifier: MIT
+
+#pragma once
+
+#include <QtGlobal>
+
+#if defined(QGL_LIBRARY)
+#define QGL_EXPORT Q_DECL_EXPORT
+#else
+#define QGL_EXPORT Q_DECL_IMPORT
+#endif

{quickgraphlib-0.1.0a8 → quickgraphlib-0.1.0a10}/QuickGraphLib/GraphArea.qml

@@ -9,6 +9,15 @@ import QtQuick.Shapes as QQS
     \inqmlmodule QuickGraphLib
     \inherits QtQuick::Shapes::Shape
     \brief An area that graphs can be added to.
+
+    \sa {Basic sin graph (without prefabs)}, {Inverted axes}
+
+    \section2 Antialiasing
+
+    By default, the graph area sets \l {Shape::preferredRendererType} to \c {Shape.CurveRenderer}.
+    This turns on high-quality antialiasing, which generally results in much better looking graphs.
+    However, it may require more GPU performance, so switching this back to \c {Shape.GeometryRenderer}
+    may help on low-power systems. See \l {Shape::rendererType} for more details.
 */
 
 QQS.Shape {
@@ -77,6 +86,8 @@ QQS.Shape {
     }
 
     clip: true
-    implicitHeight: 100
-    implicitWidth: 100
+    // Set initial size to prevent Shape's automatically calculated implicitWidth resulting in binding loops
+    height: 100
+    preferredRendererType: QQS.Shape.CurveRenderer
+    width: 100
 }

{quickgraphlib-0.1.0a8 → quickgraphlib-0.1.0a10}/QuickGraphLib/GraphItems/AxHLine.qml

@@ -9,6 +9,8 @@ import QtQuick.Shapes as QQS
     \inqmlmodule QuickGraphLib.GraphItems
     \inherits QtQuick::Shapes::ShapePath
     \brief Displays a horizontal line.
+
+    \sa {Spans and lines}
 */
 
 QQS.ShapePath {
@@ -34,6 +36,7 @@ QQS.ShapePath {
     */
     required property rect viewRect
 
+    pathHints: QQS.ShapePath.PathLinear | QQS.ShapePath.PathConvex | QQS.ShapePath.PathSolid
     startX: topLeftPoint.x
     startY: topLeftPoint.y
 

{quickgraphlib-0.1.0a8 → quickgraphlib-0.1.0a10}/QuickGraphLib/GraphItems/AxHSpan.qml

@@ -9,6 +9,8 @@ import QtQuick.Shapes as QQS
     \inqmlmodule QuickGraphLib.GraphItems
     \inherits QtQuick::Shapes::ShapePath
     \brief Displays a horizontal span.
+
+    \sa {Spans and lines}
 */
 
 QQS.ShapePath {
@@ -38,6 +40,7 @@ QQS.ShapePath {
     */
     required property double yMin
 
+    pathHints: QQS.ShapePath.PathLinear | QQS.ShapePath.PathConvex | QQS.ShapePath.PathSolid
     startX: topLeftPoint.x
     startY: topLeftPoint.y
     strokeColor: "transparent"

{quickgraphlib-0.1.0a8 → quickgraphlib-0.1.0a10}/QuickGraphLib/GraphItems/AxVLine.qml

@@ -9,6 +9,8 @@ import QtQuick.Shapes as QQS
     \inqmlmodule QuickGraphLib.GraphItems
     \inherits QtQuick::Rectangle
     \brief Displays an vertical line.
+
+    \sa {Spans and lines}, {Draggable region}
 */
 
 QQS.ShapePath {
@@ -34,6 +36,7 @@ QQS.ShapePath {
     */
     required property rect viewRect
 
+    pathHints: QQS.ShapePath.PathLinear | QQS.ShapePath.PathConvex | QQS.ShapePath.PathSolid
     startX: topLeftPoint.x
     startY: topLeftPoint.y
 

{quickgraphlib-0.1.0a8 → quickgraphlib-0.1.0a10}/QuickGraphLib/GraphItems/AxVSpan.qml

@@ -9,6 +9,8 @@ import QtQuick.Shapes as QQS
     \inqmlmodule QuickGraphLib.GraphItems
     \inherits QtQuick::Shapes::ShapePath
     \brief Displays an vertical span.
+
+    \sa {Spans and lines}, {Basic histogram}, {Draggable region}
 */
 
 QQS.ShapePath {
@@ -38,6 +40,7 @@ QQS.ShapePath {
     */
     required property double xMin
 
+    pathHints: QQS.ShapePath.PathLinear | QQS.ShapePath.PathConvex | QQS.ShapePath.PathSolid
     startX: topLeftPoint.x
     startY: topLeftPoint.y
     strokeColor: "transparent"

{quickgraphlib-0.1.0a8 → quickgraphlib-0.1.0a10}/QuickGraphLib/GraphItems/BasicLegend.qml

@@ -10,6 +10,8 @@ import QtQuick
     \brief Displays a simple legend.
 
     \note This graph item does not inherit from ShapePath, unlike other graph items.
+
+    \sa {Basic sin graph}
 */
 
 Rectangle {

{quickgraphlib-0.1.0a8 → quickgraphlib-0.1.0a10}/QuickGraphLib/GraphItems/BasicLegendItem.qml

@@ -8,6 +8,8 @@ import QtQuick
     \inqmlmodule QuickGraphLib.GraphItems
     \inherits QtQuick::Row
     \brief An single entry in a simple legend.
+
+    \sa {Basic sin graph}
 */
 
 Row {

{quickgraphlib-0.1.0a8 → quickgraphlib-0.1.0a10}/QuickGraphLib/GraphItems/ColorMesh.qml

@@ -11,6 +11,8 @@ import QuickGraphLib as QuickGraphLib
     \brief Display a colorized image from a 2D array.
 
     \note This graph item does not inherit from ShapePath, unlike other graph items.
+
+    \sa {Color mesh}, {Color mapped images}
 */
 
 QuickGraphLib.ImageView {

{quickgraphlib-0.1.0a8 → quickgraphlib-0.1.0a10}/QuickGraphLib/GraphItems/Contour.qml

@@ -10,6 +10,8 @@ import QuickGraphLib as QuickGraphLib
     \inqmlmodule QuickGraphLib.GraphItems
     \inherits QtQuick::Shapes::ShapePath
     \brief Draw a contour line or fill.
+
+    \sa {Contours}
 */
 
 QQS.ShapePath {
@@ -32,6 +34,7 @@ QQS.ShapePath {
     capStyle: QQS.ShapePath.RoundCap
     fillColor: "transparent"
     joinStyle: QQS.ShapePath.RoundJoin
+    pathHints: QQS.ShapePath.PathLinear
 
     PathMultiline {
         paths: root.paths.map(ps => QuickGraphLib.Helpers.mapPoints(ps, root.dataTransform))

{quickgraphlib-0.1.0a8 → quickgraphlib-0.1.0a10}/QuickGraphLib/GraphItems/GraphItemDragHandler.qml

@@ -8,6 +8,8 @@ import QtQuick
     \inqmlmodule QuickGraphLib.GraphItems
     \inherits QtQuick::MouseArea
     \brief Assists converting mouse drags into data positions.
+
+    \sa {Draggable region}
 */
 
 MouseArea {

{quickgraphlib-0.1.0a8 → quickgraphlib-0.1.0a10}/QuickGraphLib/GraphItems/Grid.qml

@@ -10,6 +10,8 @@ import QuickGraphLib.GraphItems as QGLGraphItems
     \inqmlmodule QuickGraphLib.GraphItems
     \inherits QtQuick::Shapes::ShapePath
     \brief Displays a grid in the background of a graph.
+
+    \sa {Basic sin graph (without prefabs)}
 */
 
 QQS.ShapePath {
@@ -48,6 +50,7 @@ QQS.ShapePath {
     capStyle: QQS.ShapePath.RoundCap
     fillColor: "transparent"
     joinStyle: QQS.ShapePath.RoundJoin
+    pathHints: QQS.ShapePath.PathLinear
 
     PathMultiline {
         paths: helper.paths

{quickgraphlib-0.1.0a8 → quickgraphlib-0.1.0a10}/QuickGraphLib/GraphItems/Histogram.qml

@@ -10,6 +10,13 @@ import QuickGraphLib.GraphItems as QGLGraphItems
     \inqmlmodule QuickGraphLib.GraphItems
     \inherits QtQuick::Shapes::ShapePath
     \brief Displays a histogram.
+
+    \warning Rendering of histograms in Qt 6.8 under the curve renderer may include artefacts
+    (see \l {https://bugreports.qt.io/browse/QTBUG-133247}{QTBUG-133247}). If this happens,
+    switch the renderer of the \l GraphArea back to the geometry renderer. This issue should be fixed
+    in a future Qt version.
+
+    \sa {Basic histogram}
 */
 
 QQS.ShapePath {
@@ -44,6 +51,7 @@ QQS.ShapePath {
 
     capStyle: QQS.ShapePath.RoundCap
     joinStyle: QQS.ShapePath.RoundJoin
+    pathHints: QQS.ShapePath.PathLinear
 
     PathPolyline {
         path: root._helper.path

{quickgraphlib-0.1.0a8 → quickgraphlib-0.1.0a10}/QuickGraphLib/GraphItems/Line.qml

@@ -13,19 +13,7 @@ import QuickGraphLib as QuickGraphLib
 
     Graph a line using a list of X,Y points. The style of the line can be adjusted using the \l {ShapePath::strokeColor} {strokeColor} and \l {ShapePath::strokeWidth} {strokeWidth} properties.
 
-    \qml
-        GraphArea {
-            id: grapharea
-            viewRect: Qt.rect(-20, -1.1, 760, 2.2)
-
-            Line {
-                dataTransform: grapharea.dataTransform
-                path: Helpers.linspace(0, 720, 100).map(x => Qt.point(x, Math.sin(x / 180 * Math.PI)))
-                strokeColor: "red"
-                strokeWidth: 2
-            }
-        }
-    \endqml
+    \sa {Basic sin graph}
 */
 
 QQS.ShapePath {
@@ -47,6 +35,7 @@ QQS.ShapePath {
     capStyle: QQS.ShapePath.RoundCap
     fillColor: "transparent"
     joinStyle: QQS.ShapePath.RoundJoin
+    pathHints: QQS.ShapePath.PathLinear
 
     PathPolyline {
         path: QuickGraphLib.Helpers.mapPoints(root.path, root.dataTransform)

{quickgraphlib-0.1.0a8 → quickgraphlib-0.1.0a10}/QuickGraphLib/GraphItems/Marker.qml

@@ -10,6 +10,8 @@ import QtQuick
     \brief Displays a circular marker.
 
     \note This graph item does not inherit from ShapePath, unlike other graph items. This is for performance reasons.
+
+    \sa {Scatter graph}
 */
 
 Rectangle {

{quickgraphlib-0.1.0a8 → quickgraphlib-0.1.0a10}/QuickGraphLib/ImageView.cpp

@@ -13,6 +13,8 @@
     \inqmlmodule QuickGraphLib
     \inherits QtQuick::Item
     \brief Display a colorized image from a 2D array.
+
+    \sa {Builtin color maps}, {Color mapped images}, {Image alignment}
 */
 
 /*!

{quickgraphlib-0.1.0a8 → quickgraphlib-0.1.0a10}/QuickGraphLib/PreFabs/ImageAxes.qml

@@ -9,11 +9,13 @@ import QuickGraphLib.GraphItems as QGLGraphItems
 /*!
     \qmltype ImageAxes
     \inqmlmodule QuickGraphLib.PreFabs
-    \inherits QuickGraphLib::AntialiasingContainer
+    \inherits Item
     \brief Displays an image with axes and a colorbar.
+
+    \sa {Color mesh}
 */
 
-QuickGraphLib.AntialiasingContainer {
+Item {
     id: root
 
     /*!
@@ -149,9 +151,9 @@ QuickGraphLib.AntialiasingContainer {
                         property var colors: QuickGraphLib.ColorMaps.colors(root.colorMesh.colormap)
 
                         stops: colors.map((color, i) => gradStop.createObject(grad, {
-                                        "color": color,
-                                        "position": i / (colors.length - 1)
-                                    }))
+                                "color": color,
+                                "position": i / (colors.length - 1)
+                            }))
                     }
                 }
                 QuickGraphLib.Axis {

{quickgraphlib-0.1.0a8 → quickgraphlib-0.1.0a10}/QuickGraphLib/PreFabs/XYAxes.qml

@@ -7,13 +7,15 @@ import QuickGraphLib as QuickGraphLib
 import QuickGraphLib.GraphItems as QGLGraphItems
 
 /*!
-    \qmltype Line
+    \qmltype XYAxes
     \inqmlmodule QuickGraphLib.PreFabs
-    \inherits QuickGraphLib::AntialiasingContainer
+    \inherits Item
     \brief Displays an XY axis with a grid.
+
+    \sa {Basic sin graph}, {Dark theme sin graph}, {Subgraphs}
 */
 
-QuickGraphLib.AntialiasingContainer {
+Item {
     id: root
 
     /*!
@@ -24,6 +26,10 @@ QuickGraphLib.AntialiasingContainer {
         An alias to the \l Rectangle used as the background.
     */
     property alias background: background
+    /*!
+        The padding below the XYAxes
+    */
+    property int bottomPadding: 15
     /*!
         An alias to the data transform of the graph area.
 
@@ -43,6 +49,10 @@ QuickGraphLib.AntialiasingContainer {
         An alias to the graph area's \l Grid.
     */
     property alias grid: grid
+    /*!
+        The padding to the left of the XYAxes
+    */
+    property int leftPadding: 15
     /*!
         Maximum number of ticks to show on the X axis.
 
@@ -55,6 +65,14 @@ QuickGraphLib.AntialiasingContainer {
         \sa Helpers::tickLocator
     */
     property int numYTicks: 11
+    /*!
+        The padding to the right of the XYAxes
+    */
+    property int rightPadding: 15
+    /*!
+        The spacing between the title and the axes.
+    */
+    property double spacing: 0
     /*!
         The title of the graph.
     */
@@ -63,6 +81,10 @@ QuickGraphLib.AntialiasingContainer {
         An alias to the title item of the graph (a \l Text).
     */
     property alias titleItem: titleLabel
+    /*!
+        The padding above the XYAxes
+    */
+    property int topPadding: 15
     /*!
         An alias to the view rect of the graph area.
 
@@ -99,8 +121,11 @@ QuickGraphLib.AntialiasingContainer {
     QQL.GridLayout {
         id: axes
 
+        anchors.bottomMargin: root.bottomPadding
         anchors.fill: parent
-        anchors.margins: 15
+        anchors.leftMargin: root.leftPadding
+        anchors.rightMargin: root.rightPadding
+        anchors.topMargin: root.topPadding
         columnSpacing: 0
         columns: 2
         rowSpacing: 0
@@ -109,7 +134,8 @@ QuickGraphLib.AntialiasingContainer {
             id: titleLabel
 
             QQL.Layout.alignment: Qt.AlignCenter
-            QQL.Layout.columnSpan: 2
+            QQL.Layout.bottomMargin: root.spacing
+            QQL.Layout.columnSpan: axes.columns
             visible: text !== ""
         }
         QuickGraphLib.Axis {

{quickgraphlib-0.1.0a8 → quickgraphlib-0.1.0a10}/QuickGraphLib/QuickGraphLib.hpp

@@ -4,3 +4,4 @@
 #pragma once
 
 #include "DataTypes.hpp"
+#include "helpers/Helpers.hpp"

{quickgraphlib-0.1.0a8 → quickgraphlib-0.1.0a10}/QuickGraphLib/ScalingContainer.qml

@@ -6,13 +6,15 @@ import QtQuick
 /*!
     \qmltype ScalingContainer
     \inqmlmodule QuickGraphLib
-    \inherits AntialiasingContainer
+    \inherits Item
     \brief Scales its contents while preserving the aspect ratio.
 
     This container applies a scaling factor to its content item that preserves its aspect ratio.
+
+    \sa {Scaled graph}
 */
 
-AntialiasingContainer {
+Item {
     id: container
 
     /*!

quickgraphlib-0.1.0a10/QuickGraphLib/ShapeRepeater.qml

@@ -0,0 +1,56 @@
+// SPDX-FileCopyrightText: Copyright (c) 2024 Refeyn Ltd and other QuickGraphLib contributors
+// SPDX-License-Identifier: MIT
+
+import QtQuick
+import QtQml.Models as QQM
+import QtQuick.Shapes as QQS
+import QuickGraphLib as QuickGraphLib
+
+/*!
+    \qmltype ShapeRepeater
+    \inqmlmodule QuickGraphLib
+    \inherits QtQml::Models::Instantiator
+    \brief A \l{Repeater}-like component that works with \l{ShapePath}s.
+
+    See the \l{Repeater} documentation for the general concept, and how to access data from the \l Instantiator::model.
+
+    If the ShapeRepeater is a child of the \l GraphArea provided to \l graphArea, then paths
+    the ShapeRepeater instantiates will be inserted, in order, immediately after the repeater's
+    position in the list of shape paths.
+
+    \note The ShapeRepeater must temporarily remove the children of the GraphArea in order to add/remove paths it
+    instantiates. This is fine for most elements, but \l Repeaters will destroy all of their children when this
+    happens. This may cause performance issues or loss of state. If this is an issue, place the Repeater outside
+    the GraphArea or inside an \l Item.
+
+    \sa {Peak buttons}
+*/
+
+QQM.Instantiator {
+    id: root
+
+    /*!
+        The GraphArea to add paths to.
+    */
+    required property QQS.Shape graphArea
+
+    function forceResync() {
+        // Workaround for https://bugreports.qt.io/browse/QTBUG-133230 and https://bugreports.qt.io/browse/QTBUG-133231
+        if (graphArea.Window.window !== null) {
+            let renderer = graphArea.preferredRendererType;
+            let otherRenderer = graphArea.preferredRendererType === QQS.Shape.CurveRenderer ? QQS.Shape.GeometryRenderer : QQS.Shape.CurveRenderer;
+            graphArea.preferredRendererType = otherRenderer;
+            graphArea.ensurePolished();
+            graphArea.preferredRendererType = renderer;
+        }
+    }
+
+    onObjectAdded: (i, obj) => {
+        QuickGraphLib.ShapeRepeaterHelper.insertObject(graphArea, root, obj, i);
+        forceResync();
+    }
+    onObjectRemoved: (i, obj) => {
+        QuickGraphLib.ShapeRepeaterHelper.removeObject(graphArea, obj);
+        forceResync();
+    }
+}

{quickgraphlib-0.1.0a8 → quickgraphlib-0.1.0a10}/QuickGraphLib/TickLabel.qml

@@ -11,6 +11,8 @@ import QtQuick
 
     This is the default implementation of a tick label. To customise how labels are shown,
     you can subclass this and override the \l Text::text property.
+
+    \sa {Axis}
 */
 
 Text {