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

Compare commits

base: zhangsheng:0ec1b26709fab276f615dfda3f5cf5635db3ce3a
Branches Tags
zhangsheng:master
zhangsheng:self_dev_screen
zhangsheng:shangqi
zhangsheng:self_dev_tmp1
zhangsheng:self_dev
zhangsheng:protocol_update
zhangsheng:feature1
zhangsheng:dev
zhangsheng:0.1
..
compare: zhangsheng:546ed2d0faf154c02d71ff17134598aacb34b09c
Branches Tags
zhangsheng:self_dev_screen
zhangsheng:shangqi
zhangsheng:self_dev_tmp1
zhangsheng:self_dev
zhangsheng:protocol_update
zhangsheng:feature1
zhangsheng:dev
zhangsheng:master
zhangsheng:0.1

No commits in common. "0ec1b26709fab276f615dfda3f5cf5635db3ce3a" and "546ed2d0faf154c02d71ff17134598aacb34b09c" have entirely different histories.
0ec1b26709 ... 546ed2d0fa

7 changed files with 25 additions and 74 deletions
Show Stats Expand all files Collapse all files

1
config_mgr.cpp
View File

@ -566,7 +566,6 @@ int 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("active", ptr->single_relay[ch].active); channel_item.insert("active", ptr->single_relay[ch].active);
channel_item.insert("group",ptr->single_relay[ch].group);
} }
}else if(card_type_[i] == kCardRelayTMRPrimary){ }else if(card_type_[i] == kCardRelayTMRPrimary){

1
data_config.h
View File

@ -559,7 +559,6 @@ typedef struct SingleRelayS_{
active = false; active = false;
vote = false; vote = false;
count_vote = 0; count_vote = 0;
group = 1;
} }
} SingleRelayS; } SingleRelayS;

2
mainwindow.cpp
View File

@ -122,7 +122,7 @@ MainWindow::MainWindow(QWidget *parent)
//qInstallMessageHandler(messageHandler); //qInstallMessageHandler(messageHandler);
#endif #endif
QDate buildDate = QLocale( QLocale::English ).toDate( QString(__DATE__).replace(" ", " 0"), "MMM dd yyyy"); QDate buildDate = QLocale( QLocale::English ).toDate( QString(__DATE__).replace(" ", " 0"), "MMM dd yyyy");
QString Version = "V1.0_" + buildDate.toString("yyyyMMdd") + "_546e"; QString Version = "V1.0_" + buildDate.toString("yyyyMMdd") + "_84da";
ui->label_version->setText(Version); ui->label_version->setText(Version);
} }

2
singlerelay.cpp
View File

@ -4,7 +4,6 @@
#include <QStack> #include <QStack>
#include <QMessageBox> #include <QMessageBox>
#include <QMenu> #include <QMenu>
#include <QListView>
SingleRelay::SingleRelay(int slot,CardType cardtype,QWidget *parent) SingleRelay::SingleRelay(int slot,CardType cardtype,QWidget *parent)
: QDialog(parent) : QDialog(parent)
@ -13,7 +12,6 @@ SingleRelay::SingleRelay(int slot,CardType cardtype,QWidget *parent)
slot_no = slot; slot_no = slot;
car_type = cardtype; car_type = cardtype;
ui->label_slot_no->setText(QString::number(slot_no)); ui->label_slot_no->setText(QString::number(slot_no));
ui->comboBox_relay_ch->setView(new QListView());
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
QVBoxLayout *layout_available = new QVBoxLayout(ui->widget_available); QVBoxLayout *layout_available = new QVBoxLayout(ui->widget_available);
list_widget_available = new QListWidget(); list_widget_available = new QListWidget();

89
singlerelay_nok.cpp
View File

