diff --git a/mainwindow.cpp b/mainwindow.cpp index 5fc12b1..b6f569c 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -122,7 +122,7 @@ MainWindow::MainWindow(QWidget *parent) //qInstallMessageHandler(messageHandler); #endif 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") + "_0ec1"; ui->label_version->setText(Version); } diff --git a/singlerelay.cpp b/singlerelay.cpp index 74b2549..02eb19e 100644 --- a/singlerelay.cpp +++ b/singlerelay.cpp @@ -119,12 +119,12 @@ void SingleRelay::Init(){ QString item_data,item_str; if(variable_base->alert_high.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); + item_data = QString("%1A1").arg(ptr->base_config_[var].chan_id); } channelNameMap[item_data] = item_str; if(variable_base->danger_high.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("%1A1").arg(ptr->base_config_[var].chan_id); + item_data = QString("%1A2").arg(ptr->base_config_[var].chan_id); } channelNameMap[item_data] = item_str; if(variable_base->alert_low.enable){ @@ -194,7 +194,7 @@ void SingleRelay::OnButtonGroup(QAbstractButton *slot_btn) { if(variable_base->alert_high.enable){ 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_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); } @@ -202,7 +202,7 @@ void SingleRelay::OnButtonGroup(QAbstractButton *slot_btn) { if(variable_base->danger_high.enable){ 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_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); } diff --git a/singlerelay_nok.cpp b/singlerelay_nok.cpp index 920e4de..cfb5390 100644 --- a/singlerelay_nok.cpp +++ b/singlerelay_nok.cpp @@ -115,12 +115,12 @@ void SingleRelay_NOK::Init(){ QString item_data,item_str; if(variable_base->alert_high.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); + item_data = QString("%1A1").arg(ptr->base_config_[var].chan_id); } channelNameMap[item_data] = item_str; if(variable_base->danger_high.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("%1A1").arg(ptr->base_config_[var].chan_id); + item_data = QString("%1A2").arg(ptr->base_config_[var].chan_id); } channelNameMap[item_data] = item_str; if(variable_base->alert_low.enable){ @@ -219,7 +219,7 @@ void SingleRelay_NOK::updateAvailable(QAbstractButton *slot_btn){ if(variable_base->alert_high.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%2A2").arg(QString::number(button_id, 10).rightJustified(2, '0')).arg(QString::number(var+1, 10).rightJustified(2, '0')); + 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); } @@ -227,7 +227,7 @@ void SingleRelay_NOK::updateAvailable(QAbstractButton *slot_btn){ if(variable_base->danger_high.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%2A1").arg(QString::number(button_id, 10).rightJustified(2, '0')).arg(QString::number(var+1, 10).rightJustified(2, '0')); + 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); } diff --git a/tmrrelayassociation.cpp b/tmrrelayassociation.cpp index 594d62f..60a2422 100644 --- a/tmrrelayassociation.cpp +++ b/tmrrelayassociation.cpp @@ -443,7 +443,7 @@ void TMRRelayAssociation::OnButtonGroup(QAbstractButton *slot_btn) { if(variable_base->alert_high.enable){ 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_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); } @@ -451,7 +451,7 @@ void TMRRelayAssociation::OnButtonGroup(QAbstractButton *slot_btn) { if(variable_base->danger_high.enable){ 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_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); }