fix copy channel bugs

config_mgr.cpp

@@ -1204,8 +1204,8 @@ void ConfigMgr::LaodTemplate(QString filename,int slot){
                 }else{
                     vib_data->base_config_[j].standby = channel["standby"].toBool();
                     vib_data->base_config_[j].active = channel["active"].toBool();
-                   vib_data->base_config_[j].transducer_id = channel["transducer_id"].toInt();
+                    vib_data->base_config_[j].transducer_id = channel["transducer_id"].toInt();
-                  QJsonArray voltage_range_array = channel["normal_voltage_range"].toArray();
+                    QJsonArray voltage_range_array = channel["normal_voltage_range"].toArray();
                     vib_data->base_config_[j].normal_voltage_low = voltage_range_array[0].toDouble();
                     vib_data->base_config_[j].normal_voltage_high = voltage_range_array[1].toDouble();
                     vib_data->base_config_[j].power = channel["power"].toBool();
@@ -1428,7 +1428,7 @@ void ConfigMgr::LaodTemplate(QString filename,int slot){
                         variable->alert_high.delay = alarm["alert_high_delay"].toInt();
                         variable->alert_high.enable = alarm["alert_high_enable"].toBool();
                         variable->alert_high.latch = alarm["alert_high_latch"].toBool();
-                       QJsonObject freband_output_obj = tmp_variable["freband_output"].toObject();
+                        QJsonObject freband_output_obj = tmp_variable["freband_output"].toObject();
                         QJsonObject number_obj,config_params;
                         for (int k = 0; k < 10; ++k) {
                             number_obj = freband_output_obj[QString::number(k + 1)].toObject();

copy_channel.cpp

@@ -104,7 +104,7 @@ void CopyChannel::on_pushButton_confirm_clicked()
                 QString point_name = vib_data->base_config_[i].point_name;
                 vib_data->base_config_[i] = vib_data->base_config_[var];
                 vib_data->base_config_[i].point_name = point_name;
-                vib_data->dc_output[i] = vib_data->dc_output[var];
+                //vib_data->dc_output[i] = vib_data->dc_output[var];
                 auto variable_base_old = vib_data->GetChannelPtr(var + 1);
                 if(vib_data->base_config_[var].channel_type == kVibRadial){
                     std::shared_ptr<RadialVariable>  variable = std::dynamic_pointer_cast<RadialVariable>(variable_base_old);

data_config.h

@@ -589,7 +589,8 @@ enum UpgradeResultCode {
     kUpgradeUploadSuccess = 1,
     kUpgradeSuccessToSubcard = 2,
     kUpgradeFailToTransfer = 3,
-    KupgradeCrcError = 4
+    KUpgradeCrcError = 4,
+    kUpgradeProcessing = 5 // 正在进行升级
 };
 
 #pragma pack(1)

mainwindow.cpp

@@ -116,7 +116,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") + "_3bcd";
+    QString Version = "V1.0_"  + buildDate.toString("yyyyMMdd") + "_a4a8";
     ui->label_version->setText(Version);
 }
 
@@ -1058,8 +1058,10 @@ void MainWindow::readData(const QByteArray &data) {
             statusBar()->showMessage("上传子板卡成功！", 3000);
         }else if(resp.code == kUpgradeFailToTransfer){
             statusBar()->showMessage("上传失败！", 3000);
-        }else if(resp.code == KupgradeCrcError){
+        }else if(resp.code == KUpgradeCrcError){
             statusBar()->showMessage("文件CRC校验失败！", 3000);
+        }else if(resp.code == kUpgradeProcessing){
+            QMessageBox::information(this, QStringLiteral("提示"), "正在升级中，请勿操作！稍等5分钟后再操作！");
         }
     } else if (cmd == kUpgradeProgress) {
         UpgradeRsp upgrade_resp;

seismic_monitor.cpp

@@ -516,7 +516,7 @@ void Seismic_monitor::on_comboBox_chan_type_1_currentTextChanged(const QString &
 void Seismic_monitor::on_comboBox_chan_type_2_currentTextChanged(const QString &arg1) {
     switch (ui->comboBox_chan_type_2->currentIndex()) {
         case kVibRadial:
-            EnableKeyphase();
+            EnableKeyphase2();
             break;
         case kVibAcc:
             EnableKeyphase2();
@@ -536,7 +536,7 @@ void Seismic_monitor::on_comboBox_chan_type_2_currentTextChanged(const QString &
 void Seismic_monitor::on_comboBox_chan_type_3_currentTextChanged(const QString &arg1) {
     switch (ui->comboBox_chan_type_3->currentIndex()) {
         case kVibRadial:
-            EnableKeyphase();
+            EnableKeyphase3();
             break;
         case kVibAcc:
             EnableKeyphase3();