fix bugs
This commit is contained in:
parent
1de7d438ad
commit
8417745a17
@ -115,7 +115,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");
|
QString Version = "V1.0_" + buildDate.toString("yyyyMMdd") + "_1de7";
|
||||||
ui->label_version->setText(Version);
|
ui->label_version->setText(Version);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -695,7 +695,7 @@ void Seismic_monitor::on_comboBox_function_1_currentIndexChanged(int index)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if((index == 2||index == 3||index == 4)
|
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 必须为轴向位移!");
|
QMessageBox::warning(this, QStringLiteral("警告"), "通道1 和 通道2 必须为轴向位移!");
|
||||||
ui->comboBox_function_1->setCurrentIndex(0);
|
ui->comboBox_function_1->setCurrentIndex(0);
|
||||||
return;
|
return;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user