QuickGraphLib 0.1.0a18__tar.gz → 0.1.0a20__tar.gz

{quickgraphlib-0.1.0a18 → quickgraphlib-0.1.0a20}/.gitignore

@@ -2,6 +2,7 @@
 .mypy_cache
 __pycache__
 venv
+build/
 dist
 *.egg-info
 aqtinstall.log

{quickgraphlib-0.1.0a18 → quickgraphlib-0.1.0a20}/.pre-commit-config.yaml

@@ -18,6 +18,11 @@ repos:
         entry: venv/Scripts/ruff.exe format
         language: system
         types: [python]
+      - id: clang_format
+        name: "Format C/C++ files"
+        entry: venv/Scripts/clang-format.exe -i
+        types_or: [c, c++]
+        language: system
       - id: gersemi
         name: gersemi
         entry: venv/Scripts/gersemi.exe -i

{quickgraphlib-0.1.0a18 → quickgraphlib-0.1.0a20}/CMakeLists.txt

@@ -21,11 +21,6 @@ option(
     ON
 )
 option(ENABLE_STUB_GENERATION "Enable .pyi stub generation (defaults to on)" ON)
-option(
-    ENABLE_MANYLINUX_BUILD
-    "Enable workarounds for manylinux build (defaults to off)"
-    OFF
-)
 
 if(NOT INSTALL_SUBPATH)
     set(INSTALL_SUBPATH
@@ -36,6 +31,6 @@ if(NOT INSTALL_SUBPATH)
 endif()
 
 find_package(Qt6 REQUIRED COMPONENTS Quick Svg)
-qt_standard_project_setup(REQUIRES 6.10)
+qt_standard_project_setup(REQUIRES 6.11)
 
 add_subdirectory(QuickGraphLib)

{quickgraphlib-0.1.0a18 → quickgraphlib-0.1.0a20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: QuickGraphLib
-Version: 0.1.0a18
+Version: 0.1.0a20
 Summary: A scientific graphing library for QtQuick
 Author-Email: Matthew Joyce <matthew.joyce@refeyn.com>
 License: MIT License
@@ -38,8 +38,8 @@ 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-Python: >=3.9
-Requires-Dist: PySide6==6.10.0
+Requires-Python: >=3.10
+Requires-Dist: PySide6==6.11.3
 Requires-Dist: contourpy
 Requires-Dist: numpy
 Provides-Extra: analyse
@@ -51,7 +51,7 @@ Requires-Dist: gersemi; 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.10.0; extra == "analyse"
+Requires-Dist: shiboken6_generator==6.11.3; extra == "analyse"
 Requires-Dist: setuptools_scm; extra == "analyse"
 Description-Content-Type: text/markdown
 
@@ -84,8 +84,8 @@ python examples/gallery.py
 
 ## Qt version compatibility
 
-This version of QuickGraphLib is compatible with Qt and PySide6 6.10.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.10 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.10.0 exactly. Other 6.10 versions of PySide6 may work, but there are no guarantees.
+This version of QuickGraphLib is compatible with Qt and PySide6 6.11.3. If you use this module from C++, then Qt's ABI stability guarantees means the compiled binaries will work for any Qt version >= 6.11 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.11.3 exactly. Other 6.11 versions of PySide6 may work, but there are no guarantees.
 
 ## Python version compatibility
 
-QuickGraphLib is compatible with the same Python versions and glibc versions that PySide6 is. For PySide6 6.10, the minimum Python version is 3.9.
+QuickGraphLib is compatible with the same Python versions and glibc versions that PySide6 is. For PySide6 6.11, the minimum Python version is 3.10.

{quickgraphlib-0.1.0a18 → quickgraphlib-0.1.0a20}/QuickGraphLib/AntialiasingContainer.qml

@@ -10,7 +10,7 @@ import QtQuick
 /*!
     \qmltype AntialiasingContainer
     \inqmlmodule QuickGraphLib
-    \inherits QtQuick::Item
+    \inherits Item
     \brief Enables antialiasing for it's contents.
 
     This item turns on \l {Multisample Antialiasing}. This helps with rendering in some cases.

{quickgraphlib-0.1.0a18 → quickgraphlib-0.1.0a20}/QuickGraphLib/Axis.qml

@@ -9,7 +9,7 @@ import QuickGraphLib as QuickGraphLib
 /*!
     \qmltype Axis
     \inqmlmodule QuickGraphLib
-    \inherits QtQuick::Item
+    \inherits Item
     \brief Displays an Axis.
 
     \sa {Basic sin graph (without prefabs)}, {Graph with all four axes}

{quickgraphlib-0.1.0a18 → quickgraphlib-0.1.0a20}/QuickGraphLib/ColorMaps.cpp

@@ -9,7 +9,7 @@
 /*!
     \qmltype ColorMaps
     \inqmlmodule QuickGraphLib
-    \inherits QObject
+    \inherits QtObject
     \brief Utility functions for color maps.
 
     \sa {ImageView}, {Builtin color maps}, {Color mapped images}

{quickgraphlib-0.1.0a18 → quickgraphlib-0.1.0a20}/QuickGraphLib/DataTypes.hpp

@@ -12,11 +12,11 @@ class QGL_EXPORT QGLPolygonF : public QPolygonF {
    public:
     using QPolygonF::QPolygonF;
     QGLPolygonF() = default;
-    QGLPolygonF(const QList<QPointF> &v) : QPolygonF(v) {}
-    QGLPolygonF(const QPolygonF &v) : QPolygonF(v) {}
-    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); }
+    QGLPolygonF(const QList<QPointF>& v) : QPolygonF(v) {}
+    QGLPolygonF(const QPolygonF& v) : QPolygonF(v) {}
+    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); }
     operator QVariant() const;
 };
 Q_DECLARE_SHARED(QGLPolygonF)
@@ -25,9 +25,9 @@ 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); }
+    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); }
     operator QVariant() const;
 };
 Q_DECLARE_SHARED(QGLDoubleList)

{quickgraphlib-0.1.0a18 → quickgraphlib-0.1.0a20}/QuickGraphLib/GraphArea.qml

@@ -7,7 +7,7 @@ import QtQuick.Shapes as QQS
 /*!
     \qmltype Histogram
     \inqmlmodule QuickGraphLib
-    \inherits QtQuick::Shapes::Shape
+    \inherits Shape
     \brief An area that graphs can be added to.
 
     \sa {Basic sin graph (without prefabs)}, {Inverted axes}

{quickgraphlib-0.1.0a18 → quickgraphlib-0.1.0a20}/QuickGraphLib/GraphItems/AxHLine.qml

@@ -7,7 +7,7 @@ import QtQuick.Shapes as QQS
 /*!
     \qmltype AxHLine
     \inqmlmodule QuickGraphLib.GraphItems
-    \inherits QtQuick::Shapes::ShapePath
+    \inherits ShapePath
     \brief Displays a horizontal line.
 
     \sa {Spans and lines}

{quickgraphlib-0.1.0a18 → quickgraphlib-0.1.0a20}/QuickGraphLib/GraphItems/AxHSpan.qml

@@ -7,7 +7,7 @@ import QtQuick.Shapes as QQS
 /*!
     \qmltype AxHSpan
     \inqmlmodule QuickGraphLib.GraphItems
-    \inherits QtQuick::Shapes::ShapePath
+    \inherits ShapePath
     \brief Displays a horizontal span.
 
     \sa {Spans and lines}

{quickgraphlib-0.1.0a18 → quickgraphlib-0.1.0a20}/QuickGraphLib/GraphItems/AxVSpan.qml

@@ -7,7 +7,7 @@ import QtQuick.Shapes as QQS
 /*!
     \qmltype AxVSpan
     \inqmlmodule QuickGraphLib.GraphItems
-    \inherits QtQuick::Shapes::ShapePath
+    \inherits ShapePath
     \brief Displays an vertical span.
 
     \sa {Spans and lines}, {Basic histogram}, {Draggable region}

{quickgraphlib-0.1.0a18 → quickgraphlib-0.1.0a20}/QuickGraphLib/GraphItems/BarHorizontal.qml

@@ -7,7 +7,7 @@ import QtQuick.Shapes as QQS
 /*!
     \qmltype BarHorizontal
     \inqmlmodule QuickGraphLib.GraphItems
-    \inherits QtQuick::Shapes::ShapePath
+    \inherits ShapePath
     \brief Displays a horizontal bar for a bar graph.
 */
 QQS.ShapePath {

{quickgraphlib-0.1.0a18 → quickgraphlib-0.1.0a20}/QuickGraphLib/GraphItems/BarVertical.qml

@@ -7,7 +7,7 @@ import QtQuick.Shapes as QQS
 /*!
     \qmltype BarVertical
     \inqmlmodule QuickGraphLib.GraphItems
-    \inherits QtQuick::Shapes::ShapePath
+    \inherits ShapePath
     \brief Displays a vertical bar for a bar graph.
 */
 QQS.ShapePath {

quickgraphlib-0.1.0a20/QuickGraphLib/GraphItems/BaseHandles.qml

@@ -0,0 +1,76 @@
+// SPDX-FileCopyrightText: Copyright (c) 2024 Refeyn Ltd and other QuickGraphLib contributors
+// SPDX-License-Identifier: MIT
+
+import QtQuick
+
+/*!
+    \qmltype BaseHandles
+    \inqmlmodule QuickGraphLib.GraphItems
+    \inherits Item
+    \internal
+    \brief Shared base contract for graph handle overlays.
+
+    BaseHandles centralizes the common styling, click and movement signal contract used by
+    concrete handle overlay items. Applications should instantiate the concrete handle types rather
+    than BaseHandles directly.
+*/
+
+Item {
+    id: root
+
+    property bool _bodyHovered: false
+
+    /*!
+        Must be assigned the data transform of the graph area this handle item is paired to.
+
+        \sa GraphArea::dataTransform
+    */
+    required property matrix4x4 dataTransform
+    /*!
+        The normal handle fill color.
+    */
+    property color handleFillColor: "white"
+    /*!
+        The handle fill color used while hovered.
+    */
+    property color handleHoverFillColor: "#fff6bf"
+    /*!
+        The handle fill color used while selected or dragged.
+    */
+    property color handleSelectedFillColor: "#ffd24d"
+    /*!
+        The handle outline color.
+    */
+    property color handleStrokeColor: "#333333"
+    /*!
+        The handle outline width.
+    */
+    property real handleStrokeWidth: 1
+    /*!
+        Whether handles should be visible.
+    */
+    property bool handlesVisible: selected
+    /*!
+        Whether the pointer is currently over the shape body.
+    */
+    readonly property bool hovered: enabled && _bodyHovered
+    /*!
+        Whether the handle item should be drawn in the selected state.
+    */
+    property bool selected: false
+
+    /*!
+        Emitted when the body of the handle item is clicked.
+    */
+    signal bodyClicked
+
+    /*!
+        Emitted when \a handle is clicked.
+    */
+    signal handleClicked(GraphHandle handle)
+
+    /*!
+        Emitted when \a handle has moved to \a position in data coordinates.
+    */
+    signal handleMoved(GraphHandle handle, point position)
+}

{quickgraphlib-0.1.0a18 → quickgraphlib-0.1.0a20}/QuickGraphLib/GraphItems/BoxPlotHorizontal.qml

@@ -7,8 +7,8 @@ import QtQuick.Shapes as QQS
 /*!
     \qmltype BoxPLotVertical
     \inqmlmodule QuickGraphLib.GraphItems
-    \inherits QtQuick::Shapes::ShapePath
-    \brief Displays a vertical box plot
+    \inherits ShapePath
+    \brief Displays a vertical box plot.
 */
 QQS.ShapePath {
     id: root

{quickgraphlib-0.1.0a18 → quickgraphlib-0.1.0a20}/QuickGraphLib/GraphItems/BoxPlotVertical.qml

@@ -7,8 +7,8 @@ import QtQuick.Shapes as QQS
 /*!
     \qmltype BoxPLotVertical
     \inqmlmodule QuickGraphLib.GraphItems
-    \inherits QtQuick::Shapes::ShapePath
-    \brief Displays a vertical box plot
+    \inherits ShapePath
+    \brief Displays a vertical box plot.
 */
 QQS.ShapePath {
     id: root

{quickgraphlib-0.1.0a18 → quickgraphlib-0.1.0a20}/QuickGraphLib/GraphItems/CMakeLists.txt

@@ -6,7 +6,9 @@ set(QGL_GI_QML_FILES
     AxVLine.qml
     BarHorizontal.qml
     BarVertical.qml
+    BaseHandles.qml
     BasicLegend.qml
+    GraphHandle.qml
     BoxPlotHorizontal.qml
     BoxPlotVertical.qml
     GraphItemDragHandler.qml
@@ -16,8 +18,18 @@ set(QGL_GI_QML_FILES
     AxVSpan.qml
     BasicLegendItem.qml
     Contour.qml
+    Ellipse.qml
+    EllipseHandles.qml
     Grid.qml
     Line.qml
+    LineSegmentHandles.qml
+    LineSegment.qml
+    Polygon.qml
+    PolygonHandles.qml
+    Polyline.qml
+    PolylineHandles.qml
+    Rectangle.qml
+    RectangleHandles.qml
     ColorMesh.qml
 )
 qt_add_qml_module(QuickGraphLibGraphItems

{quickgraphlib-0.1.0a18 → quickgraphlib-0.1.0a20}/QuickGraphLib/GraphItems/Contour.qml

@@ -8,7 +8,7 @@ import QuickGraphLib as QuickGraphLib
 /*!
     \qmltype Contours
     \inqmlmodule QuickGraphLib.GraphItems
-    \inherits QtQuick::Shapes::ShapePath
+    \inherits ShapePath
     \brief Draw a contour line or fill.
 
     \sa {Contours}

quickgraphlib-0.1.0a20/QuickGraphLib/GraphItems/Ellipse.qml

@@ -0,0 +1,59 @@
+// 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 Ellipse
+    \inqmlmodule QuickGraphLib.GraphItems
+    \inherits ShapePath
+    \brief Displays an ellipse in data coordinates.
+
+    Draws an ellipse from a bounding Qt rect in data coordinates. The style can be adjusted using the
+    \l {ShapePath::fillColor} {fillColor}, \l {ShapePath::strokeColor} {strokeColor} and
+    \l {ShapePath::strokeWidth} {strokeWidth} properties.
+*/
+
+QQS.ShapePath {
+    id: root
+
+    readonly property real _dataBottom: _normalizedDataRect.bottom
+    readonly property point _dataCenter: Qt.point((_normalizedDataRect.left + _normalizedDataRect.right) / 2, (_normalizedDataRect.top + _normalizedDataRect.bottom) / 2)
+    readonly property real _dataLeft: _normalizedDataRect.left
+    readonly property real _dataRight: _normalizedDataRect.right
+    readonly property point _dataRightCenter: Qt.point(_dataRight, _dataCenter.y)
+    readonly property real _dataTop: _normalizedDataRect.top
+    readonly property point _dataTopCenter: Qt.point(_dataCenter.x, _dataTop)
+    readonly property point _mappedCenter: dataTransform.map(_dataCenter)
+    readonly property rect _mappedRect: dataTransform.mapRect(_normalizedDataRect)
+    readonly property point _mappedRightCenter: dataTransform.map(_dataRightCenter)
+    readonly property point _mappedTopCenter: dataTransform.map(_dataTopCenter)
+    readonly property rect _normalizedDataRect: QuickGraphLib.Helpers.normalizedRect(dataRect)
+    readonly property real _radiusX: _mappedRect.width / 2
+    readonly property real _radiusY: _mappedRect.height / 2
+    /*!
+        The ellipse bounding rectangle in data coordinates.
+    */
+    required property rect dataRect
+
+    /*!
+        Must be assigned the data transform of the graph area this ellipse is paired to.
+
+        \sa GraphArea::dataTransform
+    */
+    required property matrix4x4 dataTransform
+
+    fillColor: "transparent"
+    pathHints: QQS.ShapePath.PathConvex | QQS.ShapePath.PathSolid
+
+    PathAngleArc {
+        centerX: root._mappedCenter.x
+        centerY: root._mappedCenter.y
+        radiusX: root._radiusX
+        radiusY: root._radiusY
+        startAngle: 0
+        sweepAngle: 360
+    }
+}