zhangsheng/TSI_Config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加键相测点名称

Browse Source
This commit is contained in:
DESKTOP-7I8SUIC\zhang 2025-12-08 17:14:23 +08:00
parent ce6c066532
commit 88c2a30e95
11 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TSI_Config.pro
View File

@ -28,6 +28,7 @@ SOURCES += \
mainwindow.cpp \ mainwindow.cpp \
mqtt_config.cpp \ mqtt_config.cpp \
pointname.cpp \ pointname.cpp \
pointname_relay.cpp \
pressure_pulsation.cpp \ pressure_pulsation.cpp \
radial_vibration.cpp \ radial_vibration.cpp \
rangeslider.cpp \ rangeslider.cpp \
@ -67,6 +68,7 @@ HEADERS += \
mainwindow.h \ mainwindow.h \
mqtt_config.h \ mqtt_config.h \
pointname.h \ pointname.h \
pointname_relay.h \
pressure_pulsation.h \ pressure_pulsation.h \
radial_vibration.h \ radial_vibration.h \
rangeslider.h \ rangeslider.h \
@ -100,6 +102,7 @@ FORMS += \
mainwindow.ui \ mainwindow.ui \
mqtt_config.ui \ mqtt_config.ui \
pointname.ui \ pointname.ui \
pointname_relay.ui \
pressure_pulsation.ui \ pressure_pulsation.ui \
radial_vibration.ui \ radial_vibration.ui \
relaysetting.ui \ relaysetting.ui \

8
acceleration.ui
View File

@ -107,7 +107,7 @@
<item> <item>
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="tab"> <widget class="QWidget" name="tab">
<attribute name="title"> <attribute name="title">
@ -127,7 +127,7 @@
<item> <item>
<widget class="QCheckBox" name="checkBox_high_pass"> <widget class="QCheckBox" name="checkBox_high_pass">
<property name="text"> <property name="text">
<string>高通：</string> <string>带通1：</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -218,7 +218,7 @@
<item> <item>
<widget class="QCheckBox" name="checkBox_low_pass"> <widget class="QCheckBox" name="checkBox_low_pass">
<property name="text"> <property name="text">
<string>低通：</string> <string>带通2：</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -288,7 +288,7 @@
<item> <item>
<widget class="QCheckBox" name="checkBox_band_pass"> <widget class="QCheckBox" name="checkBox_band_pass">
<property name="text"> <property name="text">
<string>带通：</string> <string>带通3：</string>
</property> </property>
</widget> </widget>
</item> </item>

5
config_mgr.cpp
View File

