diff --git a/mainwindow.cpp b/mainwindow.cpp index 11c9c4d..0850107 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -115,7 +115,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"); + QString Version = "V1.0_" + buildDate.toString("yyyyMMdd") + "_1de7"; ui->label_version->setText(Version); } diff --git a/seismic_monitor.cpp b/seismic_monitor.cpp index aa60921..ec5f03c 100644 --- a/seismic_monitor.cpp +++ b/seismic_monitor.cpp @@ -695,7 +695,7 @@ void Seismic_monitor::on_comboBox_function_1_currentIndexChanged(int index) return; } if((index == 2||index == 3||index == 4) - && (ui->comboBox_chan_type_3->currentIndex() != 3 || ui->comboBox_chan_type_4->currentIndex() != 3)){ + && (ui->comboBox_chan_type_1->currentIndex() != 3 || ui->comboBox_chan_type_2->currentIndex() != 3)){ QMessageBox::warning(this, QStringLiteral("警告"), "通道1 和 通道2 必须为轴向位移!"); ui->comboBox_function_1->setCurrentIndex(0); return;