diff --git a/CMakeLists.txt.user b/CMakeLists.txt.user index 528aad8..8bd1465 100644 --- a/CMakeLists.txt.user +++ b/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -94,7 +94,7 @@ Desktop Qt 5.12.12 MinGW 64-bit Desktop Qt 5.12.12 MinGW 64-bit qt.qt5.51212.win64_mingw73_kit - 0 + 2 0 0 @@ -262,7 +262,7 @@ true false true - D:/workspace/p_camera_light_source_timing_controller/build-camera_light_src_timing_controller_pc-Desktop_Qt_5_12_12_MinGW_64_bit-Debug + D:/workspace/p_camera_light_source_timing_controller/build-camera_light_src_timing_controller_pc-Desktop_Qt_5_12_12_MinGW_64_bit-Release 1 diff --git a/mainwindow.cpp b/mainwindow.cpp index f5b9818..8990517 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -109,7 +109,7 @@ void MainWindow::updatePage() { uint32_t division; uint32_t multiplication; uint32_t cnt; -// TriInX_setSequentialControlPluseCntMax + // TriInX_setSequentialControlPluseCntMax #define UPDATE(index) \ src = ExtTriggerSrcType(ui->TriInX_SrcSelect_Val_##index->currentText().toStdString()); \ @@ -126,7 +126,7 @@ void MainWindow::updatePage() { DO(m_clstc->TriInX_setMode(index, mode)); \ DO(m_clstc->TriInX_setTriggerModeTriggerEdge(index, edge)); \ DO(m_clstc->TriInX_setTriggerModeFreqDivision(index, division)); \ - DO(m_clstc->TriInX_setTriggerModeFreqMultiplication(index, multiplication));\ + DO(m_clstc->TriInX_setTriggerModeFreqMultiplication(index, multiplication)); \ DO(m_clstc->TriInX_setSequentialControlPluseCntMax(index, cnt)); UPDATE(1); @@ -497,6 +497,7 @@ void MainWindow::constructUI() { refreshPage(); dumpLog("刷新成功"); displayInfo(true, "刷新成功"); + QMessageBox::about(NULL, "消息", "刷新成功"); }); @@ -505,6 +506,7 @@ void MainWindow::constructUI() { refreshPage(); dumpLog("提交成功"); displayInfo(true, "提交成功"); + QMessageBox::about(NULL, "消息", "提交成功"); }); @@ -515,6 +517,7 @@ void MainWindow::constructUI() { DO(m_clstc->storageConfigs()); dumpLog("保存配置成功"); displayInfo(true, "保存配置成功"); + QMessageBox::about(NULL, "消息", "保存配置成功"); }); @@ -525,6 +528,8 @@ void MainWindow::constructUI() { DO(m_clstc->reboot()); dumpLog("重启设备成功"); displayInfo(true, "重启设备成功"); + QMessageBox::about(NULL, "消息", "重启设备成功"); + }); /******************************************************************************* @@ -534,7 +539,7 @@ void MainWindow::constructUI() { DO(m_clstc->factoryReset()); dumpLog("恢复出厂设置成功"); displayInfo(true, "恢复出厂设置成功"); - + QMessageBox::about(NULL, "消息", "恢复出厂设置成功"); }); /******************************************************************************* @@ -663,10 +668,10 @@ void MainWindow::constructUI() { ui->LightSrcX_LightSrcErrorState_3->setDisabled(true); ui->LightSrcX_LightSrcErrorState_4->setDisabled(true); - ui->LightSrcX_LightDriverFreq_1->setDisabled(true); - ui->LightSrcX_LightDriverFreq_2->setDisabled(true); - ui->LightSrcX_LightDriverFreq_3->setDisabled(true); - ui->LightSrcX_LightDriverFreq_4->setDisabled(true); + ui->LightSrcX_LightDriverFreq_1->setDisabled(false); + ui->LightSrcX_LightDriverFreq_2->setDisabled(false); + ui->LightSrcX_LightDriverFreq_3->setDisabled(false); + ui->LightSrcX_LightDriverFreq_4->setDisabled(false); /******************************************************************************* * 快门时序配置页面 * diff --git a/mainwindow.ui b/mainwindow.ui index 84f22f5..4fc0ffd 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -449,7 +449,7 @@ - 3 + 2 true