@ -592,10 +592,11 @@ void ConfigMgr::Save(QString & file_path) {
qDebug() << "ch" << ch << ptr->single_relay[ch].logic_expression; qDebug() << "ch" << ch << ptr->single_relay[ch].logic_expression;
channel_item.insert("logic_expression", 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("vote",ptr->single_relay[ch].vote);
}
}
channel_item.insert("active", ptr->single_relay[ch].active); channel_item.insert("active", ptr->single_relay[ch].active);
channel_item.insert("group",ptr->single_relay[ch].group); channel_item.insert("group",ptr->single_relay[ch].group);
}
}
}else if(card_type_[i] == kCardRelaySingleNOK){ }else if(card_type_[i] == kCardRelaySingleNOK){
std::shared_ptr<CardBase> base_ptr = ConfigMgr::Instance()->GetSlotPtr(slot); std::shared_ptr<CardBase> base_ptr = ConfigMgr::Instance()->GetSlotPtr(slot);
if (base_ptr == nullptr) { if (base_ptr == nullptr) {

3
data_config.h
View File

@ -508,6 +508,7 @@ typedef struct SpeedAlert_{
} SpeedAlert; } SpeedAlert;
typedef struct SingleRelayS_{ typedef struct SingleRelayS_{
QString point_name;
QString logic_expression; QString logic_expression;
bool active; bool active;
int group; int group;
@ -522,6 +523,7 @@ typedef struct SingleRelayS_{
} SingleRelayS; } SingleRelayS;
typedef struct SingleRelayNOK_{ typedef struct SingleRelayNOK_{
QString point_name;
QString logic_expression; QString logic_expression;
bool active; bool active;
int group; int group;
@ -536,6 +538,7 @@ typedef struct SingleRelayNOK_{
} SingleRelayNOK; } SingleRelayNOK;
typedef struct TMRRelay_{ typedef struct TMRRelay_{
QString point_name;
QString logic_expression; QString logic_expression;
TMRRelay_(){ TMRRelay_(){
logic_expression = ""; logic_expression = "";

2
mainwindow.cpp
View File

@ -545,7 +545,7 @@ void MainWindow::OnButtonGroup(QAbstractButton *slot_btn) {
std::shared_ptr<CardBase> base_ptr = ConfigMgr::Instance()->GetSlotPtr(button_id); std::shared_ptr<CardBase> base_ptr = ConfigMgr::Instance()->GetSlotPtr(button_id);
if(base_ptr == nullptr) if(base_ptr == nullptr)
return; 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->setWindowModality(Qt::ApplicationModal);
point_name->show(); point_name->show();
} }

10
pointname.cpp
View File

@ -5,13 +5,13 @@
#include "tachometer_data.h" #include "tachometer_data.h"
#include "keyphase_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), QWidget(parent),
ui(new Ui::PointName) ui(new Ui::PointName)
{ {
ui->setupUi(this); ui->setupUi(this);
slot_no = slot_no_; slot_no = slot_no_;
car_type = static_cast<CardType>(cardtype); car_type = cardtype;
ui->label_slot->setText(QString::number(slot_no)); ui->label_slot->setText(QString::number(slot_no));
Init(); Init();
} }
@ -40,6 +40,12 @@ void PointName::Init()
ui->lineEdit_pointname_2->setText(tac_data->variables_[1].point_name); 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_3->setText(tac_data->variables_[2].point_name);
ui->lineEdit_pointname_4->setText(tac_data->variables_[3].point_name); ui->lineEdit_pointname_4->setText(tac_data->variables_[3].point_name);
}else if(base_ptr->card_type_ == kCardKeyphaseSingle){
std::shared_ptr<KeyphaseData> keyphase_data = std::dynamic_pointer_cast<KeyphaseData>(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);
} }
} }

2
pointname.h
View File

@ -13,7 +13,7 @@ class PointName : public QWidget
Q_OBJECT Q_OBJECT
public: public:
explicit PointName(int slot_no_,int cardtype,QWidget *parent = nullptr); explicit PointName(int slot_no_,CardType cardtype,QWidget *parent = nullptr);
~PointName(); ~PointName();
int slot_no; int slot_no;
CardType car_type; CardType car_type;

8
pressure_pulsation.ui
View File

@ -98,7 +98,7 @@
<item> <item>
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="tab"> <widget class="QWidget" name="tab">
<attribute name="title"> <attribute name="title">
@ -118,7 +118,7 @@
<item> <item>
<widget class="QCheckBox" name="checkBox_high_pass"> <widget class="QCheckBox" name="checkBox_high_pass">
<property name="text"> <property name="text">
<string>高通：</string> <string>带通1：</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -209,7 +209,7 @@
<item> <item>
<widget class="QCheckBox" name="checkBox_low_pass"> <widget class="QCheckBox" name="checkBox_low_pass">
<property name="text"> <property name="text">
<string>低通：</string> <string>带通2：</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -279,7 +279,7 @@
<item> <item>
<widget class="QCheckBox" name="checkBox_band_pass"> <widget class="QCheckBox" name="checkBox_band_pass">
<property name="text"> <property name="text">
<string>带通：</string> <string>带通3：</string>
</property> </property>
</widget> </widget>
</item> </item>

8
radial_vibration.ui
View File

@ -98,7 +98,7 @@
<item> <item>
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>2</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="tab_5"> <widget class="QWidget" name="tab_5">
<attribute name="title"> <attribute name="title">
@ -118,7 +118,7 @@
<item> <item>
<widget class="QCheckBox" name="checkBox_high_pass"> <widget class="QCheckBox" name="checkBox_high_pass">
<property name="text"> <property name="text">
<string>高通：</string> <string>带通1：</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -203,7 +203,7 @@
<item> <item>
<widget class="QCheckBox" name="checkBox_low_pass"> <widget class="QCheckBox" name="checkBox_low_pass">
<property name="text"> <property name="text">
<string>低通：</string> <string>带通2：</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -273,7 +273,7 @@
<item> <item>
<widget class="QCheckBox" name="checkBox_band_pass"> <widget class="QCheckBox" name="checkBox_band_pass">
<property name="text"> <property name="text">
<string>带通：</string> <string>带通3：</string>
</property> </property>
</widget> </widget>
</item> </item>

8
trust.ui
View File

@ -98,7 +98,7 @@
<item> <item>
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="tab_5"> <widget class="QWidget" name="tab_5">
<attribute name="title"> <attribute name="title">
@ -118,7 +118,7 @@
<item> <item>
<widget class="QCheckBox" name="checkBox_high_pass"> <widget class="QCheckBox" name="checkBox_high_pass">
<property name="text"> <property name="text">
<string>高通：</string> <string>带通1：</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -203,7 +203,7 @@
<item> <item>
<widget class="QCheckBox" name="checkBox_low_pass"> <widget class="QCheckBox" name="checkBox_low_pass">
<property name="text"> <property name="text">
<string>低通：</string> <string>带通2：</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -273,7 +273,7 @@
<item> <item>
<widget class="QCheckBox" name="checkBox_band_pass"> <widget class="QCheckBox" name="checkBox_band_pass">
<property name="text"> <property name="text">
<string>带通：</string> <string>带通3：</string>
</property> </property>
</widget> </widget>
</item> </item>

8
velocity.ui
View File

@ -98,7 +98,7 @@
<item> <item>
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="tab_5"> <widget class="QWidget" name="tab_5">
<attribute name="title"> <attribute name="title">
@ -118,7 +118,7 @@
<item> <item>
<widget class="QCheckBox" name="checkBox_high_pass"> <widget class="QCheckBox" name="checkBox_high_pass">
<property name="text"> <property name="text">
<string>高通：</string> <string>带通1：</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -209,7 +209,7 @@
<item> <item>
<widget class="QCheckBox" name="checkBox_low_pass"> <widget class="QCheckBox" name="checkBox_low_pass">
<property name="text"> <property name="text">
<string>低通：</string> <string>带通2：</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -279,7 +279,7 @@
<item> <item>
<widget class="QCheckBox" name="checkBox_band_pass"> <widget class="QCheckBox" name="checkBox_band_pass">
<property name="text"> <property name="text">
<string>带通：</string> <string>带通3：</string>
</property> </property>
</widget> </widget>
</item> </item>