Skip to content

Commit

Permalink
Interrogation: Notify the user when interrogation fails, but allow th…
Browse files Browse the repository at this point in the history
…em to continue.
  • Loading branch information
malcom2073 committed Aug 5, 2014
1 parent d2b8d43 commit bc87f18
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions core/src/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1469,9 +1469,11 @@ void MainWindow::interrogationComplete()
QLOG_INFO() << "Interrogation complete";
if (m_interrogationFailureCount > 0)
{
QMessageBox::information(0,"Error","Something has gone serious wrong, one of the commands timed out during interrogation. This should be properly investigated before continuing");
emsComms->disconnectSerial();
return;
if (QMessageBox::question(this,"Error","One of the commands has failed during interrogation. This could be a sign of a more serious problem, Do you wish to continue?",QMessageBox::Yes,QMessageBox::No) != QMessageBox::Yes)
{
emsComms->disconnectSerial();
return;
}
}
else
{
Expand Down Expand Up @@ -1892,6 +1894,7 @@ void MainWindow::commandFailed(int sequencenumber,unsigned short errornum)
{
//interrogateTaskFail(int) catches this case.
//if (progressView) progressView->taskFail(sequencenumber);
m_interrogationFailureCount++;
}
}

Expand Down

0 comments on commit bc87f18

Please sign in to comment.