QuickGraphLib 0.1.0a17__tar.gz → 0.1.0a19__tar.gz

{quickgraphlib-0.1.0a17 → quickgraphlib-0.1.0a19}/.gitignore

@@ -2,8 +2,10 @@
 .mypy_cache
 __pycache__
 venv
+build/
 dist
 *.egg-info
 aqtinstall.log
 qt
 QuickGraphLib/_version.py
+build/

{quickgraphlib-0.1.0a17 → quickgraphlib-0.1.0a19}/.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.0a17 → quickgraphlib-0.1.0a19}/PKG-INFO

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

{quickgraphlib-0.1.0a17 → quickgraphlib-0.1.0a19}/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.0a19/QuickGraphLib/GraphItems/BarHorizontal.qml

@@ -0,0 +1,51 @@
+// SPDX-FileCopyrightText: Copyright (c) 2024 Refeyn Ltd and other QuickGraphLib contributors
+// SPDX-License-Identifier: MIT
+
+import QtQuick
+import QtQuick.Shapes as QQS
+
+/*!
+    \qmltype BarHorizontal
+    \inqmlmodule QuickGraphLib.GraphItems
+    \inherits QtQuick::Shapes::ShapePath
+    \brief Displays a horizontal bar for a bar graph.
+*/
+QQS.ShapePath {
+    id: root
+
+    /*!
+        The height (Y) of the bar in data coordinates.
+    */
+    required property double barHeight
+    /*!
+        The length (X) of the bar in data coordinates.
+    */
+    required property double barLength
+
+    /*!
+        Must be assigned the data transform of the graph area this axis is paired to.
+
+        \sa GraphArea::dataTransform
+    */
+    required property matrix4x4 dataTransform
+    /*!
+        The X position of the bar in data coordinates.
+    */
+    required property double position
+    /*!
+        The starting X position of the bar in data coordinates.
+    */
+    property double xStart: 0
+
+    pathHints: QQS.ShapePath.PathLinear | QQS.ShapePath.PathConvex | QQS.ShapePath.PathSolid
+
+    PathRectangle {
+        readonly property point bottomRightPoint: dataTransform.map(Qt.point(barLength >= 0 ? xStart + barLength : xStart, position - barHeight / 2))
+        readonly property point topLeftPoint: dataTransform.map(Qt.point(barLength >= 0 ? xStart : xStart + barLength, position + barHeight / 2))
+
+        height: bottomRightPoint.y - topLeftPoint.y
+        width: bottomRightPoint.x - topLeftPoint.x
+        x: topLeftPoint.x
+        y: topLeftPoint.y
+    }
+}

quickgraphlib-0.1.0a19/QuickGraphLib/GraphItems/BarVertical.qml

@@ -0,0 +1,51 @@
+// SPDX-FileCopyrightText: Copyright (c) 2024 Refeyn Ltd and other QuickGraphLib contributors
+// SPDX-License-Identifier: MIT
+
+import QtQuick
+import QtQuick.Shapes as QQS
+
+/*!
+    \qmltype BarVertical
+    \inqmlmodule QuickGraphLib.GraphItems
+    \inherits QtQuick::Shapes::ShapePath
+    \brief Displays a vertical bar for a bar graph.
+*/
+QQS.ShapePath {
+    id: root
+
+    /*!
+        The height of the bar in data coordinates.
+    */
+    required property double barHeight
+    /*!
+        The width of the bar in data coordinates.
+    */
+    required property double barWidth
+
+    /*!
+        Must be assigned the data transform of the graph area this axis is paired to.
+
+        \sa GraphArea::dataTransform
+    */
+    required property matrix4x4 dataTransform
+    /*!
+        The X position of the bar in data coordinates.
+    */
+    required property double position
+    /*!
+        The starting Y position of the bar in data coordinates.
+    */
+    property double yStart: 0
+
+    pathHints: QQS.ShapePath.PathLinear | QQS.ShapePath.PathConvex | QQS.ShapePath.PathSolid
+
+    PathRectangle {
+        readonly property point bottomRightPoint: dataTransform.map(Qt.point(position + barWidth / 2, barHeight >= 0 ? yStart : yStart - barHeight))
+        readonly property point topLeftPoint: dataTransform.map(Qt.point(position - barWidth / 2, barHeight >= 0 ? yStart + barHeight : yStart))
+
+        height: bottomRightPoint.y - topLeftPoint.y
+        width: bottomRightPoint.x - topLeftPoint.x
+        x: topLeftPoint.x
+        y: topLeftPoint.y
+    }
+}

