From 108ac397b6053c923f146c2411f756da0dca2820 Mon Sep 17 00:00:00 2001 From: "SHENG-PC\\admin" Date: Fri, 21 Nov 2025 21:48:04 +0800 Subject: [PATCH] modify bug --- radial_vibration.ui | 4 ++-- seismic_monitor.cpp | 6 ++++-- tachometer.cpp | 4 +++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/radial_vibration.ui b/radial_vibration.ui index 0328bff..59d3e9d 100644 --- a/radial_vibration.ui +++ b/radial_vibration.ui @@ -1181,12 +1181,12 @@ - + - + diff --git a/seismic_monitor.cpp b/seismic_monitor.cpp index a968eb9..d6a95eb 100644 --- a/seismic_monitor.cpp +++ b/seismic_monitor.cpp @@ -210,14 +210,16 @@ void Seismic_monitor::on_pushButton_confirm_clicked() { QMessageBox::information(this, QStringLiteral("提示"), "传感器灵敏度填写错误!"); return; } - for (int var = 0; var < SLOT_NUM; var ++) { + for (int var = 1; var <= SLOT_NUM; var ++) { if(ui->comboBox_relative_number->currentIndex() != 0){ std::shared_ptr slot_base_ptr = ConfigMgr::Instance()->GetSlotPtr(var); if(slot_base_ptr == nullptr || slot_base_ptr->card_type_ != kCardVibSingle) continue; + if(var == slot_no) + continue; qDebug() << "relative_number" << var << slot_base_ptr->relative_number; if(slot_base_ptr->relative_number == ui->comboBox_relative_number->currentIndex() && - slot_base_ptr->card_type_ != kCardSpeedSingle){ + slot_base_ptr->card_type_ != kCardSpeedSingle ){ QMessageBox::information(this, QStringLiteral("提示"), "板卡相对编号重复!"); return; } diff --git a/tachometer.cpp b/tachometer.cpp index 805aaf7..2962027 100644 --- a/tachometer.cpp +++ b/tachometer.cpp @@ -438,11 +438,13 @@ void Tachometer::on_pushButton_confirm_clicked() { qCritical() << " should not be here"; return; } - for (int var = 0; var < SLOT_NUM; var ++) { + for (int var = 1; var < SLOT_NUM; var ++) { if(ui->comboBox_relative_number->currentIndex() != 0){ std::shared_ptr slot_base_ptr = ConfigMgr::Instance()->GetSlotPtr(var); if(slot_base_ptr == nullptr || slot_base_ptr->card_type_ != kCardSpeedSingle) continue; + if(var == slot_no) + continue; qDebug() << "relative_number" << var << slot_base_ptr->relative_number; if(slot_base_ptr->relative_number == ui->comboBox_relative_number->currentIndex() && slot_base_ptr->card_type_ != kCardVibSingle){