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

Formating tweaks

Browse Source
This commit is contained in:
NeoTheFox 2015-03-03 23:35:41 +03:00
parent c0ca93a6a2
commit 4ec43e3176
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mainwindow.cpp
View File

@ -98,7 +98,10 @@ void MainWindow::open()
{ {
QString filename; QString filename;
QDir home; QDir home;
filename = QFileDialog::getOpenFileName(this, tr("Open GCODE"),home.home().absolutePath(), tr("GCODE (*.g *.gcode *.nc)")); filename = QFileDialog::getOpenFileName(this,
tr("Open GCODE"),
home.home().absolutePath(),
tr("GCODE (*.g *.gcode *.nc)"));
gfile.setFileName(filename); gfile.setFileName(filename);
if(!recentFiles.contains(filename)) if(!recentFiles.contains(filename))
@ -480,14 +483,20 @@ void MainWindow::sendNext()
currentLine = 0; currentLine = 0;
ui->sendBtn->setText("Send"); ui->sendBtn->setText("Send");
ui->pauseBtn->setDisabled("true"); ui->pauseBtn->setDisabled("true");
ui->filelines->setText(QString::number(gcode.size()) + QString("/") + QString::number(currentLine) + QString(" Lines")); ui->filelines->setText(QString::number(gcode.size())
+ QString("/")
+ QString::number(currentLine)
+ QString(" Lines"));
return; return;
} }
sendLine(gcode.at(currentLine)); sendLine(gcode.at(currentLine));
currentLine++; currentLine++;
readyRecieve--; readyRecieve--;
ui->filelines->setText(QString::number(gcode.size()) + QString("/") + QString::number(currentLine) + QString(" Lines")); ui->filelines->setText(QString::number(gcode.size())
+ QString("/")
+ QString::number(currentLine)
+ QString(" Lines"));
ui->progressBar->setValue(((float)currentLine/gcode.size()) * 100); ui->progressBar->setValue(((float)currentLine/gcode.size()) * 100);
} }
} }
@ -514,7 +523,9 @@ void MainWindow::on_pauseBtn_clicked()
void MainWindow::checkStatus() void MainWindow::checkStatus()
{ {
if(checkingTemperature && (sinceLastTemp.elapsed() > statusTimer.interval())) injectCommand("M105"); if(checkingTemperature &&
(sinceLastTemp.elapsed() > statusTimer.interval())
&& statusWatcher.isFinished()) injectCommand("M105");
} }
void MainWindow::on_checktemp_stateChanged(int arg1) void MainWindow::on_checktemp_stateChanged(int arg1)
@ -682,7 +693,10 @@ void MainWindow::selectSDfile(QString file)
void MainWindow::updateSDStatus() void MainWindow::updateSDStatus()
{ {
double currentSDbytes = sdWatcher.future().result(); double currentSDbytes = sdWatcher.future().result();
ui->filelines->setText(QString::number(sdBytes) + QString("/") + QString::number(currentSDbytes) + QString(" bytes")); ui->filelines->setText(QString::number(sdBytes)
+ QString("/")
+ QString::number(currentSDbytes)
+ QString(" bytes"));
ui->progressBar->setValue(currentSDbytes/sdBytes * 100); ui->progressBar->setValue(currentSDbytes/sdBytes * 100);
if(currentSDbytes == sdBytes) sdprinting = false; if(currentSDbytes == sdBytes) sdprinting = false;
} }