quickgraphlib-0.1.0a19/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 QtQuick::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.0a19/QuickGraphLib/GraphItems/BoxPlotHorizontal.qml

@@ -0,0 +1,82 @@
+// SPDX-FileCopyrightText: Copyright (c) 2024 Refeyn Ltd and other QuickGraphLib contributors
+// SPDX-License-Identifier: MIT
+
+import QtQuick
+import QtQuick.Shapes as QQS
+
+/*!
+    \qmltype BoxPLotVertical
+    \inqmlmodule QuickGraphLib.GraphItems
+    \inherits QtQuick::Shapes::ShapePath
+    \brief Displays a vertical box plot
+*/
+QQS.ShapePath {
+    id: root
+
+    /*!
+        The height of the box in data coordinates.
+    */
+    required property double boxHeight
+
+    /*!
+        Must be assigned the data transform of the graph area this axis is paired to.
+
+        \sa GraphArea::dataTransform
+    */
+    required property matrix4x4 dataTransform
+    /*!
+        The Y position of the plot in data coordinates.
+    */
+    required property double position
+    /*!
+        The position of the Q0 whisker (minimum) in data coordinates.
+    */
+    required property double quartile0
+    /*!
+        The position of the Q1 line (first quartile) in data coordinates.
+    */
+    required property double quartile1
+    /*!
+        The position of the Q2 line (median) in data coordinates.
+    */
+    required property double quartile2
+    /*!
+        The position of the Q3 line (third quartile) in data coordinates.
+    */
+    required property double quartile3
+    /*!
+        The position of the Q4 whisker (maxiumum) in data coordinates.
+    */
+    required property double quartile4
+    /*!
+        The height of the whiskers in data coordinates.
+    */
+    required property double whiskerHeight
+
+    pathHints: QQS.ShapePath.PathLinear | QQS.ShapePath.PathSolid
+
+    PathMultiline {
+        paths: [[root.dataTransform.map(Qt.point(root.quartile0, root.position + root.whiskerHeight / 2)), root.dataTransform.map(Qt.point(root.quartile0, root.position - root.whiskerHeight / 2))], [root.dataTransform.map(Qt.point(root.quartile0, root.position)), root.dataTransform.map(Qt.point(root.quartile1, root.position))]]
+    }
+    PathRectangle {
+        readonly property point bottomRightPoint: root.dataTransform.map(Qt.point(root.quartile2, root.position - root.boxHeight / 2))
+        readonly property point topLeftPoint: root.dataTransform.map(Qt.point(root.quartile1, root.position + root.boxHeight / 2))
+
+        height: bottomRightPoint.y - topLeftPoint.y
+        width: bottomRightPoint.x - topLeftPoint.x
+        x: topLeftPoint.x
+        y: topLeftPoint.y
+    }
+    PathRectangle {
+        readonly property point bottomRightPoint: root.dataTransform.map(Qt.point(root.quartile3, root.position - root.boxHeight / 2))
+        readonly property point topLeftPoint: root.dataTransform.map(Qt.point(root.quartile2, root.position + root.boxHeight / 2))
+
+        height: bottomRightPoint.y - topLeftPoint.y
+        width: bottomRightPoint.x - topLeftPoint.x
+        x: topLeftPoint.x
+        y: topLeftPoint.y
+    }
+    PathMultiline {
+        paths: [[root.dataTransform.map(Qt.point(root.quartile3, root.position)), root.dataTransform.map(Qt.point(root.quartile4, root.position))], [root.dataTransform.map(Qt.point(root.quartile4, root.position + root.whiskerHeight / 2)), root.dataTransform.map(Qt.point(root.quartile4, root.position - root.whiskerHeight / 2))]]
+    }
+}

quickgraphlib-0.1.0a19/QuickGraphLib/GraphItems/BoxPlotVertical.qml

