From ad87e30dcdb9f16c9cadfb53507fabb8ecbd3bde Mon Sep 17 00:00:00 2001 From: zhaohe Date: Tue, 5 Mar 2024 19:12:10 +0800 Subject: [PATCH] update --- libxsync | 2 +- mainwindow.cpp | 73 +++++++++++++- mainwindow.h | 12 ++- mainwindow.ui | 299 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 378 insertions(+), 8 deletions(-) diff --git a/libxsync b/libxsync index 36482b0..e493c4b 160000 --- a/libxsync +++ b/libxsync @@ -1 +1 @@ -Subproject commit 36482b04079dbc550fdc524bccd76324b8b8cefa +Subproject commit e493c4b01222c9c9072dc91f658438641043a9a1 diff --git a/mainwindow.cpp b/mainwindow.cpp index 7b44049..afa9dd6 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -390,6 +390,18 @@ void MainWindow::UI_GenlockPageConstruct() { ui->SysGenlock_Src->addItem(QString::fromStdString("1")); } +void MainWindow::UI_SysClockPageConstruct() { + ui->SysClock_Src->clear(); + + ui->SysClock_Src->addItem(QString::fromStdString(SignalType2Str(SIGNAL_TTLIN1))); + ui->SysClock_Src->addItem(QString::fromStdString(SignalType2Str(SIGNAL_TTLIN2))); + ui->SysClock_Src->addItem(QString::fromStdString(SignalType2Str(SIGNAL_TTLIN3))); + ui->SysClock_Src->addItem(QString::fromStdString(SignalType2Str(SIGNAL_TTLIN4))); + ui->SysClock_Src->addItem(QString::fromStdString(SignalType2Str(SIGNAL_INTERNAL_CLOCK_SIG))); + ui->SysClock_Src->addItem(QString::fromStdString(SignalType2Str(SIGNAL_SYS_GENLOCK_OUTPUT))); + ui->SysClock_Src->addItem(QString::fromStdString(SignalType2Str(SIGNAL_SYS_TIMECODE_FREQ_OUTPUT))); +} + MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) { ui->setupUi(this); m_mainWindow = this; @@ -403,6 +415,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi UI_CameraSyncPacketGeneratorModuleConstruct(); UI_TTLPageConstruct(); UI_GenlockPageConstruct(); + UI_SysClockPageConstruct(); /******************************************************************************* * 连接信号与槽 * @@ -707,7 +720,6 @@ void MainWindow::on_TTLPage_Write_clicked() { } void MainWindow::on_GenlockPage_Read_clicked() { - { GenlockFormat_t format; DO_XSYNC_FUNC(Xsync::Ins().InternalGenlock_getFormat(format)); @@ -743,3 +755,62 @@ void MainWindow::on_GenlockPage_Write_clicked() { DO_XSYNC_FUNC(Xsync::Ins().SysGenlock_setSrc(src)); } } + +void MainWindow::on_SysClockPage_Read_clicked() { + { + float freq; + DO_XSYNC_FUNC(Xsync::Ins().InternalClock_getFreq(freq)); + ui->InternalClock_Freq->setText(QString::number(freq, 'f', 2)); + } + + { + SignalType_t src; + DO_XSYNC_FUNC(Xsync::Ins().SysClock_getSrc(src)); + ui->SysClock_Src->setCurrentText(QString::fromStdString(SignalType2Str(src))); + } + + { + uint32_t div; + DO_XSYNC_FUNC(Xsync::Ins().SysClock_geFreqtDivision(div)); + ui->SysClock_FreqtDivision->setText(QString::number(div)); + } + + { + uint32_t multi; + DO_XSYNC_FUNC(Xsync::Ins().SysClock_getFreqMultiplication(multi)); + ui->SysClock_FreqMultiplication->setText(QString::number(multi)); + } + + { + float freq; + DO_XSYNC_FUNC(Xsync::Ins().SysClock_readInSigFreq(freq)); + ui->SysClock_InSigFreq->setText(QString::number(freq, 'f', 2)); + } + + { + float freq; + DO_XSYNC_FUNC(Xsync::Ins().SysClock_readOutSigFreq(freq)); + ui->SysClock_OutSigFreq->setText(QString::number(freq, 'f', 2)); + } +} +void MainWindow::on_SysClockPage_Wirte_clicked() { + { + auto freq = ui->InternalClock_Freq->text().toFloat(); + DO_XSYNC_FUNC(Xsync::Ins().InternalClock_setFreq(freq)); + } + + { + auto src = Str2SignalType(ui->SysClock_Src->currentText().toStdString()); + DO_XSYNC_FUNC(Xsync::Ins().SysClock_setSrc(src)); + } + + { + auto div = ui->SysClock_FreqtDivision->text().toUInt(); + DO_XSYNC_FUNC(Xsync::Ins().SysClock_setFreqDivision(div)); + } + + { + auto multi = ui->SysClock_FreqMultiplication->text().toUInt(); + DO_XSYNC_FUNC(Xsync::Ins().SysClock_setFreqMultiplication(multi)); + } +} \ No newline at end of file diff --git a/mainwindow.h b/mainwindow.h index 5bcf722..835b32d 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -102,7 +102,6 @@ class MainWindow : public QMainWindow { void on_CameraSyncPacketGeneratorModule_Read_clicked(); void on_CameraSyncPacketGeneratorModule_ClearPacketIndex_clicked(); - void on_TimecodePage_Read_clicked(); void on_TimecodePage_Update_clicked(); @@ -118,10 +117,12 @@ class MainWindow : public QMainWindow { void on_GenlockPage_Read_clicked(); void on_GenlockPage_Write_clicked(); - // InternalGenlock_Format - // ExternalGenlock_Freq - // SysGenlock_Src - // SysGenlock_Freq + void on_SysClockPage_Read_clicked(); + void on_SysClockPage_Wirte_clicked(); + + + + signals: void append_log_signal(QString str); void updateUI_timeCodeInfo_signal(QString); @@ -133,6 +134,7 @@ class MainWindow : public QMainWindow { void mainWindowsRun(); void updateUI_reg(uint32_t regoff); + void UI_SysClockPageConstruct(); void UI_TTLOutputMoudleConstruct(); void UI_TimecodePageConstruct(); void UI_GenlockPageConstruct(); diff --git a/mainwindow.ui b/mainwindow.ui index 02b02da..72bb0f5 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -141,7 +141,7 @@ - 3 + 4 @@ -1747,6 +1747,303 @@ + + + SysClock + + + + + 130 + 170 + 401 + 211 + + + + SYS_CLK + + + + + 20 + 30 + 61 + 31 + + + + source + + + + + + 70 + 30 + 211 + 31 + + + + -1 + + + + + + 70 + 70 + 211 + 31 + + + + + 75 + true + + + + + + + false + + + + + + 70 + 110 + 211 + 31 + + + + + 75 + true + + + + + + + false + + + + + + 20 + 70 + 61 + 31 + + + + 分频 + + + + + + 20 + 110 + 61 + 31 + + + + 倍频 + + + + + + 110 + 160 + 61 + 31 + + + + + 75 + true + + + + + + + false + + + + + + 320 + 160 + 61 + 31 + + + + + 75 + true + + + + + + + false + + + + + + 20 + 160 + 81 + 31 + + + + 输入信号频率 + + + + + + 230 + 160 + 81 + 31 + + + + 输出信号频率 + + + + + + + 390 + 40 + 221 + 81 + + + + 内部时钟发生器 + + + + + 10 + 20 + 41 + 31 + + + + Freq + + + + + + 50 + 20 + 151 + 31 + + + + + 75 + true + + + + + + + false + + + + + + + 40 + 40 + 71 + 41 + + + + TTL_IN + + + + + + 130 + 40 + 91 + 41 + + + + SYS_GENLOCK + + + + + + 230 + 40 + 101 + 41 + + + + SYS_TIMECODE + + + + + + 660 + 30 + 81 + 31 + + + + Read + + + + + + 660 + 70 + 81 + 31 + + + + Write + + + 相机同步消息上报6