From baf5ae0a379d0a34d9ba176ef74a76adb9485e4e Mon Sep 17 00:00:00 2001 From: zhangsheng Date: Fri, 25 Apr 2025 15:40:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BD=AC=E9=80=9F=E8=A7=A6?= =?UTF-8?q?=E5=8F=91=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config_mgr.cpp | 6 ------ data_config.h | 4 ---- mainwindow.cpp | 2 +- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/config_mgr.cpp b/config_mgr.cpp index 7744c91..12d17ec 100644 --- a/config_mgr.cpp +++ b/config_mgr.cpp @@ -227,9 +227,6 @@ void ConfigMgr::Save(QString & file_path) { setpoint_data["speed_upper_enable"] = ptr->alert_danger[cid].speed_upper_enable; setpoint_data["speed_lower_enable"] = ptr->alert_danger[cid].speed_lower_enable; setpoint_data["danger_speed_upper"] = ptr->alert_danger[cid].danger_speed_upper; - setpoint_data["danger_speed_lower"] = ptr->alert_danger[cid].danger_speed_lower; - setpoint_data["danger_upper_enable"] = ptr->alert_danger[cid].danger_upper_enable; - setpoint_data["danger_lower_enable"] = ptr->alert_danger[cid].danger_lower_enable; channel_item["setpoint"] = setpoint_data; channel_item.insert("active", ptr->variables_[cid].active); channel_item.insert("normal_voltage_range", voltage_range_array); @@ -524,9 +521,6 @@ void ConfigMgr::Load(QString filename) { speed_data->alert_danger[j].speed_upper_enable = setpoint_data["speed_upper_enable"].toBool(); speed_data->alert_danger[j].speed_lower_enable = setpoint_data["speed_lower_enable"].toBool(); speed_data->alert_danger[j].danger_speed_upper = setpoint_data["danger_speed_upper"].toDouble(); - speed_data->alert_danger[j].danger_speed_lower = setpoint_data["danger_speed_lower"].toDouble(); - speed_data->alert_danger[j].danger_upper_enable = setpoint_data["danger_upper_enable"].toBool(); - speed_data->alert_danger[j].danger_lower_enable = setpoint_data["danger_lower_enable"].toBool(); } cards_.push_back(speed_data); } else if (card_type_[i] == kCardKeyphaseSingle) { diff --git a/data_config.h b/data_config.h index c6c268e..3a66cff 100644 --- a/data_config.h +++ b/data_config.h @@ -258,14 +258,10 @@ typedef struct SpeedAlert_{ bool speed_upper_enable; bool speed_lower_enable; float danger_speed_upper; - float danger_speed_lower; - bool danger_upper_enable; - bool danger_lower_enable; SpeedAlert_(){ speed_upper = 0; speed_lower = 0; danger_speed_upper = 0; - danger_speed_lower = 0; } } SpeedAlert; diff --git a/mainwindow.cpp b/mainwindow.cpp index 8974665..fbe3171 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -219,7 +219,7 @@ void MainWindow::createMenu(const QString &rootTitle, QPushButton *parent) { QObject::connect(relays_2, &QAction::triggered, this, &MainWindow::onMenuActionTriggered); QObject::connect(relays_3, &QAction::triggered, this, &MainWindow::onMenuActionTriggered); QObject::connect(keyphasor_1, &QAction::triggered, this, &MainWindow::onMenuActionTriggered); - QObject::connect(keyphasor_2, &QAction::triggered, this, &MainWindow::onMenuActionTriggered); + //QObject::connect(keyphasor_2, &QAction::triggered, this, &MainWindow::onMenuActionTriggered); QObject::connect(reset, &QAction::triggered, this, &MainWindow::onMenuActionTriggered); QObject::connect(upgrade, &QAction::triggered, this, &MainWindow::onMenuActionTriggered); QObject::connect(version, &QAction::triggered, this, &MainWindow::onMenuActionTriggered);