完善RFID卡
This commit is contained in:
+16
-7
@@ -124,13 +124,6 @@ void PrintSetting::updateModelFromUI(){
|
||||
m_model.eleEyeTriggerPrintDelay = ui->spinBoxEleEyeTriggerPrintDelay->value();
|
||||
m_model.timeTriggerPrintMode = 0;
|
||||
m_model.triggerInterval = ui->spinBoxEleEyeTriggerIntervalMs->value();
|
||||
int value = 0;
|
||||
if (ui->cb_unlimited->isChecked())
|
||||
value = UINT16_MAX;
|
||||
else
|
||||
value = ui->spinBoxEleEyeTriggerRepeatCnt->value();
|
||||
|
||||
m_model.eleEyeRepeatCnt = value;
|
||||
m_model.encoderPulsePerMm = ui->lineEditTriggerPulsePerMm->text().toFloat();
|
||||
|
||||
if(ui->eleEyeEdgetTriggerExternal->isChecked() && ui->radioButtonSynTriggerExternal->isChecked()) {
|
||||
@@ -164,6 +157,14 @@ void PrintSetting::updateModelFromUI(){
|
||||
m_model.outputPulseDelayMs = ui->spinBoxOutputPulseDelayMs->value();
|
||||
m_model.OuputPulseCol = ui->spinBoxOuputPulseCol->value();
|
||||
|
||||
unsigned int value = 0;
|
||||
if (ui->cb_unlimited->isChecked())
|
||||
value = (m_model.triggerMode == PRINT_TRIGGER_SYNCHRONIZER || m_model.triggerMode == PRINT_TRIGGER_TIME) ? UINT32_MAX : UINT16_MAX;
|
||||
else
|
||||
value = ui->spinBoxEleEyeTriggerRepeatCnt->value();
|
||||
|
||||
m_model.eleEyeRepeatCnt = value;
|
||||
|
||||
// if (m_model.triggerMode == PRINT_TRIGGER_ELEC_EYE_VOLTATE_LEVEL
|
||||
// || m_model.triggerMode == PRINT_TRIGGER_ELEC_EYE_EDGE
|
||||
// || m_model.triggerMode == PRINT_TRIGGER_SYNCHRONIZER) {
|
||||
@@ -628,6 +629,12 @@ void PrintSetting::applyPrintSettingsToSysPara(bool showTip)
|
||||
PrintSettingModel::applyToSysPara(m_model, sysPara);
|
||||
|
||||
if (sysPara->devOp) {
|
||||
sysPara->devOp->writeFpgaPrintPara(false);
|
||||
|
||||
sysPara->devOp->writeSyncAndDelayPrintCount(
|
||||
m_model.triggerMode == PRINT_TRIGGER_SYNCHRONIZER || m_model.triggerMode == PRINT_TRIGGER_TIME,
|
||||
m_model.eleEyeRepeatCnt);
|
||||
|
||||
sysPara->devOp->setHighVoltageAmplitudetoSTM32();
|
||||
sysPara->devOp->writeFpgaCalandar(0);
|
||||
sysPara->devOp->writeFlightCompCtrl(ui->enbFlightCompCtrl->isChecked(),
|
||||
@@ -864,7 +871,9 @@ PrintSettingModel PrintSettingModel::fromSysPara(SysPara *sysPara)
|
||||
}
|
||||
|
||||
model.timeTriggerPrintMode = sysPara->para.timeTriggerPrintMode;
|
||||
|
||||
model.eleEyeRepeatCnt = sysPara->para.photoElectricityRepeateNum;
|
||||
|
||||
model.eleEyeTriggerPrintDelay = sysPara->para.eleEyeTriggerPrintDelay;
|
||||
model.encoderPulsePerMm = sysPara->para.synPulseNumPerMm;
|
||||
model.altMirrorType = sysPara->para.AltMirrorGap >> 12;
|
||||
|
||||
Reference in New Issue
Block a user