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
fbb5b2d1da
commit
81a6fd5514
7 changed files with 37 additions and 149 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      libxsync
  2. 32
      mainwindow.cpp
  3. 2
      mainwindow.h
  4. 139
      mainwindow.ui
  5. 1
      src/xsync_udp_factory_impl.cpp
  6. 4
      src/xsync_udp_factory_impl.hpp
  7. 2
      src/zqthread.hpp

2
libxsync

@ -1 +1 @@
Subproject commit b821d5a4a5c43eee223df3a75845f22cefd46441
Subproject commit 5d0eb6fcc626df90938927b50280699f90604bfb

32
mainwindow.cpp
View File

@ -6,6 +6,7 @@
#include "./ui_mainwindow.h" #include "./ui_mainwindow.h"
using namespace iflytop; using namespace iflytop;
using namespace xsync;
using namespace std; using namespace std;
static MainWindow *m_mainWindow; static MainWindow *m_mainWindow;
@ -226,6 +227,23 @@ void MainWindow::construct_reg_table() { //
ui->gridLayoutWidget->setGeometry(qrect); ui->gridLayoutWidget->setGeometry(qrect);
} }
// //
void MainWindow::UI_TTLOutputMoudleConstruct() {
ui->TTLOutputMoudle_ID->clear();
for (int i = 1; i <= 4; i++) {
ui->TTLOutputMoudle_ID->addItem(QString::number(i));
}
ui->TTLOutputMoudle_InputSigType->clear();
for (auto &str : ttlout_module::TriggerSigTypeStrSet()) {
ui->TTLOutputMoudle_InputSigType->addItem(QString::fromStdString(str));
}
ui->TTLOutputMoudle_OutputSigType->clear();
for (auto &str : ttlout_module::OutputSigTypeStrSet()) {
ui->TTLOutputMoudle_OutputSigType->addItem(QString::fromStdString(str));
}
}
MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) { MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) {
ui->setupUi(this); ui->setupUi(this);
m_mainWindow = this; m_mainWindow = this;
@ -235,6 +253,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
*/ */
construct_reg_table(); construct_reg_table();
qInstallMessageHandler(log_output); qInstallMessageHandler(log_output);
UI_TTLOutputMoudleConstruct();
/******************************************************************************* /*******************************************************************************
* 连接信号与槽 * * 连接信号与槽 *
*******************************************************************************/ *******************************************************************************/
@ -362,9 +382,9 @@ void MainWindow::on_TTLOutputMoudle_Update_clicked() {
int32_t ID = // int32_t ID = //
ui->TTLOutputMoudle_ID->currentText().toInt(); ui->TTLOutputMoudle_ID->currentText().toInt();
auto InputSigType = // auto InputSigType = //
xsync_internal_signal::str_to_signal_type(ui->TTLOutputMoudle_InputSigType->currentText().toStdString());
ttlout_module::Str2TriggerSigType(ui->TTLOutputMoudle_InputSigType->currentText().toStdString());
auto OutputSigType = // auto OutputSigType = //
xsync_ttlout_module::str_to_output_signal_type(ui->TTLOutputMoudle_OutputSigType->currentText().toStdString());
ttlout_module::Str2OutputSigType(ui->TTLOutputMoudle_OutputSigType->currentText().toStdString());
uint32_t TriggerModePulseWidth = // uint32_t TriggerModePulseWidth = //
ui->TTLOutputMoudle_TriggerModePulseWidth->text().toUInt(); ui->TTLOutputMoudle_TriggerModePulseWidth->text().toUInt();
uint32_t TriggerModePulseDelay = // uint32_t TriggerModePulseDelay = //
@ -380,8 +400,8 @@ void MainWindow::on_TTLOutputMoudle_Update_clicked() {
} }
void MainWindow::on_TTLOutputMoudle_Read_clicked() { void MainWindow::on_TTLOutputMoudle_Read_clicked() {
xsync_internal_signal::signal_type_t InputSigType;
xsync_ttlout_module::output_signal_type_t OutputSigType;
ttlout_module::TriggerSigType_t InputSigType;
ttlout_module::OutputSigType_t OutputSigType;
uint32_t TriggerModePulseWidth; uint32_t TriggerModePulseWidth;
uint32_t TriggerModePulseDelay; uint32_t TriggerModePulseDelay;
@ -393,8 +413,8 @@ void MainWindow::on_TTLOutputMoudle_Read_clicked() {
DO_XSYNC_FUNC(Xsync::Ins().TTLOutputModule_getTriggerModePulseWidth(ID, TriggerModePulseWidth)); DO_XSYNC_FUNC(Xsync::Ins().TTLOutputModule_getTriggerModePulseWidth(ID, TriggerModePulseWidth));
DO_XSYNC_FUNC(Xsync::Ins().TTLOutputModule_getTriggerModePulseDelay(ID, TriggerModePulseDelay)); DO_XSYNC_FUNC(Xsync::Ins().TTLOutputModule_getTriggerModePulseDelay(ID, TriggerModePulseDelay));
ui->TTLOutputMoudle_InputSigType->setCurrentText(QString::fromStdString(xsync_internal_signal::signal_type_to_str(InputSigType)));
ui->TTLOutputMoudle_OutputSigType->setCurrentText(QString::fromStdString(xsync_ttlout_module::output_signal_type_to_str(OutputSigType)));
ui->TTLOutputMoudle_InputSigType->setCurrentText(QString::fromStdString(ttlout_module::TriggerSigType2Str(InputSigType)));
ui->TTLOutputMoudle_OutputSigType->setCurrentText(QString::fromStdString(ttlout_module::OutputSigType2Str(OutputSigType)));
ui->TTLOutputMoudle_TriggerModePulseWidth->setText(QString::number(TriggerModePulseWidth)); ui->TTLOutputMoudle_TriggerModePulseWidth->setText(QString::number(TriggerModePulseWidth));
ui->TTLOutputMoudle_TriggerModePulseDelay->setText(QString::number(TriggerModePulseDelay)); ui->TTLOutputMoudle_TriggerModePulseDelay->setText(QString::number(TriggerModePulseDelay));
} }

2
mainwindow.h
View File

@ -112,5 +112,7 @@ class MainWindow : public QMainWindow {
private: private:
void mainWindowsRun(); void mainWindowsRun();
void updateUI_timeCodeInfo(uint32_t regoff); void updateUI_timeCodeInfo(uint32_t regoff);
void UI_TTLOutputMoudleConstruct();
}; };
#endif // MAINWINDOW_H #endif // MAINWINDOW_H

139
mainwindow.ui
View File

@ -400,28 +400,8 @@
</rect> </rect>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number>
<number>-1</number>
</property> </property>
<item>
<property name="text">
<string notr="true">1</string>
</property>
</item>
<item>
<property name="text">
<string>2</string>
</property>
</item>
<item>
<property name="text">
<string>3</string>
</property>
</item>
<item>
<property name="text">
<string>4</string>
</property>
</item>
</widget> </widget>
<widget class="QComboBox" name="TTLOutputMoudle_InputSigType"> <widget class="QComboBox" name="TTLOutputMoudle_InputSigType">
<property name="geometry"> <property name="geometry">
@ -433,88 +413,8 @@
</rect> </rect>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>1</number>
</property>
<item>
<property name="text">
<string>level0</string>
</property>
</item>
<item>
<property name="text">
<string>level1</string>
</property>
</item>
<item>
<property name="text">
<string>ttlin1_module_raw_sig</string>
</property>
</item>
<item>
<property name="text">
<string>ttlin1_module_sig_divide</string>
</property>
</item>
<item>
<property name="text">
<string>ttlin2_module_raw_sig</string>
</property>
</item>
<item>
<property name="text">
<string>ttlin2_module_sig_divide</string>
</property>
</item>
<item>
<property name="text">
<string>ttlin3_module_raw_sig</string>
</property>
</item>
<item>
<property name="text">
<string>ttlin3_module_sig_divide</string>
</property>
</item>
<item>
<property name="text">
<string>ttlin4_module_raw_sig</string>
</property>
</item>
<item>
<property name="text">
<string>ttlin4_module_sig_divide</string>
</property>
</item>
<item>
<property name="text">
<string>genlockin_module_freq_sig</string>
</property>
</item>
<item>
<property name="text">
<string>timecodein_module_trigger_sig</string>
</property>
</item>
<item>
<property name="text">
<string>internal_camera_sync_sig</string>
<number>-1</number>
</property> </property>
</item>
<item>
<property name="text">
<string>internal_timecode_trigger_sig</string>
</property>
</item>
<item>
<property name="text">
<string>internal_genlock_freq_sig</string>
</property>
</item>
<item>
<property name="text">
<string>internal_work_state_sig</string>
</property>
</item>
</widget> </widget>
<widget class="QComboBox" name="TTLOutputMoudle_OutputSigType"> <widget class="QComboBox" name="TTLOutputMoudle_OutputSigType">
<property name="geometry"> <property name="geometry">
@ -525,41 +425,6 @@
<height>31</height> <height>31</height>
</rect> </rect>
</property> </property>
<item>
<property name="text">
<string>level0</string>
</property>
</item>
<item>
<property name="text">
<string>level1</string>
</property>
</item>
<item>
<property name="text">
<string>test_signal</string>
</property>
</item>
<item>
<property name="text">
<string>input_signal</string>
</property>
</item>
<item>
<property name="text">
<string>input_signal_mirror</string>
</property>
</item>
<item>
<property name="text">
<string>trigger_mode_signal</string>
</property>
</item>
<item>
<property name="text">
<string>trigger_mode_signal_mirror</string>
</property>
</item>
</widget> </widget>
<widget class="QLineEdit" name="TTLOutputMoudle_TriggerModePulseWidth"> <widget class="QLineEdit" name="TTLOutputMoudle_TriggerModePulseWidth">
<property name="geometry"> <property name="geometry">

1
src/xsync_udp_factory_impl.cpp
View File

@ -12,6 +12,7 @@
#endif #endif
#define TAG "XSYNC_UDP" #define TAG "XSYNC_UDP"
#pragma comment(lib, "ws2_32") #pragma comment(lib, "ws2_32")
using namespace xsync;
using namespace iflytop; using namespace iflytop;
/******************************************************************************* /*******************************************************************************

4
src/xsync_udp_factory_impl.hpp
View File

@ -11,7 +11,7 @@
#include <vector> #include <vector>
#include "libxsync\xsync.hpp" #include "libxsync\xsync.hpp"
namespace iflytop {
namespace xsync {
using namespace std; using namespace std;
class XSyncUdpFactoryImpl : public I_XSUDPFactory { class XSyncUdpFactoryImpl : public I_XSUDPFactory {
@ -26,4 +26,4 @@ class XSyncUdpFactoryImpl : public I_XSUDPFactory {
virtual shared_ptr<I_XSUDP> createXSUDP() override; virtual shared_ptr<I_XSUDP> createXSUDP() override;
}; };
} // namespace iflytop
} // namespace xsync

2
src/zqthread.hpp
View File

@ -34,4 +34,4 @@ class ZQThread : public QThread {
virtual void run() override; virtual void run() override;
}; };
} // namespace iflytop
} // namespace xsync
Write Preview
Loading…
Cancel
Save