QuickGraphLib 0.1.0a0__tar.gz → 0.1.0a2__tar.gz

quickgraphlib-0.1.0a2/CMakeLists.txt

@@ -0,0 +1,19 @@
+# SPDX-FileCopyrightText: Copyright (c) 2024 Refeyn Ltd and other QuickGraphLib contributors
+# SPDX-License-Identifier: MIT
+
+cmake_minimum_required(VERSION 3.16)
+set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
+
+project(qmlmodule VERSION 1.0.0 LANGUAGES CXX)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+if(NOT INSTALL_SUBPATH)
+    set(INSTALL_SUBPATH ${CMAKE_INSTALL_LIBDIR}/qml CACHE STRING "Install subpath (defaults to lib/qml)")
+endif()
+
+find_package(Qt6 REQUIRED COMPONENTS Quick Svg)
+qt_standard_project_setup(REQUIRES 6.5)
+
+add_subdirectory(QuickGraphLib)

{QuickGraphLib-0.1.0a0 → quickgraphlib-0.1.0a2}/LICENCE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Matthew Joyce and other QuickGraphLib contributors
+Copyright (c) 2024 Refeyn Ltd and other QuickGraphLib contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

quickgraphlib-0.1.0a2/MANIFEST.in

@@ -0,0 +1,3 @@
+recursive-include . CMakeLists.txt
+recursive-include QuickGraphLib *.qml *.svg *.qdoc *.cpp *.hpp
+recursive-include examples *.qml *.png *.qdoc

{QuickGraphLib-0.1.0a0 → quickgraphlib-0.1.0a2}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: QuickGraphLib
-Version: 0.1.0a0
+Version: 0.1.0a2
 Summary: A scientific graphing library for QtQuick
 Author-email: Matthew Joyce <matthew.joyce@refeyn.com>
 License: MIT License
         
-        Copyright (c) 2024 Matthew Joyce and other QuickGraphLib contributors
+        Copyright (c) 2024 Refeyn Ltd and other QuickGraphLib contributors
         
         Permission is hereby granted, free of charge, to any person obtaining a copy
         of this software and associated documentation files (the "Software"), to deal
@@ -26,6 +26,7 @@ License: MIT License
         SOFTWARE.
 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
 Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: X11 Applications :: Qt
