NeoTheFox/RepRaptor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor tweaks

Browse Source
This commit is contained in:
NeoTheFox 2015-03-03 22:50:19 +03:00
parent 983aed1916
commit 7a654b6ec6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mainwindow.cpp
View File

@ -380,13 +380,13 @@ void MainWindow::readSerial()
} }
if(data.startsWith("ok")) readyRecieve++; if(data.startsWith("ok")) readyRecieve++;
else if(data.startsWith("wait")) readyRecieve = 1;
else if(checkingTemperature && data.startsWith("T:")) else if(checkingTemperature && data.startsWith("T:"))
{ {
QFuture<TemperatureReadings> parseThread = QtConcurrent::run(this, &MainWindow::parseStatus, data); QFuture<TemperatureReadings> parseThread = QtConcurrent::run(this, &MainWindow::parseStatus, data);
statusWatcher.setFuture(parseThread); //parseThread is very costly operation statusWatcher.setFuture(parseThread); //parseThread is very costly operation
ui->tempLine->setText(data); ui->tempLine->setText(data);
} }
else if(data.startsWith("wait")) readyRecieve = 1;
else if(data.startsWith("Resend")) //Handle resend if requested else if(data.startsWith("Resend")) //Handle resend if requested
{ {
if(currentLine > 0) currentLine -= data.split(':')[1].toInt(); if(currentLine > 0) currentLine -= data.split(':')[1].toInt();