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

SD printing progress fix

Browse Source
This commit is contained in:
NeoTheFox 2015-03-06 18:04:34 +03:00
parent 763bc62b26
commit ec04f3340b
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mainwindow.cpp
View File

@ -473,7 +473,7 @@ void MainWindow::readSerial()
} }
else if(data.startsWith("Done")) sdprinting = false; else if(data.startsWith("Done")) sdprinting = false;
else if(data.startsWith("start") && checkingTemperature) injectCommand("M105"); else if(data.startsWith("start") && checkingTemperature) injectCommand("M105");
else if(data.startsWith("SD printing byte") && sdWatcher.isFinished()) else if(data.startsWith("SD printing byte"))
{ {
QFuture<double> parseSDThread = QtConcurrent::run(this, &MainWindow::parseSDStatus, data); QFuture<double> parseSDThread = QtConcurrent::run(this, &MainWindow::parseSDStatus, data);
sdWatcher.setFuture(parseSDThread); sdWatcher.setFuture(parseSDThread);
@ -767,18 +767,17 @@ void MainWindow::initSDprinting()
double MainWindow::parseSDStatus(QByteArray data) double MainWindow::parseSDStatus(QByteArray data)
{ {
/* Old parsing // Old parsing
QString tmp; QString tmp;
QString fragment = data.split(' ').at(3); QString fragment = data.split(' ').at(3);
for(int i = 0; fragment.at(i) != '/'; ++i) for(int i = 0; fragment.at(i) != '/'; ++i)
{ {
tmp += fragment.at(i); tmp += fragment.at(i);
} }
*/ return tmp.toDouble();
//if(SDStatusRegxp.indexIn(QString(data)) != 0)
if(SDStatusRegxp.indexIn(QString(data)) != 0) // return SDStatusRegxp.cap(0).toDouble();
return SDStatusRegxp.cap(0).toDouble(); //else return -1;
else return -1;
} }
void MainWindow::selectSDfile(QString file) void MainWindow::selectSDfile(QString file)