diff --git a/config_mgr.cpp b/config_mgr.cpp index 845c863..c7a3677 100644 --- a/config_mgr.cpp +++ b/config_mgr.cpp @@ -1041,18 +1041,19 @@ void ConfigMgr::Load(QString filename) { speed_data->variables_[j].default_speed = channel["default_speed"].toInt(); speed_data->variables_[j].automatic_threshold = channel["automatic_threshold"].toBool(); speed_data->variables_[j].point_name = channel["point_name"].toString(); - + if(channel.contains("alarmn")){ QJsonObject alarm = channel["alarm"].toObject(); - speed_data->danger_high[j].level = alarm["danger_high_level"].toDouble(); - speed_data->danger_high[j].hysteresis = alarm["danger_high_hysteresis"].toDouble(); - speed_data->danger_high[j].delay = alarm["danger_high_delay"].toInt(); - speed_data->danger_high[j].enable = alarm["danger_high_enable"].toBool(); - speed_data->danger_high[j].latch = alarm["danger_high_latch"].toBool(); - speed_data->alert_high[j].level = alarm["alert_high_level"].toDouble(); - speed_data->alert_high[j].hysteresis = alarm["alert_high_hysteresis"].toDouble(); - speed_data->alert_high[j].delay = alarm["alert_high_delay"].toInt(); - speed_data->alert_high[j].enable = alarm["alert_high_enable"].toBool(); - speed_data->alert_high[j].latch = alarm["alert_high_latch"].toBool(); + speed_data->danger_high[j].level = alarm["danger_high_level"].toDouble(); + speed_data->danger_high[j].hysteresis = alarm["danger_high_hysteresis"].toDouble(); + speed_data->danger_high[j].delay = alarm["danger_high_delay"].toInt(); + speed_data->danger_high[j].enable = alarm["danger_high_enable"].toBool(); + speed_data->danger_high[j].latch = alarm["danger_high_latch"].toBool(); + speed_data->alert_high[j].level = alarm["alert_high_level"].toDouble(); + speed_data->alert_high[j].hysteresis = alarm["alert_high_hysteresis"].toDouble(); + speed_data->alert_high[j].delay = alarm["alert_high_delay"].toInt(); + speed_data->alert_high[j].enable = alarm["alert_high_enable"].toBool(); + speed_data->alert_high[j].latch = alarm["alert_high_latch"].toBool(); + } } cards_.push_back(speed_data); } else if (card_type_[i] == kCardKeyphaseSingle) { diff --git a/seismic_monitor.ui b/seismic_monitor.ui index bbfad46..adec544 100644 --- a/seismic_monitor.ui +++ b/seismic_monitor.ui @@ -1004,7 +1004,7 @@ 20 50 - 219 + 232 27 @@ -1013,13 +1013,13 @@ - 180 + 200 0 - 120 + 200 16777215 @@ -2204,7 +2204,7 @@ 20 50 - 219 + 232 27 @@ -2213,13 +2213,13 @@ - 180 + 200 0 - 120 + 200 16777215