Browse Source

时码上报添加子帧

master
zhaohe 1 year ago
parent
commit
fcac7a693d
  1. 3
      .vscode/settings.json
  2. 2
      libxsync
  3. 5
      mainwindow.cpp
  4. 4
      mainwindow.h
  5. 26
      mainwindow.ui

3
.vscode/settings.json

@ -81,7 +81,8 @@
"qcoreapplication": "cpp", "qcoreapplication": "cpp",
"qcategoryaxis": "cpp", "qcategoryaxis": "cpp",
"qaction": "cpp", "qaction": "cpp",
"qthread": "cpp"
"qthread": "cpp",
"qlineseries": "cpp"
}, },
"files.autoGuessEncoding": true, "files.autoGuessEncoding": true,
} }

2
libxsync

@ -1 +1 @@
Subproject commit 6f3e46f8e2a119941a5d3a026f4d146728653786
Subproject commit f2cd0a7edfa77b2d4927acaeff2f60613858102f

5
mainwindow.cpp

@ -503,7 +503,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
}); });
XsyncIns()->registerOnTimecodeMsgCallback([this](XsyncTimecode_t *timecode_msg) { // XsyncIns()->registerOnTimecodeMsgCallback([this](XsyncTimecode_t *timecode_msg) { //
XsyncTimecode_t timecode = *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); 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_GenNewMac_clicked() { DO_XSYNC_FUNC(XsyncIns()->generatorNewMac()); }
void MainWindow::on_FactoryReset_clicked() { DO_XSYNC_FUNC(XsyncIns()->factoryReset()); } void MainWindow::on_FactoryReset_clicked() { DO_XSYNC_FUNC(XsyncIns()->factoryReset()); }
void MainWindow::on_Reboot_clicked() { DO_XSYNC_FUNC(XsyncIns()->reboot()); } 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()); }

4
mainwindow.h

@ -123,6 +123,10 @@ class MainWindow : public QMainWindow {
void on_FactoryReset_clicked(); void on_FactoryReset_clicked();
void on_Reboot_clicked(); void on_Reboot_clicked();
void on_InternalSigSrouce_start_clicked();
void on_InternalSigSrouce_stop_clicked();
signals: signals:
void append_log_signal(QString str); void append_log_signal(QString str);
void updateUI_timeCodeInfo_signal(QString); void updateUI_timeCodeInfo_signal(QString);

26
mainwindow.ui

@ -2720,6 +2720,32 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QPushButton" name="InternalSigSrouce_start">
<property name="geometry">
<rect>
<x>600</x>
<y>70</y>
<width>171</width>
<height>31</height>
</rect>
</property>
<property name="text">
<string>InternalSigSrouce_start</string>
</property>
</widget>
<widget class="QPushButton" name="InternalSigSrouce_stop">
<property name="geometry">
<rect>
<x>600</x>
<y>110</y>
<width>171</width>
<height>31</height>
</rect>
</property>
<property name="text">
<string>InternalSigSrouce_stop</string>
</property>
</widget>
</widget> </widget>
</widget> </widget>
</item> </item>

Loading…
Cancel
Save