From 166b62af1b6d3d4c208659c670a8057c9e05a8f6 Mon Sep 17 00:00:00 2001 From: zhangsheng Date: Fri, 25 Apr 2025 16:29:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=84=E6=80=81=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config_mgr.cpp | 2 +- data_config.h | 6 +++--- singlerelay.cpp | 2 +- tmrrelayassociation.cpp | 39 +++++++++++++++++++++------------------ 4 files changed, 26 insertions(+), 23 deletions(-) diff --git a/config_mgr.cpp b/config_mgr.cpp index 12d17ec..8d6e670 100644 --- a/config_mgr.cpp +++ b/config_mgr.cpp @@ -222,7 +222,7 @@ void ConfigMgr::Save(QString & file_path) { voltage_range_array.append(ptr->variables_[cid].normal_voltage_low); voltage_range_array.append(ptr->variables_[cid].normal_voltage_high); QJsonObject setpoint_data; - setpoint_data["speed_upper"] = qRound(ptr->alert_danger[cid].speed_upper * 10)/10.0; + setpoint_data["speed_upper"] = ptr->alert_danger[cid].speed_upper; setpoint_data["speed_lower"] = ptr->alert_danger[cid].speed_lower; setpoint_data["speed_upper_enable"] = ptr->alert_danger[cid].speed_upper_enable; setpoint_data["speed_lower_enable"] = ptr->alert_danger[cid].speed_lower_enable; diff --git a/data_config.h b/data_config.h index 3a66cff..303bacc 100644 --- a/data_config.h +++ b/data_config.h @@ -253,11 +253,11 @@ typedef struct VibAlertDanger_{ } VibAlertDanger; typedef struct SpeedAlert_{ - float speed_upper; - float speed_lower; + int speed_upper; + int speed_lower; bool speed_upper_enable; bool speed_lower_enable; - float danger_speed_upper; + int danger_speed_upper; SpeedAlert_(){ speed_upper = 0; speed_lower = 0; diff --git a/singlerelay.cpp b/singlerelay.cpp index 97fbbef..4eb9780 100644 --- a/singlerelay.cpp +++ b/singlerelay.cpp @@ -131,7 +131,7 @@ void SingleRelay::OnButtonGroup(QAbstractButton *slot_btn) { std::shared_ptr base_ptr = ConfigMgr::Instance()->GetSlotPtr(button_id); if(base_ptr->card_type_ == kCardVibSingle){ std::shared_ptr vib_data = std::dynamic_pointer_cast(base_ptr); - if((vib_data->base_config_[var].standby && vib_data->base_config_[var + 1].standby && !(var % 2))) + if((vib_data->base_config_[var].standby && (var % 2))) continue; QString item_str = QString("%1 (槽位 %2 通道 %3 非OK)").arg(vib_data->base_config_[var].point_name).arg(button_id).arg(var+1); QListWidgetItem *item = new QListWidgetItem(item_str); diff --git a/tmrrelayassociation.cpp b/tmrrelayassociation.cpp index a54612b..2ab1a77 100644 --- a/tmrrelayassociation.cpp +++ b/tmrrelayassociation.cpp @@ -403,25 +403,28 @@ void TMRRelayAssociation::OnButtonGroup(QAbstractButton *slot_btn) { item_or->setData(Qt::UserRole, "+"); list_widget_available->addItem(item_or); for(int var = 0; var < CHANNEL_COUNT ; ++var){ - QString item_data; - if(ptr->base_config_[var].standby && ptr->base_config_[var + 1].standby && (var % 2)) - continue; - if(ptr->alert_danger[var].direct_enable || - ptr->alert_danger[var].x1_ampl_enable || - ptr->alert_danger[var].x2_ampl_enable){ - QString item_str = QString("%1 (槽位 %3 通道 %4 警报)").arg(ptr->base_config_[var].point_name).arg(button_id).arg(var+1); - QListWidgetItem *item = new QListWidgetItem(item_str); - item_data = QString("S%1C%2A1").arg(QString::number(button_id, 10).rightJustified(2, '0')).arg(QString::number(var+1, 10).rightJustified(2, '0')); - item->setData(Qt::UserRole, item_data); - list_widget_available->addItem(item); + std::shared_ptr base_ptr = ConfigMgr::Instance()->GetSlotPtr(button_id); + if(base_ptr->card_type_ == kCardVibSingle){ + QString item_data; + if(ptr->base_config_[var].standby && (var % 2)) + continue; + if(ptr->alert_danger[var].direct_enable || + ptr->alert_danger[var].x1_ampl_enable || + ptr->alert_danger[var].x2_ampl_enable){ + QString item_str = QString("%1 (槽位 %3 通道 %4 警报)").arg(ptr->base_config_[var].point_name).arg(button_id).arg(var+1); + QListWidgetItem *item = new QListWidgetItem(item_str); + item_data = QString("S%1C%2A1").arg(QString::number(button_id, 10).rightJustified(2, '0')).arg(QString::number(var+1, 10).rightJustified(2, '0')); + item->setData(Qt::UserRole, item_data); + list_widget_available->addItem(item); + } + if(ptr->alert_danger[var].danger_enable){ + QString item_str = QString("%1 (槽位 %3 通道 %4 危险)").arg(ptr->base_config_[var].point_name).arg(button_id).arg(var+1); + QListWidgetItem *item = new QListWidgetItem(item_str); + item_data = QString("S%1C%2A2").arg(QString::number(button_id, 10).rightJustified(2, '0')).arg(QString::number(var+1, 10).rightJustified(2, '0')); + item->setData(Qt::UserRole, item_data); + list_widget_available->addItem(item); + } } - if(ptr->alert_danger[var].danger_enable){ - QString item_str = QString("%1 (槽位 %3 通道 %4 危险)").arg(ptr->base_config_[var].point_name).arg(button_id).arg(var+1); - QListWidgetItem *item = new QListWidgetItem(item_str); - item_data = QString("S%1C%2A2").arg(QString::number(button_id, 10).rightJustified(2, '0')).arg(QString::number(var+1, 10).rightJustified(2, '0')); - item->setData(Qt::UserRole, item_data); - list_widget_available->addItem(item); - } } } }