ir/justhomework
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

小改

Browse source
This commit is contained in:
iridiumR 2022-03-29 16:46:52 +08:00
parent 6acdb21e2d
commit 61d50f2668
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
SoftwareDesign/Code/2-2-5_enhanced/mainwindow.cpp
View file

@ -22,8 +22,8 @@ void MainWindow::abortOperation() {
result = 0.0; result = 0.0;
pendingOperator.clear(); pendingOperator.clear();
ui->lineEdit->setText("0"); ui->lineEdit->setText("0");
waitForOperand = true; isFinished = false;
QMessageBox::warning(this, "运算错误", "除数不能为零"); QMessageBox::warning(this, "运算错误", "算式不合法");
} }
//数字被点击 //数字被点击
@ -55,7 +55,13 @@ void MainWindow::on_clearAllBtn_clicked() {
} }
void MainWindow::on_equalBtn_clicked() { void MainWindow::on_equalBtn_clicked() {
try {
result = cal(displayText.toStdString()); result = cal(displayText.toStdString());
}
catch (...) {
abortOperation();
}
isFinished = 1; isFinished = 1;
ui->lineEdit->setText(QString::number(result)); ui->lineEdit->setText(QString::number(result));
} }