p_dynamic_electrocardiograph
/
electrocardiograph_upper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

update

master
zhaohe 2 years ago
parent
62f8d7bc7e
commit
3183db5cb3
4 changed files with 170 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      libxsync
  2. 36
      mainwindow.cpp
  3. 5
      mainwindow.h
  4. 130
      mainwindow.ui

2
libxsync

@ -1 +1 @@
Subproject commit f0e204cec62237684d61dab803498d6403966a9b
Subproject commit b6ba9ab22e85b62aa4b573b43a753edb3f22a0d3

36
mainwindow.cpp
View File

@ -303,6 +303,13 @@ void MainWindow::UI_TimecodeOutputModuleConstruct() {
}
}
void MainWindow::UI_CameraSyncPacketGeneratorModuleConstruct() {
ui->CameraSyncPacketGeneratorModule_TriggerSig->clear();
for (auto &str : camera_sync_packet_generator_module::TriggerSigTypeStrSet()) {
ui->CameraSyncPacketGeneratorModule_TriggerSig->addItem(QString::fromStdString(str));
}
}
MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) {
ui->setupUi(this);
m_mainWindow = this;
@ -315,6 +322,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
UI_TTLOutputMoudleConstruct();
UI_SigGeneratorConstruct();
UI_TimecodeOutputModuleConstruct();
UI_CameraSyncPacketGeneratorModuleConstruct();
/*******************************************************************************
* 连接信号与槽 *
@ -551,4 +559,30 @@ void MainWindow::on_TimecodeOutputModule_Update_clicked() {
DO_XSYNC_FUNC(Xsync::Ins().TimecodeOutputModule_setTimecodeSrcSelect(TimecodeSrcSelect));
DO_XSYNC_FUNC(Xsync::Ins().TimecodeOutputModule_setBncOutputLevel(BncOutputLevel));
DO_XSYNC_FUNC(Xsync::Ins().TimecodeOutputModule_setHeadphoneOutputLevel(HeadphoneOutputLevel));
}
}
void MainWindow::on_CameraSyncPacketGeneratorModule_Update_clicked() {
auto TriggerSig = camera_sync_packet_generator_module::Str2TriggerSigType(ui->CameraSyncPacketGeneratorModule_TriggerSig->currentText().toStdString());
auto ReportPeriod = ui->CameraSyncPacketGeneratorModule_ReportPeriod->text().toUInt();
DO_XSYNC_FUNC(Xsync::Ins().CameraSyncPacketGeneratorModule_setTriggerSig(TriggerSig));
DO_XSYNC_FUNC(Xsync::Ins().CameraSyncPacketGeneratorModule_setReportPeriod(ReportPeriod));
}
void MainWindow::on_CameraSyncPacketGeneratorModule_Read_clicked() {
camera_sync_packet_generator_module::TriggerSigType_t TriggerSig;
uint32_t ReportPeriod;
uint32_t PacketIndex;
DO_XSYNC_FUNC(Xsync::Ins().CameraSyncPacketGeneratorModule_getTriggerSig(TriggerSig));
DO_XSYNC_FUNC(Xsync::Ins().CameraSyncPacketGeneratorModule_getReportPeriod(ReportPeriod));
DO_XSYNC_FUNC(Xsync::Ins().CameraSyncPacketGeneratorModule_getPacketIndex(PacketIndex));
ui->CameraSyncPacketGeneratorModule_TriggerSig->setCurrentText(QString::fromStdString(camera_sync_packet_generator_module::TriggerSigType2Str(TriggerSig)));
ui->CameraSyncPacketGeneratorModule_ReportPeriod->setText(QString::number(ReportPeriod));
ui->CameraSyncPacketGeneratorModule_PacketIndex->setText(QString::number(PacketIndex));
}
void MainWindow::on_CameraSyncPacketGeneratorModule_ClearPacketIndex_clicked() {
DO_XSYNC_FUNC(Xsync::Ins().CameraSyncPacketGeneratorModule_clearPacketIndex());
on_CameraSyncPacketGeneratorModule_Read_clicked();
}

5
mainwindow.h
View File

@ -110,6 +110,10 @@ class MainWindow : public QMainWindow {
void on_TimecodeOutputModule_Read_clicked();
void on_TimecodeOutputModule_Update_clicked();
void on_CameraSyncPacketGeneratorModule_Update_clicked();
void on_CameraSyncPacketGeneratorModule_Read_clicked();
void on_CameraSyncPacketGeneratorModule_ClearPacketIndex_clicked();
signals:
void append_log_signal(QString str);
void updateUI_timeCodeInfo_signal(QString);
@ -124,5 +128,6 @@ class MainWindow : public QMainWindow {
void UI_TTLOutputMoudleConstruct();
void UI_SigGeneratorConstruct();
void UI_TimecodeOutputModuleConstruct();
void UI_CameraSyncPacketGeneratorModuleConstruct();
};
#endif // MAINWINDOW_H

130
mainwindow.ui
View File

@ -102,7 +102,7 @@
</rect>
</property>
<property name="currentIndex">
<number>4</number>
<number>5</number>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
@ -938,6 +938,134 @@
</property>
</widget>
</widget>
<widget class="QWidget" name="tab_6">
<attribute name="title">
<string>相机同步消息上报</string>
</attribute>
<widget class="QComboBox" name="CameraSyncPacketGeneratorModule_TriggerSig">
<property name="geometry">
<rect>
<x>210</x>
<y>50</y>
<width>241</width>
<height>31</height>
</rect>
</property>
<property name="currentIndex">
<number>-1</number>
</property>
</widget>
<widget class="QPushButton" name="CameraSyncPacketGeneratorModule_Read">
<property name="geometry">
<rect>
<x>490</x>
<y>50</y>
<width>151</width>
<height>41</height>
</rect>
</property>
<property name="text">
<string>Read</string>
</property>
</widget>
<widget class="QLabel" name="label_16">
<property name="geometry">
<rect>
<x>20</x>
<y>50</y>
<width>101</width>
<height>31</height>
</rect>
</property>
<property name="text">
<string>TriggerSigType</string>
</property>
</widget>
<widget class="QPushButton" name="CameraSyncPacketGeneratorModule_Update">
<property name="geometry">
<rect>
<x>490</x>
<y>100</y>
<width>151</width>
<height>41</height>
</rect>
</property>
<property name="text">
<string>Update</string>
</property>
</widget>
<widget class="QPushButton" name="CameraSyncPacketGeneratorModule_ClearPacketIndex">
<property name="geometry">
<rect>
<x>490</x>
<y>150</y>
<width>151</width>
<height>41</height>
</rect>
</property>
<property name="text">
<string>清零包序号</string>
</property>
</widget>
<widget class="QLineEdit" name="CameraSyncPacketGeneratorModule_ReportPeriod">
<property name="geometry">
<rect>
<x>210</x>
<y>100</y>
<width>241</width>
<height>31</height>
</rect>
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string/>
</property>
<property name="readOnly">
<bool>false</bool>
</property>
</widget>
<widget class="QLabel" name="label_17">
<property name="geometry">
<rect>
<x>20</x>
<y>100</y>
<width>151</width>
<height>31</height>
</rect>
</property>
<property name="text">
<string>ReportPeriodCount</string>
</property>
</widget>
<widget class="QLabel" name="label_18">
<property name="geometry">
<rect>
<x>20</x>
<y>150</y>
<width>151</width>
<height>31</height>
</rect>
</property>
<property name="text">
<string>Index</string>
</property>
</widget>
<widget class="QTextBrowser" name="CameraSyncPacketGeneratorModule_PacketIndex">
<property name="geometry">
<rect>
<x>210</x>
<y>150</y>
<width>241</width>
<height>31</height>
</rect>
</property>
</widget>
</widget>
</widget>
</widget>
<widget class="QMenuBar" name="menubar">

Write Preview
Loading…
Cancel
Save