diff --git a/libxsync b/libxsync
index b821d5a..5d0eb6f 160000
--- a/libxsync
+++ b/libxsync
@@ -1 +1 @@
-Subproject commit b821d5a4a5c43eee223df3a75845f22cefd46441
+Subproject commit 5d0eb6fcc626df90938927b50280699f90604bfb
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 1d10263..b292642 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -6,6 +6,7 @@
#include "./ui_mainwindow.h"
using namespace iflytop;
+using namespace xsync;
using namespace std;
static MainWindow *m_mainWindow;
@@ -226,6 +227,23 @@ void MainWindow::construct_reg_table() { //
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) {
ui->setupUi(this);
m_mainWindow = this;
@@ -235,6 +253,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
*/
construct_reg_table();
qInstallMessageHandler(log_output);
+ UI_TTLOutputMoudleConstruct();
+
/*******************************************************************************
* 连接信号与槽 *
*******************************************************************************/
@@ -362,9 +382,9 @@ void MainWindow::on_TTLOutputMoudle_Update_clicked() {
int32_t ID = //
ui->TTLOutputMoudle_ID->currentText().toInt();
auto InputSigType = //
- xsync_internal_signal::str_to_signal_type(ui->TTLOutputMoudle_InputSigType->currentText().toStdString());
+ ttlout_module::Str2TriggerSigType(ui->TTLOutputMoudle_InputSigType->currentText().toStdString());
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 = //
ui->TTLOutputMoudle_TriggerModePulseWidth->text().toUInt();
uint32_t TriggerModePulseDelay = //
@@ -380,10 +400,10 @@ void MainWindow::on_TTLOutputMoudle_Update_clicked() {
}
void MainWindow::on_TTLOutputMoudle_Read_clicked() {
- xsync_internal_signal::signal_type_t InputSigType;
- xsync_ttlout_module::output_signal_type_t OutputSigType;
- uint32_t TriggerModePulseWidth;
- uint32_t TriggerModePulseDelay;
+ ttlout_module::TriggerSigType_t InputSigType;
+ ttlout_module::OutputSigType_t OutputSigType;
+ uint32_t TriggerModePulseWidth;
+ uint32_t TriggerModePulseDelay;
int32_t ID = //
ui->TTLOutputMoudle_ID->currentText().toInt();
@@ -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_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_TriggerModePulseDelay->setText(QString::number(TriggerModePulseDelay));
}
\ No newline at end of file
diff --git a/mainwindow.h b/mainwindow.h
index 7ac61b6..e5346d5 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -112,5 +112,7 @@ class MainWindow : public QMainWindow {
private:
void mainWindowsRun();
void updateUI_timeCodeInfo(uint32_t regoff);
+
+ void UI_TTLOutputMoudleConstruct();
};
#endif // MAINWINDOW_H
diff --git a/mainwindow.ui b/mainwindow.ui
index 8450bcf..d2d5f21 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -400,28 +400,8 @@
- 0
+ -1
- -
-
- 1
-
-
- -
-
- 2
-
-
- -
-
- 3
-
-
- -
-
- 4
-
-
@@ -433,88 +413,8 @@
- 1
+ -1
- -
-
- level0
-
-
- -
-
- level1
-
-
- -
-
- ttlin1_module_raw_sig
-
-
- -
-
- ttlin1_module_sig_divide
-
-
- -
-
- ttlin2_module_raw_sig
-
-
- -
-
- ttlin2_module_sig_divide
-
-
- -
-
- ttlin3_module_raw_sig
-
-
- -
-
- ttlin3_module_sig_divide
-
-
- -
-
- ttlin4_module_raw_sig
-
-
- -
-
- ttlin4_module_sig_divide
-
-
- -
-
- genlockin_module_freq_sig
-
-
- -
-
- timecodein_module_trigger_sig
-
-
- -
-
- internal_camera_sync_sig
-
-
- -
-
- internal_timecode_trigger_sig
-
-
- -
-
- internal_genlock_freq_sig
-
-
- -
-
- internal_work_state_sig
-
-
@@ -525,41 +425,6 @@
31
- -
-
- level0
-
-
- -
-
- level1
-
-
- -
-
- test_signal
-
-
- -
-
- input_signal
-
-
- -
-
- input_signal_mirror
-
-
- -
-
- trigger_mode_signal
-
-
- -
-
- trigger_mode_signal_mirror
-
-
diff --git a/src/xsync_udp_factory_impl.cpp b/src/xsync_udp_factory_impl.cpp
index e23e791..2fb937c 100644
--- a/src/xsync_udp_factory_impl.cpp
+++ b/src/xsync_udp_factory_impl.cpp
@@ -12,6 +12,7 @@
#endif
#define TAG "XSYNC_UDP"
#pragma comment(lib, "ws2_32")
+using namespace xsync;
using namespace iflytop;
/*******************************************************************************
diff --git a/src/xsync_udp_factory_impl.hpp b/src/xsync_udp_factory_impl.hpp
index 049eb6e..ece8993 100644
--- a/src/xsync_udp_factory_impl.hpp
+++ b/src/xsync_udp_factory_impl.hpp
@@ -11,7 +11,7 @@
#include
#include "libxsync\xsync.hpp"
-namespace iflytop {
+namespace xsync {
using namespace std;
class XSyncUdpFactoryImpl : public I_XSUDPFactory {
@@ -26,4 +26,4 @@ class XSyncUdpFactoryImpl : public I_XSUDPFactory {
virtual shared_ptr createXSUDP() override;
};
-} // namespace iflytop
\ No newline at end of file
+} // namespace xsync
\ No newline at end of file
diff --git a/src/zqthread.hpp b/src/zqthread.hpp
index 938d76e..a35a267 100644
--- a/src/zqthread.hpp
+++ b/src/zqthread.hpp
@@ -34,4 +34,4 @@ class ZQThread : public QThread {
virtual void run() override;
};
-} // namespace iflytop
\ No newline at end of file
+} // namespace xsync
\ No newline at end of file