@@ -54,9 +55,13 @@ Requires-Dist: pytest-cov; extra == "analyse"
 
 A scientific graphing library for [QtQuick](https://doc.qt.io/qt-6/qtquick-index.html) using Qt6.
 
+Links:
+ - [Online documentation](https://refeyn.github.io/QuickGraphLib)
+ - [PyPI page](https://pypi.org/project/QuickGraphLib/)
+
 Key advantages:
 
- - Written in pure QML (with some optional Python helpers), so it can be used in both C++ and Python projects
+ - Written in C++ and QML (with some optional Python helpers), so it can be used in both C++ and Python projects
  - QtQuick's hardware-based rendering makes this library render very fast
  - Support for line graphs, histograms, contour plots and more
  - Interactivity supported natively though declarative bindings and QtQuick
@@ -70,4 +75,4 @@ The example gallery can be run using (provided the Python environment has [PySid
 python examples\gallery.py
 ```
 
-<p align="center"><img src="./examples/ExampleGallery.png" width="80%"></p>
+<p align="center"><img src="https://github.com/refeyn/QuickGraphLib/assets/103422031/56fdff62-ef77-4184-9f43-59a76b92d728" width="80%"></p>

{QuickGraphLib-0.1.0a0 → quickgraphlib-0.1.0a2}/QuickGraphLib/AntialiasingContainer.qml

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright (c) 2024 Matthew Joyce and other QuickGraphLib contributors
+// SPDX-FileCopyrightText: Copyright (c) 2024 Refeyn Ltd and other QuickGraphLib contributors
 // SPDX-License-Identifier: MIT
 
 import QtQuick

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

@@ -1,9 +1,10 @@
-// SPDX-FileCopyrightText: Copyright (c) 2024 Matthew Joyce and other QuickGraphLib contributors
+// SPDX-FileCopyrightText: Copyright (c) 2024 Refeyn Ltd and other QuickGraphLib contributors
 // SPDX-License-Identifier: MIT
 
 pragma ComponentBehavior: Bound
 import QtQuick
 import QtQuick.Shapes as QQS
+import QuickGraphLib as QuickGraphLib
 
 /*!
     \qmltype Axis
@@ -22,13 +23,11 @@ Item {
         Bottom
     }
 
-    property list<point> _path: _calculateTickPath(ticks, direction, width, height, dataTransform)
-    property list<int> _tickPositions
     /*!
         TODO
         \sa {GraphArea::dataTransform}
     */
-    required property matrix4x4 dataTransform
+    property alias dataTransform: helper.dataTransform
     /*! TODO */
     property int decimalPoints: 2
     /*! TODO
@@ -39,49 +38,36 @@ Item {
         \value Axis.Direction.Top Axis above of the GraphArea
         \value Axis.Direction.Bottom Axis below of the GraphArea
      */
-    required property int direction
+    property alias direction: helper.direction
     /*! TODO */
     property alias label: labelText.text
     /*! TODO */
+    property alias labelColor: labelText.color
+    /*! TODO */
+    property alias labelFont: labelText.font
+    /*! TODO */
     property bool showTickLabels: true
     /*! TODO */
     property double spacing: 4
     /*! TODO */
-    property double tickLength: 10
+    property alias strokeColor: myPath.strokeColor
     /*! TODO */
-    required property list<double> ticks
-
-    function _calculateTickPath(ticks, direction: int, width: double, height: double, dataTransform) {
-        const longAxis = direction == Axis.Direction.Top || direction == Axis.Direction.Bottom ? width : height;
-        let transformedTicks = ticks.map(t => dataTransform.map(Qt.point(t, t))[direction == Axis.Direction.Top || direction == Axis.Direction.Bottom ? "x" : "y"]);
-
-        // Calculate everything as if we were a bottom axis
-        let points = [Qt.point(0, 0)], tickPositions = [];
-        transformedTicks.forEach(t => {
-            if (t >= -0.5 && t <= longAxis + 0.5) {
-                points.push(Qt.point(t, 0));
-                points.push(Qt.point(t, root.tickLength));
-                points.push(Qt.point(t, 0));
-                tickPositions.push(points.length - 2);
-            } else {
-                tickPositions.push(-1);
-            }
-        });
-        points.push(Qt.point(longAxis, 0));
-        _tickPositions = tickPositions;
-
-        // Transform into the correct positions
-        switch (root.direction) {
-        case Axis.Direction.Left:
-            return points.map(p => Qt.point(width - p.y, p.x));
-        case Axis.Direction.Right:
-            return points.map(p => Qt.point(p.y, p.x));
-        case Axis.Direction.Top:
-            return points.map(p => Qt.point(p.x, height - p.y));
-        case Axis.Direction.Bottom:
-            return points;
-        }
+    property alias strokeWidth: myPath.strokeWidth
+    /*! TODO */
+    property Component tickDelegate: TickLabel {
+        color: root.labelColor
+        decimalPoints: root.decimalPoints
+        direction: root.direction
+        font: root.labelFont
     }
+    /*! TODO */
+    property color tickLabelColor: labelColor
+    /*! TODO */
+    property font tickLabelFont: labelFont
+    /*! TODO */
+    property alias tickLength: helper.tickLength
+    /*! TODO */
+    property alias ticks: helper.ticks
 
     implicitHeight: {
         switch (root.direction) {
@@ -94,7 +80,7 @@ Item {
             if (ticks.length > 0) {
                 height += root.tickLength + Math.max(0, ...[...Array(tickLabels.count).keys()].map(i => tickLabels.itemAt(i)?.height));
             }
-            if (label != "") {
+            if (label !== "") {
                 height += labelText.height + root.spacing;
             }
             return height;
@@ -108,7 +94,7 @@ Item {
             if (ticks.length > 0) {
                 width += root.tickLength + Math.max(0, ...[...Array(tickLabels.count).keys()].map(i => tickLabels.itemAt(i)?.width));
             }
-            if (label != "") {
+            if (label !== "") {
                 width += labelText.height + root.spacing;
             }
             return width;
@@ -119,6 +105,13 @@ Item {
     }
     z: 1
 
+    QuickGraphLib.AxisHelper {
+        id: helper
+
+        height: root.height
+        tickLength: 10
+        width: root.width
+    }
     QQS.Shape {
         id: shape
 
@@ -127,56 +120,19 @@ Item {
         QQS.ShapePath {
             id: myPath
 
-            startX: root._path[0].x
-            startY: root._path[0].y
             strokeColor: "black"
             strokeWidth: 1
 
             PathPolyline {
-                path: root._path
+                path: helper.path
             }
         }
     }
     Repeater {
         id: tickLabels
 
-        model: root.showTickLabels ? root.ticks : []
-
-        Text {
-            required property int index
-            required property double modelData
-
-            leftPadding: 2
-            rightPadding: 2
-            text: Number(modelData).toFixed(root.decimalPoints)
-            visible: root._tickPositions[index] >= 0
-            x: {
-                let baseX = root._path[root._tickPositions[index]]?.x ?? 0;
-                switch (root.direction) {
-                case Axis.Direction.Left:
-                    return baseX - width;
-                case Axis.Direction.Right:
-                    return baseX;
-                case Axis.Direction.Top:
-                    return baseX - width / 2;
-                case Axis.Direction.Bottom:
-                    return baseX - width / 2;
-                }
-            }
-            y: {
-                let baseY = root._path[root._tickPositions[index]]?.y ?? 0;
-                switch (root.direction) {
-                case Axis.Direction.Left:
-                    return baseY - height / 2;
-                case Axis.Direction.Right:
-                    return baseY - height / 2;
-                case Axis.Direction.Top:
-                    return baseY - height;
-                case Axis.Direction.Bottom:
-                    return baseY;
-                }
-            }
-        }
+        delegate: root.tickDelegate
+        model: root.showTickLabels ? helper.tickModel : null
     }
     Text {
         id: labelText

quickgraphlib-0.1.0a2/QuickGraphLib/CMakeLists.txt

@@ -0,0 +1,27 @@
+# SPDX-FileCopyrightText: Copyright (c) 2024 Refeyn Ltd and other QuickGraphLib contributors
+# SPDX-License-Identifier: MIT
+
+set(QGL_QML_FILES AntialiasingContainer.qml Axis.qml GraphArea.qml ScalingContainer.qml ZoomPanHandler.qml TickLabel.qml ShapeRepeater.qml)
+qt_add_qml_module(QuickGraphLib
+    URI QuickGraphLib
+    SHARED
+    VERSION 1.0
+    QML_FILES ${QGL_QML_FILES}
+    SOURCES helpers/Helpers.cpp helpers/Helpers.hpp helpers/AxisHelper.hpp helpers/AxisHelper.cpp helpers/Foreign.hpp
+    PLUGIN_TARGET QuickGraphLib
+    DEPENDENCIES QtQuick
+)
+
+target_compile_definitions(QuickGraphLib PRIVATE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG>)
+target_link_libraries(QuickGraphLib PRIVATE Qt6::Quick Qt6::Svg)
+target_include_directories(QuickGraphLib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/helpers)
+
+install(TARGETS QuickGraphLib DESTINATION ${INSTALL_SUBPATH}/QuickGraphLib)
+install(FILES ${QGL_QML_FILES} DESTINATION ${INSTALL_SUBPATH}/QuickGraphLib)
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/qmldir ${CMAKE_CURRENT_BINARY_DIR}/QuickGraphLib.qmltypes
+    DESTINATION ${INSTALL_SUBPATH}/QuickGraphLib
+)
+
+add_subdirectory(PreFabs)
+add_subdirectory(GraphItems)

{QuickGraphLib-0.1.0a0 → quickgraphlib-0.1.0a2}/QuickGraphLib/GraphArea.qml

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright (c) 2024 Matthew Joyce and other QuickGraphLib contributors
+// SPDX-FileCopyrightText: Copyright (c) 2024 Refeyn Ltd and other QuickGraphLib contributors
 // SPDX-License-Identifier: MIT
 
 import QtQuick
@@ -23,7 +23,10 @@ QQS.Shape {
     */
     readonly property rect effectiveViewRect: {
         let mat = rawDataTransform.inverted().times(viewTransform.inverted().times(rawDataTransform));
-        return mat.mapRect(viewRect);
+        // Map corners instead of the whole rect to preserve the invertedness of each axis
+        let blCorner = mat.map(Qt.point(viewRect.x, viewRect.y));
+        let trCorner = mat.map(Qt.point(viewRect.right, viewRect.bottom));
+        return Qt.rect(blCorner.x, blCorner.y, trCorner.x - blCorner.x, trCorner.y - blCorner.y);
     }
     /*!
         Transform from data coordinates to pixel coordinates inside the GraphArea

quickgraphlib-0.1.0a2/QuickGraphLib/GraphItems/AxHLine.qml

@@ -0,0 +1,34 @@
+// SPDX-FileCopyrightText: Copyright (c) 2024 Refeyn Ltd and other QuickGraphLib contributors
+// SPDX-License-Identifier: MIT
+
+import QtQuick
+import QtQuick.Shapes as QQS
+
+/*!
+    \qmltype AxHLine
+    \inqmlmodule QuickGraphLib.GraphItems
+    \inherits QtQuick::Shapes::ShapePath
+    \brief Displays a horizontal line.
+*/
+
+QQS.ShapePath {
+    id: root
+
+    readonly property point bottomRightPoint: dataTransform.map(Qt.point(viewRect.right, position))
+
+    /*! TODO */
+    required property matrix4x4 dataTransform
+    /*! TODO */
+    required property double position
+    readonly property point topLeftPoint: dataTransform.map(Qt.point(viewRect.left, position))
+    /*! TODO */
+    required property rect viewRect
+
+    startX: topLeftPoint.x
+    startY: topLeftPoint.y
+
+    PathLine {
+        x: root.bottomRightPoint.x
+        y: root.topLeftPoint.y
+    }
+}

quickgraphlib-0.1.0a2/QuickGraphLib/GraphItems/AxHSpan.qml

@@ -0,0 +1,46 @@
+// SPDX-FileCopyrightText: Copyright (c) 2024 Refeyn Ltd and other QuickGraphLib contributors
+// SPDX-License-Identifier: MIT
+
+import QtQuick
+import QtQuick.Shapes as QQS
+
+/*!
+    \qmltype AxHSpan
+    \inqmlmodule QuickGraphLib.GraphItems
+    \inherits QtQuick::Shapes::ShapePath
+    \brief Displays a horizontal span.
+*/
+
+QQS.ShapePath {
+    id: root
+
+    readonly property point bottomRightPoint: dataTransform.map(Qt.point(viewRect.right, yMin))
+
+    /*! TODO */
+    required property matrix4x4 dataTransform
+    readonly property point topLeftPoint: dataTransform.map(Qt.point(viewRect.left, yMax))
+    /*! TODO */
+    required property rect viewRect
+    /*! TODO */
+    required property double yMax
+    /*! TODO */
+    required property double yMin
+
+    startX: topLeftPoint.x
+    startY: topLeftPoint.y
+    strokeColor: "transparent"
+
+    PathLine {
+        x: root.bottomRightPoint.x + root.strokeWidth
+        y: root.topLeftPoint.y
+    }
+    // Would be much nicer to use PathMove, but then the whole rect is not filled
+    PathLine {
+        x: root.bottomRightPoint.x + root.strokeWidth
+        y: root.bottomRightPoint.y
+    }
+    PathLine {
+        x: root.topLeftPoint.x
+        y: root.bottomRightPoint.y
+    }
+}

quickgraphlib-0.1.0a2/QuickGraphLib/GraphItems/AxVLine.qml

@@ -0,0 +1,34 @@
+// SPDX-FileCopyrightText: Copyright (c) 2024 Refeyn Ltd and other QuickGraphLib contributors
+// SPDX-License-Identifier: MIT
+
+import QtQuick
+import QtQuick.Shapes as QQS
+
+/*!
+    \qmltype AxVLine
+    \inqmlmodule QuickGraphLib.GraphItems
+    \inherits QtQuick::Rectangle
+    \brief Displays an vertical line.
+*/
+
+QQS.ShapePath {
+    id: root
+
+    readonly property point bottomRightPoint: dataTransform.map(Qt.point(position, viewRect.top))
+
+    /*! TODO */
+    required property matrix4x4 dataTransform
+    /*! TODO */
+    required property double position
+    readonly property point topLeftPoint: dataTransform.map(Qt.point(position, viewRect.bottom))
+    /*! TODO */
+    required property rect viewRect
+
+    startX: topLeftPoint.x
+    startY: topLeftPoint.y
+
+    PathLine {
+        x: root.topLeftPoint.x
+        y: root.bottomRightPoint.y + root.strokeWidth
+    }
+}

quickgraphlib-0.1.0a2/QuickGraphLib/GraphItems/AxVSpan.qml

@@ -0,0 +1,46 @@
+// SPDX-FileCopyrightText: Copyright (c) 2024 Refeyn Ltd and other QuickGraphLib contributors
+// SPDX-License-Identifier: MIT
+
+import QtQuick
+import QtQuick.Shapes as QQS
+
+/*!
+    \qmltype AxVSpan
+    \inqmlmodule QuickGraphLib.GraphItems
+    \inherits QtQuick::Shapes::ShapePath
+    \brief Displays an vertical span.
+*/
+
+QQS.ShapePath {
+    id: root
+
+    readonly property point bottomRightPoint: dataTransform.map(Qt.point(xMax, viewRect.top))
+
+    /*! TODO */
+    required property matrix4x4 dataTransform
+    readonly property point topLeftPoint: dataTransform.map(Qt.point(xMin, viewRect.bottom))
+    /*! TODO */
+    required property rect viewRect
+    /*! TODO */
+    required property double xMax
+    /*! TODO */
+    required property double xMin
+
+    startX: topLeftPoint.x
+    startY: topLeftPoint.y
+    strokeColor: "transparent"
+
+    PathLine {
+        x: root.topLeftPoint.x
+        y: root.bottomRightPoint.y + root.strokeWidth
+    }
+    // Would be much nicer to use PathMove, but then the whole rect is not filled
+    PathLine {
+        x: root.bottomRightPoint.x
+        y: root.bottomRightPoint.y + root.strokeWidth
+    }
+    PathLine {
+        x: root.bottomRightPoint.x
+        y: root.topLeftPoint.y
+    }
+}

{QuickGraphLib-0.1.0a0 → quickgraphlib-0.1.0a2}/QuickGraphLib/GraphItems/BasicLegend.qml

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright (c) 2024 Matthew Joyce and other QuickGraphLib contributors
+// SPDX-FileCopyrightText: Copyright (c) 2024 Refeyn Ltd and other QuickGraphLib contributors
 // SPDX-License-Identifier: MIT
 
 import QtQuick
@@ -8,6 +8,8 @@ import QtQuick
     \inqmlmodule QuickGraphLib.GraphItems
     \inherits QtQuick::Rectangle
     \brief Displays a simple legend.
+
+    \note This graph item does not inherit from ShapePath, unlike other graph items.
 */
 
 Rectangle {

{QuickGraphLib-0.1.0a0 → quickgraphlib-0.1.0a2}/QuickGraphLib/GraphItems/BasicLegendItem.qml

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright (c) 2024 Matthew Joyce and other QuickGraphLib contributors
+// SPDX-FileCopyrightText: Copyright (c) 2024 Refeyn Ltd and other QuickGraphLib contributors
 // SPDX-License-Identifier: MIT
 
 import QtQuick
@@ -17,13 +17,16 @@ Row {
     property color fillColor: "transparent"
     /*! TODO */
     property Gradient fillGradient: null
-
     /*! TODO */
     property color strokeColor: "black"
     /*! TODO */
     property real strokeWidth: 1
     /*! TODO */
     property alias text: label.text
+    /*! TODO */
+    property alias textColor: label.color
+    /*! TODO */
+    property alias textFont: label.font
 
     spacing: 2
 

quickgraphlib-0.1.0a2/QuickGraphLib/GraphItems/CMakeLists.txt

@@ -0,0 +1,27 @@
+# SPDX-FileCopyrightText: Copyright (c) 2024 Refeyn Ltd and other QuickGraphLib contributors
+# SPDX-License-Identifier: MIT
+
+set(QGL_GI_QML_FILES
+    AxHLine.qml AxVLine.qml BasicLegend.qml GraphItemDragHandler.qml Histogram.qml Marker.qml
+    AxHSpan.qml AxVSpan.qml BasicLegendItem.qml Contour.qml Grid.qml Line.qml
+)
+qt_add_qml_module(QuickGraphLibGraphItems
+    URI QuickGraphLib.GraphItems
+    SHARED
+    VERSION 1.0
+    QML_FILES ${QGL_GI_QML_FILES}
+    SOURCES helpers/HistogramHelper.cpp helpers/HistogramHelper.hpp helpers/GridHelper.hpp helpers/GridHelper.cpp
+    PLUGIN_TARGET QuickGraphLibGraphItems
+    DEPENDENCIES QtQuick QuickGraphLib
+)
+
+target_compile_definitions(QuickGraphLibGraphItems PRIVATE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG>)
+target_link_libraries(QuickGraphLibGraphItems PRIVATE Qt6::Quick)
+target_include_directories(QuickGraphLibGraphItems PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/helpers)
+
+install(TARGETS QuickGraphLibGraphItems DESTINATION ${INSTALL_SUBPATH}/QuickGraphLib/GraphItems)
+install(FILES ${QGL_GI_QML_FILES} DESTINATION ${INSTALL_SUBPATH}/QuickGraphLib/GraphItems)
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/qmldir ${CMAKE_CURRENT_BINARY_DIR}/QuickGraphLibGraphItems.qmltypes
+    DESTINATION ${INSTALL_SUBPATH}/QuickGraphLib/GraphItems
+)

{QuickGraphLib-0.1.0a0 → quickgraphlib-0.1.0a2}/QuickGraphLib/GraphItems/Contour.qml

@@ -1,8 +1,9 @@
-// SPDX-FileCopyrightText: Copyright (c) 2024 Matthew Joyce and other QuickGraphLib contributors
+// SPDX-FileCopyrightText: Copyright (c) 2024 Refeyn Ltd and other QuickGraphLib contributors
 // SPDX-License-Identifier: MIT
 
 import QtQuick
 import QtQuick.Shapes as QQS
+import QuickGraphLib as QuickGraphLib
 
 /*!
     \qmltype Contours
@@ -28,6 +29,6 @@ QQS.ShapePath {
     joinStyle: QQS.ShapePath.RoundJoin
 
     PathMultiline {
-        paths: root.paths.map(ps => ps.map(p => root.dataTransform.map(p)))
+        paths: root.paths.map(ps => QuickGraphLib.Helpers.mapPoints(ps, root.dataTransform))
     }
 }

{QuickGraphLib-0.1.0a0 → quickgraphlib-0.1.0a2}/QuickGraphLib/GraphItems/GraphItemDragHandler.qml

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright (c) 2024 Matthew Joyce and other QuickGraphLib contributors
+// SPDX-FileCopyrightText: Copyright (c) 2024 Refeyn Ltd and other QuickGraphLib contributors
 // SPDX-License-Identifier: MIT
 
 import QtQuick
@@ -26,7 +26,7 @@ MouseArea {
 
     onPositionChanged: event => {
         if (dragging) {
-            moved(dataTransform.inverted().mapRect(Qt.rect(parent.x + event.x - _startDragPos.x, parent.y + event.y - _startDragPos.y, _startDragPos.width, _startDragPos.height)));
+            moved(dataTransform.inverted().mapRect(Qt.rect(root.x + event.x - _startDragPos.x, parent.y + root.y - _startDragPos.y, _startDragPos.width, _startDragPos.height)));
         }
     }
     onPressed: event => {

quickgraphlib-0.1.0a2/QuickGraphLib/GraphItems/Grid.qml

@@ -0,0 +1,39 @@
+// SPDX-FileCopyrightText: Copyright (c) 2024 Refeyn Ltd and other QuickGraphLib contributors
+// SPDX-License-Identifier: MIT
+
+import QtQuick
+import QtQuick.Shapes as QQS
+import QuickGraphLib.GraphItems as QGLGraphItems
+
+/*!
+    \qmltype Grid
+    \inqmlmodule QuickGraphLib.GraphItems
+    \inherits QtQuick::Shapes::ShapePath
+    \brief Displays a grid in the background of a graph.
+*/
+
+QQS.ShapePath {
+    id: root
+
+    property QGLGraphItems.GridHelper _helper: QGLGraphItems.GridHelper {
+        id: helper
+
+    }
+
+    /*! TODO */
+    property alias dataTransform: helper.dataTransform
+    /*! TODO */
+    property alias viewRect: helper.viewRect
+    /*! TODO */
+    property alias xTicks: helper.xTicks
+    /*! TODO */
+    property alias yTicks: helper.yTicks
+
+    capStyle: QQS.ShapePath.RoundCap
+    fillColor: "transparent"
+    joinStyle: QQS.ShapePath.RoundJoin
+
+    PathMultiline {
+        paths: helper.paths
+    }
+}

quickgraphlib-0.1.0a2/QuickGraphLib/GraphItems/Histogram.qml

@@ -0,0 +1,39 @@
+// SPDX-FileCopyrightText: Copyright (c) 2024 Refeyn Ltd and other QuickGraphLib contributors
+// SPDX-License-Identifier: MIT
+
+import QtQuick
+import QtQuick.Shapes as QQS
+import QuickGraphLib.GraphItems as QGLGraphItems
+
+/*!
+    \qmltype Histogram
+    \inqmlmodule QuickGraphLib.GraphItems
+    \inherits QtQuick::Shapes::ShapePath
+    \brief Displays a histogram.
+*/
+
+QQS.ShapePath {
+    id: root
+
+    property QGLGraphItems.HistogramHelper _helper: QGLGraphItems.HistogramHelper {
+        id: helper
+
+        vertical: false
+    }
+
+    /*! TODO */
+    property alias bins: helper.bins
+    /*! TODO */
+    property alias dataTransform: helper.dataTransform
+    /*! TODO */
+    property alias heights: helper.heights
+    /*! TODO */
+    property alias vertical: helper.vertical
+
+    capStyle: QQS.ShapePath.RoundCap
+    joinStyle: QQS.ShapePath.RoundJoin
+
+    PathPolyline {
+        path: root._helper.path
+    }
+}