Merge pull request #617 from RookieLinux/main

更新qmlcustomplot目录,主要是更新baseplot,增加固定刷新时间间隔、绘制最大点数等属性,预留添加数据接口与更新刷图接口,…

Author: zhuzichu520

example/example.qrc

@@ -211,6 +211,7 @@
         <file>qml/page/T_Icons.qml</file>
         <file>qml/window/HotkeyWindow.qml</file>
         <file>qml/page/T_CustomPlot.qml</file>
+        <file>qml/page/T_CustomPlot2.qml</file>
         <file>res/image/logo_pro.png</file>
         <file>qml/page/T_FluentPro.qml</file>
         <file>qml/page/T_BubbleBox.qml</file>

example/qml/global/ItemsOriginal.qml

@@ -450,6 +450,12 @@ FluObject{
             url: "qrc:/example/qml/page/T_CustomPlot.qml"
             onTap: { navigationView.push(url) }
         }
+        FluPaneItem{
+            title: qsTr("QCustomPlot2")
+            menuDelegate: paneItemMenu
+            url: "qrc:/example/qml/page/T_CustomPlot2.qml"
+            onTap: { navigationView.push(url) }
+        }
         FluPaneItem{
             title: qsTr("QRCode")
             menuDelegate: paneItemMenu

example/qml/page/T_CustomPlot2.qml

@@ -0,0 +1,137 @@
+import QtQuick 2.15
+import QtQuick.Layouts 1.15
+import QtQuick.Window 2.15
+import QtQuick.Controls 2.15
+import FluentUI 1.0
+import example 1.0
+import "../component"
+
+FluPage{
+    title: qsTr("QCustomPlot2")
+    RealTimePlot {
+        anchors.fill: parent          // 关键：给容器确定尺寸
+
+        id: realtimePlot
+        xAxis.visible: true
+        yAxis.visible: true
+
+        xAxis.ticker.tickCount: 2
+        xAxis.ticker.ticks: true
+        xAxis.ticker.subTicks: false
+        yAxis.ticker.tickCount: 10
+        yAxis.ticker.ticks: true
+        yAxis.ticker.subTicks: false
+
+        backgroundColor: FluTheme.dark ? Qt.rgba(39/255, 39/255, 39/255, 1) : "white"
+        baseColor: FluTheme.dark ? "white" : Qt.rgba(39/255, 39/255, 39/255, 1)
+        labelColor: FluTheme.dark ? "white" : Qt.rgba(39/255, 39/255, 39/255, 1)
+        maxBufferPoints: 20000
+        refreshMs: 30
+        initialXRange : ({"lower":0, "upper":1.0})
+        initialYRange : ({"lower":-2, "upper":2})
+        Component.onCompleted: {
+            realtimePlot.addGraph("main");
+        }
+
+        Component.onDestruction: {
+
+        }
+        // 鼠标滚轮缩放
+        MouseArea {
+            id: rtMouse
+            anchors.fill: parent
+            hoverEnabled: true
+            property double posX : 0
+            property double posY : 0
+            // 框选缩放相关
+            property bool dragging: false
+            property real startX: 0
+            property real startY: 0
+            property real curX: 0
+            property real curY: 0
+
+            onPositionChanged: function(mouse) {
+                // console.log("mouse:", mouse.x, mouse.y)
+                posX = mouse.x
+                posY = mouse.y
+                if (dragging) {
+                    curX = mouse.x
+                    curY = mouse.y
+                }
+            }
+            onPressed: function(mouse) {
+                if (mouse.button === Qt.LeftButton) {
+                    dragging = true
+                    startX = mouse.x
+                    startY = mouse.y
+                    curX = mouse.x
+                    curY = mouse.y
+                }
+            }
+            onReleased: function(mouse) {
+                if (dragging && mouse.button === Qt.LeftButton) {
+                    dragging = false
+                    // 计算选择框
+                    var x1 = Math.min(startX, curX)
+                    var y1 = Math.min(startY, curY)
+                    var x2 = Math.max(startX, curX)
+                    var y2 = Math.max(startY, curY)
+                    var selW = Math.abs(x2 - x1)
+                    var selH = Math.abs(y2 - y1)
+                    // 阈值，避免误触
+                    if (selW > 8 && selH > 8) {
+                        // 将像素坐标转换为数据坐标
+                        realtimePlot.setRangeByPixels(x1, y1, x2, y2)
+                    }
+                }
+            }
+            onWheel: function(wheel){
+                let delta = wheel.angleDelta.y;
+                if (wheel.modifiers & Qt.ControlModifier) {
+                    realtimePlot.zoomXY(posX, posY, delta > 0 ? 0.9 : 1.1, true);
+                } else {
+                    realtimePlot.moveY( delta > 0 ? -0.05 : 0.05);
+                }
+                wheel.accepted = true;
+            }
+            onDoubleClicked: function(mouse) {
+                if (mouse.button === Qt.LeftButton) {
+                    realtimePlot.resetRange();
+                }
+            }
+        }
+        // 框选可视化选区
+        Rectangle {
+            id: realtimeSelection
+            x: Math.min(rtMouse.startX, rtMouse.curX)
+            y: Math.min(rtMouse.startY, rtMouse.curY)
+            width: Math.abs(rtMouse.curX - rtMouse.startX)
+            height: Math.abs(rtMouse.curY - rtMouse.startY)
+            visible: rtMouse.dragging && width > 4 && height > 4
+            color: Qt.rgba(0, 120/255, 215/255, 0.15) // Windows 风格选区蓝
+            border.color: Qt.rgba(0, 120/255, 215/255, 0.8)
+            border.width: 1
+            z: 10
+        }
+    }
+
+    DataGenerator {
+        id: dataGenerator
+        Component.onCompleted: {
+            dataGenerator.start();
+        }
+    }
+
+    // 使用数据的示例
+    Timer {
+        interval: 50
+        running: true
+        repeat: true
+        onTriggered: {
+            // 获取最新数据
+            var xData = dataGenerator.xData
+            var yData = dataGenerator.yData
+            realtimePlot.appendBatch(xData, yData);
+        }
+    }
+}

example/src/component/DataGenerator.cpp

@@ -0,0 +1,65 @@
+//
+// Created by rookie on 2025/12/3.
+//
+
+#include "DataGenerator.h"
+
+
+QVector<double> DataGenerator::xData() const {
+    QReadLocker locker(&m_lock);
+    return m_xData;
+}
+
+QVector<double> DataGenerator::yData() const {
+    QReadLocker locker(&m_lock);
+    return m_yData;
+}
+
+bool DataGenerator::isRunning() const {
+    return m_timer->isActive();
+}
+
+Q_INVOKABLE void DataGenerator::start() {
+    if (!m_timer->isActive()) {
+      m_timer->start();
+      emit runningChanged(true);
+      generateData();
+    }
+}
+
+Q_INVOKABLE void DataGenerator::stop() {
+    if (m_timer->isActive()) {
+      m_timer->stop();
+      emit runningChanged(false);
+    }
+}
+
+Q_INVOKABLE void DataGenerator::setParameters(double sineFreq, double sineAmp, double noiseAmp) {
+    QWriteLocker locker(&m_lock);
+    m_sineFrequency = sineFreq;
+    m_sineAmplitude = sineAmp;
+    m_noiseAmplitude = noiseAmp;
+}
+
+void DataGenerator::generateData() {
+    QWriteLocker locker(&m_lock);
+
+    m_xData.clear();
+    m_yData.clear();
+
+    double dt = 1.0 / m_sampleRate;
+
+    for (int i = 0; i < m_sampleRate; ++i) {
+        double t = i * dt;
+
+        double sineValue = m_sineAmplitude * std::sin(2 * M_PI * m_sineFrequency * t);
+
+        double randomValue = (QRandomGenerator::global()->generateDouble() - 0.5) * 2.0;
+        double noiseValue = m_noiseAmplitude * randomValue;//-0.03~0.03
+
+        m_xData.append(t);
+        m_yData.append(sineValue + noiseValue);
+    }
+
+    emit dataUpdated();
+}

example/src/component/DataGenerator.h

@@ -0,0 +1,73 @@
+//
+// Created by rookie on 2025/12/3.
+//
+
+#ifndef DATAGENERATOR_H
+#define DATAGENERATOR_H
+
+
+#include <QObject>
+#include <QVector>
+#include <QTimer>
+#include <QRandomGenerator>
+#include <QReadWriteLock>
+#include <cmath>
+#include <QDateTime>
+
+class DataGenerator : public QObject {
+    Q_OBJECT
+    Q_PROPERTY(QVector<double> xData READ xData NOTIFY dataUpdated)
+    Q_PROPERTY(QVector<double> yData READ yData NOTIFY dataUpdated)
+    Q_PROPERTY(bool running READ isRunning NOTIFY runningChanged)
+
+public:
+    explicit DataGenerator(QObject *parent = nullptr)
+        : QObject(parent), m_timer(new QTimer(this)) {
+
+        m_timer->setInterval(50);
+        connect(m_timer, &QTimer::timeout, this, &DataGenerator::generateData);
+
+        m_sampleRate = 20000.0;
+        m_sineFrequency = 2.0; //Hz
+        m_sineAmplitude = 1.5;
+        m_noiseAmplitude = 0.03;
+
+        m_xData.reserve(m_sampleRate);
+        m_yData.reserve(m_sampleRate);
+    }
+
+    ~DataGenerator() override {
+        stop();
+    }
+    QVector<double> xData() const;
+    QVector<double> yData() const;
+    bool isRunning() const;
+
+
+public slots:
+    Q_INVOKABLE void start();
+    Q_INVOKABLE void stop();
+    Q_INVOKABLE void setParameters(double sineFreq, double sineAmp, double noiseAmp);
+
+signals:
+    void dataUpdated();
+    void runningChanged(bool running);
+
+private slots:
+    void generateData();
+
+private:
+    double m_sampleRate;
+    double m_sineFrequency;
+    double m_sineAmplitude;
+    double m_noiseAmplitude;
+
+    QVector<double> m_xData;
+    QVector<double> m_yData;
+
+    QTimer *m_timer;
+    mutable QReadWriteLock m_lock;
+};
+
+
+#endif //DATAGENERATOR_H

example/src/main.cpp

@@ -21,6 +21,7 @@
 #include "src/helper/Network.h"
 #include "src/helper/SettingsHelper.h"
 #include "src/helper/TranslateHelper.h"
+#include "src/component/DataGenerator.h"
 
 #ifdef FLUENTUI_BUILD_STATIC_LIB
 #  if (QT_VERSION > QT_VERSION_CHECK(6, 2, 0))
@@ -81,6 +82,7 @@ int main(int argc, char *argv[]) {
     qmlRegisterType<OpenGLItem>(uri, major, minor, "OpenGLItem");
     qmlRegisterUncreatableMetaObject(NetworkType::staticMetaObject, uri, major, minor,
                                      "NetworkType", "Access to enums & flags only");
+    qmlRegisterType<DataGenerator>(uri, major, minor, "DataGenerator");
 
     QQmlApplicationEngine engine;
     TranslateHelper::getInstance()->init(&engine);

src/FluentUI.cpp

@@ -51,6 +51,7 @@ void FluentUI::registerTypes(const char *uri) {
 
     qmlRegisterType<QmlQCustomPlot::TimePlot>(uri, major, minor, "TimePlot");
     qmlRegisterType<QmlQCustomPlot::BasePlot>(uri, major, minor, "BasePlot");
+    qmlRegisterType<QmlQCustomPlot::RealTimePlot>(uri, major, minor, "RealTimePlot");
 
     qmlRegisterUncreatableType<QmlQCustomPlot::Axis>(uri, major, minor, "Axis", "");
     qmlRegisterUncreatableType<QmlQCustomPlot::Ticker>(uri, major, minor, "Ticker", "");

src/qmlcustomplot/RealTimePlot.cpp

@@ -0,0 +1,65 @@
+//
+// Created by rookie on 2025/11/8.
+//
+
+#include "RealTimePlot.h"
+#include "qcustomplot.h"
+ #include <algorithm>
+ #include <limits>
+
+namespace QmlQCustomPlot
+{
+    RealTimePlot::RealTimePlot(QQuickItem *parent): BasePlot(parent)
+    {
+        connect(this, &BasePlot::maxBufferChanged, this, [this](){
+            this->recvMaxBufferPoints(this->maxBufferPoints());
+        });
+    }
+    RealTimePlot::~RealTimePlot()
+    {
+
+    }
+    void RealTimePlot::recvMaxBufferPoints(int n)
+    {
+        m_frontX.reserve(n);
+        m_frontY.reserve(n);
+        m_backX.reserve(n);
+        m_backY.reserve(n);
+    }
+
+    Q_INVOKABLE void RealTimePlot::appendBatch(const QVector<double> &x, const QVector<double> &y)
+    {
+        if (paused()) return;
+        if (width() <= 0 || height() <= 0) return;
+        if (x.isEmpty() || y.isEmpty()) return;
+
+        QMutexLocker locker(&m_bufLock);
+        m_backX = x;
+        m_backY = y;
+        m_hasNewBatch.store(true, std::memory_order_release);
+    }
+
+    void RealTimePlot::updatePlot()
+    {
+        QCustomPlot * m_customPlot = customPlot();
+        if (!m_customPlot) return;
+        if (!m_hasNewBatch.load(std::memory_order_acquire)) {
+            return;
+        }
+
+        {
+            QMutexLocker locker(&m_bufLock);
+            if (m_hasNewBatch.load(std::memory_order_relaxed)) {
+                m_frontX.swap(m_backX);
+                m_frontY.swap(m_backY);
+                m_hasNewBatch.store(false, std::memory_order_release);
+            }
+        }
+
+        const auto &gmap = graphs();
+        for (auto it = gmap.constBegin(); it != gmap.constEnd(); ++it) {
+            it->value<Graph*>()->setData(m_frontX, m_frontY, true);
+        }
+        m_customPlot->replot(QCustomPlot::rpQueuedReplot);
+    }
+}