From fcac7a693dad9b1d450c8523eb835976f170fcaf Mon Sep 17 00:00:00 2001 From: zhaohe Date: Tue, 26 Mar 2024 17:03:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E7=A0=81=E4=B8=8A=E6=8A=A5=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=AD=90=E5=B8=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 3 ++- libxsync | 2 +- mainwindow.cpp | 5 ++++- mainwindow.h | 6 +++++- mainwindow.ui | 26 ++++++++++++++++++++++++++ 5 files changed, 38 insertions(+), 4 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 8f8faba..b4e875c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -81,7 +81,8 @@ "qcoreapplication": "cpp", "qcategoryaxis": "cpp", "qaction": "cpp", - "qthread": "cpp" + "qthread": "cpp", + "qlineseries": "cpp" }, "files.autoGuessEncoding": true, } \ No newline at end of file diff --git a/libxsync b/libxsync index 6f3e46f..f2cd0a7 160000 --- a/libxsync +++ b/libxsync @@ -1 +1 @@ -Subproject commit 6f3e46f8e2a119941a5d3a026f4d146728653786 +Subproject commit f2cd0a7edfa77b2d4927acaeff2f60613858102f diff --git a/mainwindow.cpp b/mainwindow.cpp index 285728b..12770c1 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -503,7 +503,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi }); XsyncIns()->registerOnTimecodeMsgCallback([this](XsyncTimecode_t *timecode_msg) { // XsyncTimecode_t timecode = *timecode_msg; - QString text = QString(fmt("%02d:%02d:%02d:%02d", timecode.hour, timecode.minute, timecode.second, timecode.frame)); + QString text = QString(fmt("%02d:%02d:%02d:%02d:%02d", timecode.hour, timecode.minute, timecode.second, timecode.frame, timecode.subframe)); updateUI_timeCodeInfo_signal(text); }); @@ -947,3 +947,6 @@ void MainWindow::on_NetworkConfig_storage_clicked() { void MainWindow::on_GenNewMac_clicked() { DO_XSYNC_FUNC(XsyncIns()->generatorNewMac()); } void MainWindow::on_FactoryReset_clicked() { DO_XSYNC_FUNC(XsyncIns()->factoryReset()); } void MainWindow::on_Reboot_clicked() { DO_XSYNC_FUNC(XsyncIns()->reboot()); } + +void MainWindow::on_InternalSigSrouce_start_clicked() { DO_XSYNC_FUNC(XsyncIns()->InternalSigSrouce_start()); } +void MainWindow::on_InternalSigSrouce_stop_clicked() { DO_XSYNC_FUNC(XsyncIns()->InternalSigSrouce_stop()); } diff --git a/mainwindow.h b/mainwindow.h index 1662f26..f2a2942 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -123,7 +123,11 @@ class MainWindow : public QMainWindow { void on_FactoryReset_clicked(); void on_Reboot_clicked(); - signals: + void on_InternalSigSrouce_start_clicked(); + + void on_InternalSigSrouce_stop_clicked(); + +signals: void append_log_signal(QString str); void updateUI_timeCodeInfo_signal(QString); void updateUI_cameraSyncInfo_signal(QString); diff --git a/mainwindow.ui b/mainwindow.ui index a683d34..68b63aa 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -2720,6 +2720,32 @@ + + + + 600 + 70 + 171 + 31 + + + + InternalSigSrouce_start + + + + + + 600 + 110 + 171 + 31 + + + + InternalSigSrouce_stop + +