diff --git a/TSI_Config.pro b/TSI_Config.pro index 8633346..96ea9ec 100644 --- a/TSI_Config.pro +++ b/TSI_Config.pro @@ -28,6 +28,7 @@ SOURCES += \ mainwindow.cpp \ mqtt_config.cpp \ pointname.cpp \ + pointname_relay.cpp \ pressure_pulsation.cpp \ radial_vibration.cpp \ rangeslider.cpp \ @@ -67,6 +68,7 @@ HEADERS += \ mainwindow.h \ mqtt_config.h \ pointname.h \ + pointname_relay.h \ pressure_pulsation.h \ radial_vibration.h \ rangeslider.h \ @@ -100,6 +102,7 @@ FORMS += \ mainwindow.ui \ mqtt_config.ui \ pointname.ui \ + pointname_relay.ui \ pressure_pulsation.ui \ radial_vibration.ui \ relaysetting.ui \ diff --git a/acceleration.ui b/acceleration.ui index 4246dc3..ee7fb70 100644 --- a/acceleration.ui +++ b/acceleration.ui @@ -107,7 +107,7 @@ - 1 + 0 @@ -127,7 +127,7 @@ - 高通: + 带通1: @@ -218,7 +218,7 @@ - 低通: + 带通2: @@ -288,7 +288,7 @@ - 带通: + 带通3: diff --git a/config_mgr.cpp b/config_mgr.cpp index 424491b..6b1ede7 100644 --- a/config_mgr.cpp +++ b/config_mgr.cpp @@ -592,10 +592,11 @@ void ConfigMgr::Save(QString & file_path) { qDebug() << "ch" << ch << ptr->single_relay[ch].logic_expression; channel_item.insert("logic_expression", ptr->single_relay[ch].logic_expression); channel_item.insert("vote",ptr->single_relay[ch].vote); - channel_item.insert("active", ptr->single_relay[ch].active); - channel_item.insert("group",ptr->single_relay[ch].group); + } } + channel_item.insert("active", ptr->single_relay[ch].active); + channel_item.insert("group",ptr->single_relay[ch].group); }else if(card_type_[i] == kCardRelaySingleNOK){ std::shared_ptr base_ptr = ConfigMgr::Instance()->GetSlotPtr(slot); if (base_ptr == nullptr) { diff --git a/data_config.h b/data_config.h index cc0ad12..fe2bd1a 100644 --- a/data_config.h +++ b/data_config.h @@ -508,6 +508,7 @@ typedef struct SpeedAlert_{ } SpeedAlert; typedef struct SingleRelayS_{ + QString point_name; QString logic_expression; bool active; int group; @@ -522,6 +523,7 @@ typedef struct SingleRelayS_{ } SingleRelayS; typedef struct SingleRelayNOK_{ + QString point_name; QString logic_expression; bool active; int group; @@ -536,6 +538,7 @@ typedef struct SingleRelayNOK_{ } SingleRelayNOK; typedef struct TMRRelay_{ + QString point_name; QString logic_expression; TMRRelay_(){ logic_expression = ""; diff --git a/mainwindow.cpp b/mainwindow.cpp index 2639728..02cb9dd 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -545,7 +545,7 @@ void MainWindow::OnButtonGroup(QAbstractButton *slot_btn) { std::shared_ptr base_ptr = ConfigMgr::Instance()->GetSlotPtr(button_id); if(base_ptr == nullptr) return; - PointName *point_name = new PointName(button_id,ConfigMgr::Instance()->card_type_[button_id - 1]); + PointName *point_name = new PointName(button_id,map_slot_config[button_id].card_type); point_name->setWindowModality(Qt::ApplicationModal); point_name->show(); } diff --git a/pointname.cpp b/pointname.cpp index 685d410..cdda4b9 100644 --- a/pointname.cpp +++ b/pointname.cpp @@ -5,13 +5,13 @@ #include "tachometer_data.h" #include "keyphase_data.h" -PointName::PointName(int slot_no_,int cardtype,QWidget *parent) : +PointName::PointName(int slot_no_,CardType cardtype,QWidget *parent) : QWidget(parent), ui(new Ui::PointName) { ui->setupUi(this); slot_no = slot_no_; - car_type = static_cast(cardtype); + car_type = cardtype; ui->label_slot->setText(QString::number(slot_no)); Init(); } @@ -40,6 +40,12 @@ void PointName::Init() ui->lineEdit_pointname_2->setText(tac_data->variables_[1].point_name); ui->lineEdit_pointname_3->setText(tac_data->variables_[2].point_name); ui->lineEdit_pointname_4->setText(tac_data->variables_[3].point_name); + }else if(base_ptr->card_type_ == kCardKeyphaseSingle){ + std::shared_ptr keyphase_data = std::dynamic_pointer_cast(base_ptr); + ui->lineEdit_pointname_1->setText(keyphase_data->variables_[0].point_name); + ui->lineEdit_pointname_2->setText(keyphase_data->variables_[1].point_name); + ui->lineEdit_pointname_3->setText(keyphase_data->variables_[2].point_name); + ui->lineEdit_pointname_4->setText(keyphase_data->variables_[3].point_name); } } diff --git a/pointname.h b/pointname.h index 38c9d79..fbb5582 100644 --- a/pointname.h +++ b/pointname.h @@ -13,7 +13,7 @@ class PointName : public QWidget Q_OBJECT public: - explicit PointName(int slot_no_,int cardtype,QWidget *parent = nullptr); + explicit PointName(int slot_no_,CardType cardtype,QWidget *parent = nullptr); ~PointName(); int slot_no; CardType car_type; diff --git a/pressure_pulsation.ui b/pressure_pulsation.ui index 2201551..ffe6e47 100644 --- a/pressure_pulsation.ui +++ b/pressure_pulsation.ui @@ -98,7 +98,7 @@ - 1 + 0 @@ -118,7 +118,7 @@ - 高通: + 带通1: @@ -209,7 +209,7 @@ - 低通: + 带通2: @@ -279,7 +279,7 @@ - 带通: + 带通3: diff --git a/radial_vibration.ui b/radial_vibration.ui index 0328bff..8d246b5 100644 --- a/radial_vibration.ui +++ b/radial_vibration.ui @@ -98,7 +98,7 @@ - 2 + 0 @@ -118,7 +118,7 @@ - 高通: + 带通1: @@ -203,7 +203,7 @@ - 低通: + 带通2: @@ -273,7 +273,7 @@ - 带通: + 带通3: diff --git a/trust.ui b/trust.ui index 967ff4e..10512b1 100644 --- a/trust.ui +++ b/trust.ui @@ -98,7 +98,7 @@ - 1 + 0 @@ -118,7 +118,7 @@ - 高通: + 带通1: @@ -203,7 +203,7 @@ - 低通: + 带通2: @@ -273,7 +273,7 @@ - 带通: + 带通3: diff --git a/velocity.ui b/velocity.ui index 0c27cce..9914ddd 100644 --- a/velocity.ui +++ b/velocity.ui @@ -98,7 +98,7 @@ - 1 + 0 @@ -118,7 +118,7 @@ - 高通: + 带通1: @@ -209,7 +209,7 @@ - 低通: + 带通2: @@ -279,7 +279,7 @@ - 带通: + 带通3: