From 43a6bfff3cd79d96179da110fe79e330d6ca111b Mon Sep 17 00:00:00 2001
From: zhangsheng <zhangs1125@sina.com>
Date: Sun, 27 Apr 2025 15:23:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 singlerelay.cpp         | 2 +-
 tmrrelayassociation.cpp | 6 ++++--
 tmrrelayassociation.ui  | 6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/singlerelay.cpp b/singlerelay.cpp
index 4eb9780..bbf6486 100644
--- a/singlerelay.cpp
+++ b/singlerelay.cpp
@@ -133,7 +133,7 @@ void SingleRelay::OnButtonGroup(QAbstractButton *slot_btn) {
                 std::shared_ptr<VibrationData> vib_data = std::dynamic_pointer_cast<VibrationData>(base_ptr);
                 if((vib_data->base_config_[var].standby  && (var % 2)))
                     continue;
-                QString item_str = QString("%1 (槽位 %2 通道 %3 非OK)").arg(vib_data->base_config_[var].point_name).arg(button_id).arg(var+1);
+                QString item_str = QString("%1 (槽位 %2 通道 %3 非OK)").arg(vib_data->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);
                 QString item_data = 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);
diff --git a/tmrrelayassociation.cpp b/tmrrelayassociation.cpp
index 2ab1a77..cb5b2b3 100644
--- a/tmrrelayassociation.cpp
+++ b/tmrrelayassociation.cpp
@@ -132,6 +132,7 @@ void TMRRelayAssociation::Init(){
                     item_str = QString("%1 (槽位 %2 通道 %3 警报)").arg(ptr->base_config_[var].point_name).arg(ptr->base_config_[var].chan_id.mid(1,2)).arg(ptr->base_config_[var].chan_id.mid(4,2));
                     item_data = QString("%1A1").arg(ptr->base_config_[var].chan_id);
                 }
+                channelNameMap[item_data] = item_str;
                 if(ptr->alert_danger[var].danger_enable){
                     item_str = QString("%1 (槽位 %2 通道 %3 危险)").arg(ptr->base_config_[var].point_name).arg(ptr->base_config_[var].chan_id.mid(1,2)).arg(ptr->base_config_[var].chan_id.mid(4,2));
                     item_data = QString("%1A2").arg(ptr->base_config_[var].chan_id);
@@ -207,6 +208,7 @@ QStandardItem* TMRRelayAssociation::buildItemTree(ExprNode* node) {
         displayText = (node->value == "+") ? "OR" : "AND"; // 运算符显示
     } else {
         displayText = channelNameMap.value(node->value, node->value); // 显示名
+        qDebug() << "display" <<displayText << node->value;
     }
     QStandardItem* item = new QStandardItem(displayText);
     item->setData(node->value, Qt::UserRole); // 原始表达式key
@@ -411,14 +413,14 @@ void TMRRelayAssociation::OnButtonGroup(QAbstractButton *slot_btn) {
                 if(ptr->alert_danger[var].direct_enable ||
                         ptr->alert_danger[var].x1_ampl_enable ||
                         ptr->alert_danger[var].x2_ampl_enable){
-                    QString item_str = QString("%1 (槽位 %3 通道 %4 警报)").arg(ptr->base_config_[var].point_name).arg(button_id).arg(var+1);
+                    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%2A1").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(ptr->alert_danger[var].danger_enable){
-                    QString item_str = QString("%1 (槽位 %3 通道 %4 危险)").arg(ptr->base_config_[var].point_name).arg(button_id).arg(var+1);
+                    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%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);
diff --git a/tmrrelayassociation.ui b/tmrrelayassociation.ui
index 7698544..5a0b93b 100644
--- a/tmrrelayassociation.ui
+++ b/tmrrelayassociation.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>892</width>
+    <width>911</width>
     <height>634</height>
    </rect>
   </property>
@@ -186,7 +186,7 @@
     <rect>
      <x>110</x>
      <y>538</y>
-     <width>751</width>
+     <width>781</width>
      <height>40</height>
     </rect>
    </property>
@@ -995,7 +995,7 @@
     <rect>
      <x>610</x>
      <y>80</y>
-     <width>251</width>
+     <width>281</width>
      <height>441</height>
     </rect>
    </property>