优化转速触发界面
This commit is contained in:
parent
55c9f8e435
commit
baf5ae0a37
@ -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_upper_enable"] = ptr->alert_danger[cid].speed_upper_enable;
|
||||||
setpoint_data["speed_lower_enable"] = ptr->alert_danger[cid].speed_lower_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_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["setpoint"] = setpoint_data;
|
||||||
channel_item.insert("active", ptr->variables_[cid].active);
|
channel_item.insert("active", ptr->variables_[cid].active);
|
||||||
channel_item.insert("normal_voltage_range", voltage_range_array);
|
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_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].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_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);
|
cards_.push_back(speed_data);
|
||||||
} else if (card_type_[i] == kCardKeyphaseSingle) {
|
} else if (card_type_[i] == kCardKeyphaseSingle) {
|
||||||
|
@ -258,14 +258,10 @@ typedef struct SpeedAlert_{
|
|||||||
bool speed_upper_enable;
|
bool speed_upper_enable;
|
||||||
bool speed_lower_enable;
|
bool speed_lower_enable;
|
||||||
float danger_speed_upper;
|
float danger_speed_upper;
|
||||||
float danger_speed_lower;
|
|
||||||
bool danger_upper_enable;
|
|
||||||
bool danger_lower_enable;
|
|
||||||
SpeedAlert_(){
|
SpeedAlert_(){
|
||||||
speed_upper = 0;
|
speed_upper = 0;
|
||||||
speed_lower = 0;
|
speed_lower = 0;
|
||||||
danger_speed_upper = 0;
|
danger_speed_upper = 0;
|
||||||
danger_speed_lower = 0;
|
|
||||||
}
|
}
|
||||||
} SpeedAlert;
|
} SpeedAlert;
|
||||||
|
|
||||||
|
@ -219,7 +219,7 @@ void MainWindow::createMenu(const QString &rootTitle, QPushButton *parent) {
|
|||||||
QObject::connect(relays_2, &QAction::triggered, this, &MainWindow::onMenuActionTriggered);
|
QObject::connect(relays_2, &QAction::triggered, this, &MainWindow::onMenuActionTriggered);
|
||||||
QObject::connect(relays_3, &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_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(reset, &QAction::triggered, this, &MainWindow::onMenuActionTriggered);
|
||||||
QObject::connect(upgrade, &QAction::triggered, this, &MainWindow::onMenuActionTriggered);
|
QObject::connect(upgrade, &QAction::triggered, this, &MainWindow::onMenuActionTriggered);
|
||||||
QObject::connect(version, &QAction::triggered, this, &MainWindow::onMenuActionTriggered);
|
QObject::connect(version, &QAction::triggered, this, &MainWindow::onMenuActionTriggered);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user