@@ -0,0 +1,82 @@
+// SPDX-FileCopyrightText: Copyright (c) 2024 Refeyn Ltd and other QuickGraphLib contributors
+// SPDX-License-Identifier: MIT
+
+import QtQuick
+import QtQuick.Shapes as QQS
+
+/*!
+    \qmltype BoxPLotVertical
+    \inqmlmodule QuickGraphLib.GraphItems
+    \inherits QtQuick::Shapes::ShapePath
+    \brief Displays a vertical box plot
+*/
+QQS.ShapePath {
+    id: root
+
+    /*!
+        The width of the box in data coordinates.
+    */
+    required property double boxWidth
+
+    /*!
+        Must be assigned the data transform of the graph area this axis is paired to.
+
+        \sa GraphArea::dataTransform
+    */
+    required property matrix4x4 dataTransform
+    /*!
+        The X position of the plot in data coordinates.
+    */
+    required property double position
+    /*!
+        The position of the Q0 whisker (minimum) in data coordinates.
+    */
+    required property double quartile0
+    /*!
+        The position of the Q1 line (first quartile) in data coordinates.
+    */
+    required property double quartile1
+    /*!
+        The position of the Q2 line (median) in data coordinates.
+    */
+    required property double quartile2
+    /*!
+        The position of the Q3 line (third quartile) in data coordinates.
+    */
+    required property double quartile3
+    /*!
+        The position of the Q4 whisker (maxiumum) in data coordinates.
+    */
+    required property double quartile4
+    /*!
+        The width of the whiskers in data coordinates.
+    */
+    required property double whiskerWidth
+
+    pathHints: QQS.ShapePath.PathLinear | QQS.ShapePath.PathSolid
+
+    PathMultiline {
+        paths: [[root.dataTransform.map(Qt.point(root.position - root.whiskerWidth / 2, root.quartile4)), root.dataTransform.map(Qt.point(root.position + root.whiskerWidth / 2, root.quartile4))], [root.dataTransform.map(Qt.point(root.position, root.quartile4)), root.dataTransform.map(Qt.point(root.position, root.quartile3))]]
+    }
+    PathRectangle {
+        readonly property point bottomRightPoint: root.dataTransform.map(Qt.point(root.position + root.boxWidth / 2, root.quartile2))
+        readonly property point topLeftPoint: root.dataTransform.map(Qt.point(root.position - root.boxWidth / 2, root.quartile3))
+
+        height: bottomRightPoint.y - topLeftPoint.y
+        width: bottomRightPoint.x - topLeftPoint.x
+        x: topLeftPoint.x
+        y: topLeftPoint.y
+    }
+    PathRectangle {
+        readonly property point bottomRightPoint: root.dataTransform.map(Qt.point(root.position + root.boxWidth / 2, root.quartile1))
+        readonly property point topLeftPoint: root.dataTransform.map(Qt.point(root.position - root.boxWidth / 2, root.quartile2))
+
+        height: bottomRightPoint.y - topLeftPoint.y
+        width: bottomRightPoint.x - topLeftPoint.x
+        x: topLeftPoint.x
+        y: topLeftPoint.y
+    }
+    PathMultiline {
+        paths: [[root.dataTransform.map(Qt.point(root.position, root.quartile1)), root.dataTransform.map(Qt.point(root.position, root.quartile0))], [root.dataTransform.map(Qt.point(root.position - root.whiskerWidth / 2, root.quartile0)), root.dataTransform.map(Qt.point(root.position + root.whiskerWidth / 2, root.quartile0))]]
+    }
+}

{quickgraphlib-0.1.0a17 → quickgraphlib-0.1.0a19}/QuickGraphLib/GraphItems/CMakeLists.txt

@@ -4,7 +4,13 @@
 set(QGL_GI_QML_FILES
     AxHLine.qml
     AxVLine.qml
+    BarHorizontal.qml
+    BarVertical.qml
+    BaseHandles.qml
     BasicLegend.qml
+    GraphHandle.qml
+    BoxPlotHorizontal.qml
+    BoxPlotVertical.qml
     GraphItemDragHandler.qml
     Histogram.qml
     Marker.qml
@@ -12,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.0a19/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 QtQuick::Shapes::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
+    }
+}