@ -4,7 +4,6 @@
#include <QStack> #include <QStack>
#include <QMessageBox> #include <QMessageBox>
#include <QMenu> #include <QMenu>
#include <QListView>
SingleRelay_NOK::SingleRelay_NOK(int slot,CardType cardtype,QWidget *parent) : SingleRelay_NOK::SingleRelay_NOK(int slot,CardType cardtype,QWidget *parent) :
QWidget(parent), QWidget(parent),
@ -14,9 +13,6 @@ SingleRelay_NOK::SingleRelay_NOK(int slot,CardType cardtype,QWidget *parent) :
slot_no = slot; slot_no = slot;
car_type = cardtype; car_type = cardtype;
ui->label_slot_no->setText(QString::number(slot_no)); ui->label_slot_no->setText(QString::number(slot_no));
ui->comboBox_relay_ch->setView(new QListView());
ui->comboBox_group->setView(new QListView());
current_slot_btn = nullptr;
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
QVBoxLayout *layout_available = new QVBoxLayout(ui->widget_available); QVBoxLayout *layout_available = new QVBoxLayout(ui->widget_available);
list_widget_available = new QListWidget(); list_widget_available = new QListWidget();
@ -186,74 +182,39 @@ void SingleRelay_NOK::on_pushButton_cancel_clicked()
{ {
this->close(); this->close();
} }
void SingleRelay_NOK::updateAvailable(QAbstractButton *slot_btn){ void SingleRelay_NOK::OnButtonGroup(QAbstractButton *slot_btn) {
list_widget_available->clear(); if (slot_btn != NULL) {
QString object_name = slot_btn->objectName(); list_widget_available->clear();
qDebug() << object_name ; QString object_name = slot_btn->objectName();
int button_id = object_name.right(object_name.length() - 15).toInt(); qDebug() << object_name ;
std::shared_ptr<CardBase> base_ptr = ConfigMgr::Instance()->GetSlotPtr(button_id); int button_id = object_name.right(object_name.length() - 15).toInt();
std::shared_ptr<VibrationData> ptr = std::dynamic_pointer_cast<VibrationData>(base_ptr);
if(ptr == nullptr)
return;
QListWidgetItem *item_and = new QListWidgetItem("AND");
item_and->setData(Qt::UserRole, "*");
list_widget_available->addItem(item_and);
QListWidgetItem *item_or = new QListWidgetItem("OR");
item_or->setData(Qt::UserRole, "+");
list_widget_available->addItem(item_or);
for(int var = 0; var < CHANNEL_COUNT ; ++var){
std::shared_ptr<CardBase> base_ptr = ConfigMgr::Instance()->GetSlotPtr(button_id); std::shared_ptr<CardBase> base_ptr = ConfigMgr::Instance()->GetSlotPtr(button_id);
std::shared_ptr<VariableBase> variable_base = ptr->GetChannelPtr(var + 1); std::shared_ptr<VibrationData> ptr = std::dynamic_pointer_cast<VibrationData>(base_ptr);
if(variable_base == nullptr) if(ptr == nullptr)
continue; return;
if(base_ptr->card_type_ == kCardVibSingle){ QListWidgetItem *item_and = new QListWidgetItem("AND");
QString item_str = QString("%1 (槽位 %2 通道 %3 非OK)").arg(ptr->base_config_[var].point_name).arg(QString::number(button_id, 10).rightJustified(2, '0')).arg(QString::number(var+1, 10).rightJustified(2, '0')); item_and->setData(Qt::UserRole, "*");
QListWidgetItem *item = new QListWidgetItem(item_str); list_widget_available->addItem(item_and);
QString item_data_nok = QString("S%1C%2P##NO").arg(QString::number(button_id, 10).rightJustified(2, '0')).arg(QString::number(var+1, 10).rightJustified(2, '0'));
item->setData(Qt::UserRole, item_data_nok);
list_widget_available->addItem(item);
QString item_data; QListWidgetItem *item_or = new QListWidgetItem("OR");
if(variable_base->alert_high.enable && (ui->comboBox_relay_ch->currentIndex() == 10 || ui->comboBox_relay_ch->currentIndex() == 11)){ item_or->setData(Qt::UserRole, "+");
QString item_str = QString("%1 (槽位 %3 通道 %4 警报高)").arg(ptr->base_config_[var].point_name).arg(QString::number(button_id, 10).rightJustified(2, '0')).arg(QString::number(var+1, 10).rightJustified(2, '0')); list_widget_available->addItem(item_or);
QListWidgetItem *item = new QListWidgetItem(item_str);
item_data = QString("S%1C%2A2").arg(QString::number(button_id, 10).rightJustified(2, '0')).arg(QString::number(var+1, 10).rightJustified(2, '0'));
item->setData(Qt::UserRole, item_data);
list_widget_available->addItem(item);
}
if(variable_base->danger_high.enable && (ui->comboBox_relay_ch->currentIndex() == 10 || ui->comboBox_relay_ch->currentIndex() == 11)){ for(int var = 0; var < CHANNEL_COUNT ; ++var){
QString item_str = QString("%1 (槽位 %3 通道 %4 危险高)").arg(ptr->base_config_[var].point_name).arg(QString::number(button_id, 10).rightJustified(2, '0')).arg(QString::number(var+1, 10).rightJustified(2, '0')); std::shared_ptr<CardBase> base_ptr = ConfigMgr::Instance()->GetSlotPtr(button_id);
std::shared_ptr<VariableBase> variable_base = ptr->GetChannelPtr(var + 1);
if(variable_base == nullptr)
continue;
if(base_ptr->card_type_ == kCardVibSingle){
QString item_str = QString("%1 (槽位 %2 通道 %3 非OK)").arg(ptr->base_config_[var].point_name).arg(QString::number(button_id, 10).rightJustified(2, '0')).arg(QString::number(var+1, 10).rightJustified(2, '0'));
QListWidgetItem *item = new QListWidgetItem(item_str); QListWidgetItem *item = new QListWidgetItem(item_str);
item_data = QString("S%1C%2A1").arg(QString::number(button_id, 10).rightJustified(2, '0')).arg(QString::number(var+1, 10).rightJustified(2, '0')); QString item_data_nok = QString("S%1C%2P##NO").arg(QString::number(button_id, 10).rightJustified(2, '0')).arg(QString::number(var+1, 10).rightJustified(2, '0'));
item->setData(Qt::UserRole, item_data); item->setData(Qt::UserRole, item_data_nok);
list_widget_available->addItem(item);
}
if(variable_base->danger_low.enable && (ui->comboBox_relay_ch->currentIndex() == 10 || ui->comboBox_relay_ch->currentIndex() == 11)){
QString item_str = QString("%1 (槽位 %3 通道 %4 危险低)").arg(ptr->base_config_[var].point_name).arg(QString::number(button_id, 10).rightJustified(2, '0')).arg(QString::number(var+1, 10).rightJustified(2, '0'));
QListWidgetItem *item = new QListWidgetItem(item_str);
item_data = QString("S%1C%2A4").arg(QString::number(button_id, 10).rightJustified(2, '0')).arg(QString::number(var+1, 10).rightJustified(2, '0'));
item->setData(Qt::UserRole, item_data);
list_widget_available->addItem(item);
}
if(variable_base->alert_low.enable && (ui->comboBox_relay_ch->currentIndex() == 10 || ui->comboBox_relay_ch->currentIndex() == 11)){
QString item_str = QString("%1 (槽位 %3 通道 %4 警报低)").arg(ptr->base_config_[var].point_name).arg(QString::number(button_id, 10).rightJustified(2, '0')).arg(QString::number(var+1, 10).rightJustified(2, '0'));
QListWidgetItem *item = new QListWidgetItem(item_str);
item_data = QString("S%1C%2A3").arg(QString::number(button_id, 10).rightJustified(2, '0')).arg(QString::number(var+1, 10).rightJustified(2, '0'));
item->setData(Qt::UserRole, item_data);
list_widget_available->addItem(item); list_widget_available->addItem(item);
} }
} }
} }
} }
void SingleRelay_NOK::OnButtonGroup(QAbstractButton *slot_btn) {
if (slot_btn != NULL) {
current_slot_btn = slot_btn;
updateAvailable(slot_btn);
}
}
QString SingleRelay_NOK::buildLogicExpression(QStandardItem *item) { QString SingleRelay_NOK::buildLogicExpression(QStandardItem *item) {
if (!item) return ""; if (!item) return "";
@ -316,8 +277,6 @@ void SingleRelay_NOK::onComboBoxIndexChanged(int index){
qDebug() << "active" << relay_data->single_relay[index].active; qDebug() << "active" << relay_data->single_relay[index].active;
ui->checkBox_active->setChecked(relay_data->single_relay[index].active); ui->checkBox_active->setChecked(relay_data->single_relay[index].active);
if(current_slot_btn != nullptr)
updateAvailable(current_slot_btn);
} }
ExprNode* SingleRelay_NOK::parseExpression(const QString& expr, int& pos) { ExprNode* SingleRelay_NOK::parseExpression(const QString& expr, int& pos) {
auto skipSpaces = [&]() { auto skipSpaces = [&]() {

2
singlerelay_nok.h
View File

@ -50,7 +50,6 @@ private:
int current_index; int current_index;
int vote_current_index; int vote_current_index;
QMap<QString, QString> channelNameMap; QMap<QString, QString> channelNameMap;
QAbstractButton *current_slot_btn;
void Init(); void Init();
void buildTreeFromExpression(QTreeView *treeView, const QString &expr); void buildTreeFromExpression(QTreeView *treeView, const QString &expr);
@ -59,7 +58,6 @@ private:
void setExpressionToTreeView(QTreeView* treeView, const QString& expr); void setExpressionToTreeView(QTreeView* treeView, const QString& expr);
QString buildLogicExpression(QStandardItem *item); QString buildLogicExpression(QStandardItem *item);
ExprValidationResult validateLogicExpression(const QString& expr); ExprValidationResult validateLogicExpression(const QString& expr);
void updateAvailable(QAbstractButton *slot_btn);
}; };
#endif // SINGLERELAY_NOK_H #endif // SINGLERELAY_NOK_H

2
tmrrelayassociation.cpp
View File

@ -4,7 +4,6 @@
#include <QStack> #include <QStack>
#include <QMenu> #include <QMenu>
#include <QMessageBox> #include <QMessageBox>
#include <QListView>
TMRRelayAssociation::TMRRelayAssociation(int slot,CardType cardtype,QWidget *parent) TMRRelayAssociation::TMRRelayAssociation(int slot,CardType cardtype,QWidget *parent)
: QDialog(parent) : QDialog(parent)
@ -17,7 +16,6 @@ TMRRelayAssociation::TMRRelayAssociation(int slot,CardType cardtype,QWidget *par
ui->checkBox_sgcc->setVisible(0); ui->checkBox_sgcc->setVisible(0);
} }
ui->label_slot_no->setText(QString::number(slot_no)); ui->label_slot_no->setText(QString::number(slot_no));
ui->comboBox_relay_ch->setView(new QListView());
QVBoxLayout *layout_available = new QVBoxLayout(ui->widget_available); QVBoxLayout *layout_available = new QVBoxLayout(ui->widget_available);
list_widget_available = new QListWidget(); list_widget_available = new QListWidget();
layout_available->addWidget(list_widget_available); layout_available->addWidget(list_widget_available);