ztools
/
pluse_genertor_tools_v2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

V17

master
zhaohe 1 year ago
parent
89d5ba2333
commit
bdf1202548
4 changed files with 155 additions and 69 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. 210
      mainwindow.cpp
  2. 10
      mainwindow.ui
  3. 2
      src/camera_light_src_timing_controller/clst_controler.cpp
  4. 2
      src/version.h

210
mainwindow.cpp
View File

@ -243,14 +243,14 @@ void MainWindow::refreshReadonlyPage1() {
float inperiodus;
float outperiodus;
#define UPDATE(index) \
#define UPDATE(index) \
DO_NO_RET_AND_NOLOG(m_clstc->TriInX_readInSignalPeriodUs(index, inperiodus)); \
DO_NO_RET_AND_NOLOG(m_clstc->TriInX_readOutSignalPeriodUs(index, outperiodus)); \
{ \
{ \
emit doinui_signal(QFunction([this, inperiodus, outperiodus]() { \
ui->TriInX_OutSignalPeriodUs_Val_##index->setText(QString::number(outperiodus, 'f', 1)); \
ui->TriInX_InSignalPeriodUs_Val_##index->setText(QString::number(inperiodus, 'f', 1)); \
})); \
})); \
}
UPDATE(1);
UPDATE(2);
@ -271,16 +271,16 @@ void MainWindow::refreshReadonlyPage2() {
float outperiodus;
uint32_t state;
#define UPDATE(index) \
#define UPDATE(index) \
DO_NO_RET_AND_NOLOG(m_clstc->LightSrcX_readInSigPeriodUsDetect(index, inperiodus)); \
DO_NO_RET_AND_NOLOG(m_clstc->LightSrcX_readOutSigPeriodUsDetect(index, outperiodus)); \
DO_NO_RET_AND_NOLOG(m_clstc->LightSrcX_readLightSrcErrorState(index, state)); \
{ \
DO_NO_RET_AND_NOLOG(m_clstc->LightSrcX_readLightSrcErrorState(index, state)); \
{ \
emit doinui_signal(QFunction([this, inperiodus, outperiodus, state]() { \
ui->LightSrcX_InSigPeriodUsDetect_##index->setText(QString::number(inperiodus, 'f', 1)); \
ui->LightSrcX_OutSigPeriodUsDetect_##index->setText(QString::number(outperiodus, 'f', 1)); \
ui->LightSrcX_LightSrcErrorState_##index->setText(QString::number(state)); \
})); \
ui->LightSrcX_LightSrcErrorState_##index->setText(QString::number(state)); \
})); \
}
UPDATE(1);
@ -605,38 +605,21 @@ void MainWindow::constructUI() {
* 外部触发页面初始化 *
*******************************************************************************/
ui->TriInX_SrcSelect_Val_1->addItem(QString::fromStdString(ExtTriggerSrcType(ExtTriggerSrcType::DIFF_INPUT).toString()));
ui->TriInX_SrcSelect_Val_1->addItem(QString::fromStdString(ExtTriggerSrcType(ExtTriggerSrcType::OPTOCOUPLER_INPUT).toString()));
ui->TriInX_SrcSelect_Val_1->addItem(QString::fromStdString(ExtTriggerSrcType(ExtTriggerSrcType::INTERNAL_CLK).toString()));
ui->TriInX_Mode_Val_1->addItem(QString::fromStdString(SigProcessMode(SigProcessMode::TRIGGER_MODE).toString()));
ui->TriInX_Mode_Val_1->addItem(QString::fromStdString(SigProcessMode(SigProcessMode::TRANSPARENT_MODE).toString()));
ui->TriInX_TriggerModeTriggerEdge_Val_1->addItem(QString::fromStdString(TriggerEdge(TriggerEdge::RISING).toString()));
ui->TriInX_TriggerModeTriggerEdge_Val_1->addItem(QString::fromStdString(TriggerEdge(TriggerEdge::FALLING).toString()));
ui->TriInX_SrcSelect_Val_2->addItem(QString::fromStdString(ExtTriggerSrcType(ExtTriggerSrcType::DIFF_INPUT).toString()));
ui->TriInX_SrcSelect_Val_2->addItem(QString::fromStdString(ExtTriggerSrcType(ExtTriggerSrcType::OPTOCOUPLER_INPUT).toString()));
ui->TriInX_SrcSelect_Val_2->addItem(QString::fromStdString(ExtTriggerSrcType(ExtTriggerSrcType::INTERNAL_CLK).toString()));
ui->TriInX_Mode_Val_2->addItem(QString::fromStdString(SigProcessMode(SigProcessMode::TRIGGER_MODE).toString()));
ui->TriInX_Mode_Val_2->addItem(QString::fromStdString(SigProcessMode(SigProcessMode::TRANSPARENT_MODE).toString()));
ui->TriInX_TriggerModeTriggerEdge_Val_2->addItem(QString::fromStdString(TriggerEdge(TriggerEdge::RISING).toString()));
ui->TriInX_TriggerModeTriggerEdge_Val_2->addItem(QString::fromStdString(TriggerEdge(TriggerEdge::FALLING).toString()));
ui->TriInX_SrcSelect_Val_3->addItem(QString::fromStdString(ExtTriggerSrcType(ExtTriggerSrcType::DIFF_INPUT).toString()));
ui->TriInX_SrcSelect_Val_3->addItem(QString::fromStdString(ExtTriggerSrcType(ExtTriggerSrcType::OPTOCOUPLER_INPUT).toString()));
ui->TriInX_SrcSelect_Val_3->addItem(QString::fromStdString(ExtTriggerSrcType(ExtTriggerSrcType::INTERNAL_CLK).toString()));
ui->TriInX_Mode_Val_3->addItem(QString::fromStdString(SigProcessMode(SigProcessMode::TRIGGER_MODE).toString()));
ui->TriInX_Mode_Val_3->addItem(QString::fromStdString(SigProcessMode(SigProcessMode::TRANSPARENT_MODE).toString()));
ui->TriInX_TriggerModeTriggerEdge_Val_3->addItem(QString::fromStdString(TriggerEdge(TriggerEdge::RISING).toString()));
ui->TriInX_TriggerModeTriggerEdge_Val_3->addItem(QString::fromStdString(TriggerEdge(TriggerEdge::FALLING).toString()));
ui->TriInX_SrcSelect_Val_4->addItem(QString::fromStdString(ExtTriggerSrcType(ExtTriggerSrcType::DIFF_INPUT).toString()));
ui->TriInX_SrcSelect_Val_4->addItem(QString::fromStdString(ExtTriggerSrcType(ExtTriggerSrcType::OPTOCOUPLER_INPUT).toString()));
ui->TriInX_SrcSelect_Val_4->addItem(QString::fromStdString(ExtTriggerSrcType(ExtTriggerSrcType::INTERNAL_CLK).toString()));
ui->TriInX_Mode_Val_4->addItem(QString::fromStdString(SigProcessMode(SigProcessMode::TRIGGER_MODE).toString()));
ui->TriInX_Mode_Val_4->addItem(QString::fromStdString(SigProcessMode(SigProcessMode::TRANSPARENT_MODE).toString()));
ui->TriInX_TriggerModeTriggerEdge_Val_4->addItem(QString::fromStdString(TriggerEdge(TriggerEdge::RISING).toString()));
@ -656,41 +639,6 @@ void MainWindow::constructUI() {
* 光源时序配置 *
*******************************************************************************/
QStringList LightSrcX_TriSrc_QStringList;
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::LOGIC0).toString()));
// LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::LOGIC1).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::INTERNAL_TRIGGER).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_1).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_2).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_3).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_4).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::INTERNAL_TRIGGER_I1).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::INTERNAL_TRIGGER_I2).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::INTERNAL_TRIGGER_I3).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::INTERNAL_TRIGGER_I4).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_1_I1).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_1_I2).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_1_I3).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_1_I4).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_2_I1).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_2_I2).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_2_I3).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_2_I4).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_3_I1).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_3_I2).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_3_I3).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_3_I4).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_4_I1).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_4_I2).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_4_I3).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_4_I4).toString()));
ui->LightSrcX_TriSrc_1->addItems(LightSrcX_TriSrc_QStringList);
ui->LightSrcX_TriSrc_2->addItems(LightSrcX_TriSrc_QStringList);
ui->LightSrcX_TriSrc_3->addItems(LightSrcX_TriSrc_QStringList);
ui->LightSrcX_TriSrc_4->addItems(LightSrcX_TriSrc_QStringList);
ui->LightSrcX_InSigPeriodUsDetect_1->setDisabled(true);
ui->LightSrcX_InSigPeriodUsDetect_2->setDisabled(true);
ui->LightSrcX_InSigPeriodUsDetect_3->setDisabled(true);
@ -725,11 +673,6 @@ void MainWindow::constructUI() {
ui->ShutterX_OutputCtrlMode_3->addItem(QString::fromStdString(SigProcessMode(SigProcessMode::BIND_MODE).toString()));
ui->ShutterX_OutputCtrlMode_4->addItem(QString::fromStdString(SigProcessMode(SigProcessMode::BIND_MODE).toString()));
ui->ShutterX_InSigSelect_1->addItems(LightSrcX_TriSrc_QStringList);
ui->ShutterX_InSigSelect_2->addItems(LightSrcX_TriSrc_QStringList);
ui->ShutterX_InSigSelect_3->addItems(LightSrcX_TriSrc_QStringList);
ui->ShutterX_InSigSelect_4->addItems(LightSrcX_TriSrc_QStringList);
ui->InterClk_TriOutSignalFreq_Text->setDisabled(true);
}
@ -794,6 +737,84 @@ void MainWindow::enterProfessionalModel() {
ui->LOGBOX->show();
ui->RegOpeation->show();
ui->InterClk_PluseCnt_Lable->show();
ui->InterClk_PluseCnt_Text->show();
ui->InterClk_SeqCtrlPluseCntMax_Lable->show();
ui->InterClk_SeqCtrlPluseCntMax_Text->show();
ui->TriInX_SequentialControlPluseCntMax_Lable_1->show();
ui->TriInX_SequentialControlPluseCntMax_Lable_2->show();
ui->TriInX_SequentialControlPluseCntMax_Lable_3->show();
ui->TriInX_SequentialControlPluseCntMax_Lable_4->show();
ui->TriInX_SequentialControlPluseCntMax_Val_1->show();
ui->TriInX_SequentialControlPluseCntMax_Val_2->show();
ui->TriInX_SequentialControlPluseCntMax_Val_3->show();
ui->TriInX_SequentialControlPluseCntMax_Val_4->show();
QStringList TriInX_SrcSelect_Val_xList = QStringList();
TriInX_SrcSelect_Val_xList.append(QString::fromStdString(ExtTriggerSrcType(ExtTriggerSrcType::DIFF_INPUT).toString()));
TriInX_SrcSelect_Val_xList.append(QString::fromStdString(ExtTriggerSrcType(ExtTriggerSrcType::OPTOCOUPLER_INPUT).toString()));
TriInX_SrcSelect_Val_xList.append(QString::fromStdString(ExtTriggerSrcType(ExtTriggerSrcType::INTERNAL_CLK).toString()));
ui->TriInX_SrcSelect_Val_1->clear();
ui->TriInX_SrcSelect_Val_2->clear();
ui->TriInX_SrcSelect_Val_3->clear();
ui->TriInX_SrcSelect_Val_4->clear();
ui->TriInX_SrcSelect_Val_1->addItems(TriInX_SrcSelect_Val_xList);
ui->TriInX_SrcSelect_Val_2->addItems(TriInX_SrcSelect_Val_xList);
ui->TriInX_SrcSelect_Val_3->addItems(TriInX_SrcSelect_Val_xList);
ui->TriInX_SrcSelect_Val_4->addItems(TriInX_SrcSelect_Val_xList);
QStringList LightSrcX_TriSrc_QStringList;
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::LOGIC0).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::INTERNAL_TRIGGER).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_1).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_2).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_3).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_4).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::INTERNAL_TRIGGER_I1).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::INTERNAL_TRIGGER_I2).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::INTERNAL_TRIGGER_I3).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::INTERNAL_TRIGGER_I4).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_1_I1).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_1_I2).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_1_I3).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_1_I4).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_2_I1).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_2_I2).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_2_I3).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_2_I4).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_3_I1).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_3_I2).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_3_I3).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_3_I4).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_4_I1).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_4_I2).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_4_I3).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_4_I4).toString()));
ui->LightSrcX_TriSrc_1->clear();
ui->LightSrcX_TriSrc_2->clear();
ui->LightSrcX_TriSrc_3->clear();
ui->LightSrcX_TriSrc_4->clear();
ui->ShutterX_InSigSelect_1->clear();
ui->ShutterX_InSigSelect_2->clear();
ui->ShutterX_InSigSelect_3->clear();
ui->ShutterX_InSigSelect_4->clear();
ui->LightSrcX_TriSrc_1->addItems(LightSrcX_TriSrc_QStringList);
ui->LightSrcX_TriSrc_2->addItems(LightSrcX_TriSrc_QStringList);
ui->LightSrcX_TriSrc_3->addItems(LightSrcX_TriSrc_QStringList);
ui->LightSrcX_TriSrc_4->addItems(LightSrcX_TriSrc_QStringList);
ui->ShutterX_InSigSelect_1->addItems(LightSrcX_TriSrc_QStringList);
ui->ShutterX_InSigSelect_2->addItems(LightSrcX_TriSrc_QStringList);
ui->ShutterX_InSigSelect_3->addItems(LightSrcX_TriSrc_QStringList);
ui->ShutterX_InSigSelect_4->addItems(LightSrcX_TriSrc_QStringList);
}
void MainWindow::exitProfessionalModel() {
ui->refreshPageKey->hide();
@ -856,6 +877,64 @@ void MainWindow::exitProfessionalModel() {
ui->LOGBOX->hide();
ui->RegOpeation->hide();
ui->InterClk_PluseCnt_Lable->hide();
ui->InterClk_PluseCnt_Text->hide();
ui->InterClk_SeqCtrlPluseCntMax_Lable->hide();
ui->InterClk_SeqCtrlPluseCntMax_Text->hide();
ui->TriInX_SequentialControlPluseCntMax_Lable_1->hide();
ui->TriInX_SequentialControlPluseCntMax_Lable_2->hide();
ui->TriInX_SequentialControlPluseCntMax_Lable_3->hide();
ui->TriInX_SequentialControlPluseCntMax_Lable_4->hide();
ui->TriInX_SequentialControlPluseCntMax_Val_1->hide();
ui->TriInX_SequentialControlPluseCntMax_Val_2->hide();
ui->TriInX_SequentialControlPluseCntMax_Val_3->hide();
ui->TriInX_SequentialControlPluseCntMax_Val_4->hide();
QStringList TriInX_SrcSelect_Val_xList = QStringList();
TriInX_SrcSelect_Val_xList.append(QString::fromStdString(ExtTriggerSrcType(ExtTriggerSrcType::DIFF_INPUT).toString()));
TriInX_SrcSelect_Val_xList.append(QString::fromStdString(ExtTriggerSrcType(ExtTriggerSrcType::OPTOCOUPLER_INPUT).toString()));
// TriInX_SrcSelect_Val_xList.append(QString::fromStdString(ExtTriggerSrcType(ExtTriggerSrcType::INTERNAL_CLK).toString()));
ui->TriInX_SrcSelect_Val_1->clear();
ui->TriInX_SrcSelect_Val_2->clear();
ui->TriInX_SrcSelect_Val_3->clear();
ui->TriInX_SrcSelect_Val_4->clear();
ui->TriInX_SrcSelect_Val_1->addItems(TriInX_SrcSelect_Val_xList);
ui->TriInX_SrcSelect_Val_2->addItems(TriInX_SrcSelect_Val_xList);
ui->TriInX_SrcSelect_Val_3->addItems(TriInX_SrcSelect_Val_xList);
ui->TriInX_SrcSelect_Val_4->addItems(TriInX_SrcSelect_Val_xList);
QStringList LightSrcX_TriSrc_QStringList;
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::LOGIC0).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::INTERNAL_TRIGGER).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_1).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_2).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_3).toString()));
LightSrcX_TriSrc_QStringList.append(QString::fromStdString(InternalSig(InternalSig::EXT_TRIGGER_4).toString()));
ui->LightSrcX_TriSrc_1->clear();
ui->LightSrcX_TriSrc_2->clear();
ui->LightSrcX_TriSrc_3->clear();
ui->LightSrcX_TriSrc_4->clear();
ui->ShutterX_InSigSelect_1->clear();
ui->ShutterX_InSigSelect_2->clear();
ui->ShutterX_InSigSelect_3->clear();
ui->ShutterX_InSigSelect_4->clear();
ui->LightSrcX_TriSrc_1->addItems(LightSrcX_TriSrc_QStringList);
ui->LightSrcX_TriSrc_2->addItems(LightSrcX_TriSrc_QStringList);
ui->LightSrcX_TriSrc_3->addItems(LightSrcX_TriSrc_QStringList);
ui->LightSrcX_TriSrc_4->addItems(LightSrcX_TriSrc_QStringList);
ui->ShutterX_InSigSelect_1->addItems(LightSrcX_TriSrc_QStringList);
ui->ShutterX_InSigSelect_2->addItems(LightSrcX_TriSrc_QStringList);
ui->ShutterX_InSigSelect_3->addItems(LightSrcX_TriSrc_QStringList);
ui->ShutterX_InSigSelect_4->addItems(LightSrcX_TriSrc_QStringList);
}
MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) {
@ -877,6 +956,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
// qInstallMessageHandler(log_output);
connect(this, SIGNAL(doinui_signal(QFunction)), this, SLOT(doinui_slot(QFunction)));
constructUI();
exitProfessionalModel();
// setWindowIcon(QIcon(QApplication::applicationDirPath() + "/logo.png"));
// 隐藏部分控件

10
mainwindow.ui
View File

@ -17,7 +17,7 @@
</sizepolicy>
</property>
<property name="windowTitle">
<string>相机光源和时序控制器V15</string>
<string>相机光源和时序控制器V17</string>
</property>
<property name="styleSheet">
<string notr="true">/*
@ -1226,7 +1226,7 @@ QGroupBox:title {
</size>
</property>
<property name="currentIndex">
<number>0</number>
<number>4</number>
</property>
<property name="tabBarAutoHide">
<bool>true</bool>
@ -5266,7 +5266,11 @@ border-width:0;border-style:outset</string>
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'SimSun'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Consolas','Courier New','monospace'; font-size:11pt; font-weight:600; color:#ff0000;&quot;&gt;PC-VERSION&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Consolas','Courier New','monospace'; font-size:11pt; font-weight:600; color:#ff0000;&quot;&gt;PC-VERSION &lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Consolas','Courier New','monospace'; font-size:11pt; font-weight:600; color:#ff0000;&quot;&gt; V17:&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Consolas','Courier New','monospace'; font-size:11pt; font-weight:600; color:#ff0000;&quot;&gt; 1.简化配置页面逻辑&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Consolas','Courier New','monospace'; font-size:11pt; font-weight:600; color:#ff0000;&quot;&gt; V16:&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Consolas','Courier New','monospace'; font-size:11pt; font-weight:600; color:#ff0000;&quot;&gt; 1.修改光源亮度映射关系&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Consolas','Courier New','monospace'; font-size:11pt; font-weight:600; color:#ff0000;&quot;&gt; V15:&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Consolas','Courier New','monospace'; font-size:11pt; font-weight:600; color:#ff0000;&quot;&gt; 1.修正周期探测数值波动的BUG&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Consolas','Courier New','monospace'; font-size:11pt; font-weight:600; color:#ff0000;&quot;&gt; V14:&lt;/span&gt;&lt;/p&gt;

2
src/camera_light_src_timing_controller/clst_controler.cpp
View File

@ -598,6 +598,7 @@ zaf_error_code_t CLSTControler::LightSrcX_setTriggerModeFirstPluseOffset(int32_t
}
zaf_error_code_t CLSTControler::LightSrcX_setLightIntensityDuty(int32_t index, float duty) { //
if (index < 1 || index > 4) return kaf_ec_param_error;
duty=duty*0.4;
uint32_t freqcnt = 0;
DO_CMD(reg_read(kreg_light_ctrol_module1_light_driver_freq_cnt + (index - 1) * 32, freqcnt));
@ -655,6 +656,7 @@ zaf_error_code_t CLSTControler::LightSrcX_getLightIntensityDuty(int32_t index, f
DO_CMD(reg_read(kreg_light_ctrol_module1_light_intensity_cnt + (index - 1) * 32, cnt));
duty = (cnt * 100.0 / freqcnt);
duty=duty/0.4;
return kaf_ec_success;
}

2
src/version.h
View File

@ -1,4 +1,4 @@
#pragma once
#define VERSION 15
#define VERSION 17
#define MAUFACTURER "iflytop"
Write Preview
Loading…
Cancel
Save