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

Cleanup

Browse Source
This commit is contained in:
NeoTheFox 2015-03-10 00:26:32 +03:00
parent ee019e42f8
commit a59f9b79e7
1 changed files with 69 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
mainwindow.cpp
View File

@ -274,7 +274,9 @@ void MainWindow::serialconnect()
} }
} }
//Buttons start /////////////////
//Buttons start//
/////////////////
void MainWindow::xplus() void MainWindow::xplus()
{ {
QString command = "G91\nG1 X" + ui->stepspin->text() + "\nG90"; QString command = "G91\nG1 X" + ui->stepspin->text() + "\nG90";
@ -446,40 +448,10 @@ void MainWindow::on_haltbtn_clicked()
userCommands.clear(); userCommands.clear();
injectCommand("M112"); injectCommand("M112");
} }
//Buttons end
void MainWindow::readSerial() void MainWindow::on_actionPrint_from_SD_triggered()
{ {
if(printer.canReadLine()) //Check if full line in buffer injectCommand("M20");
{
QByteArray data = printer.readLine(); //Read the line
emit recievedData(data); //Send data to parser thread
if(data.startsWith("ok")) readyRecieve++;
else if(data.startsWith("wa")) readyRecieve=1;
printMsg(QString(data)); //echo
}
}
void MainWindow::printMsg(const char* text)
{
QTextCursor cursor = ui->terminal->textCursor();
cursor.movePosition(QTextCursor::End);
cursor.insertText(text);
ui->terminal->setTextCursor(cursor);
;
}
void MainWindow::printMsg(QString text)
{
QTextCursor cursor = ui->terminal->textCursor();
cursor.movePosition(QTextCursor::End);
cursor.insertText(text);
ui->terminal->setTextCursor(cursor);
} }
void MainWindow::on_sendBtn_clicked() void MainWindow::on_sendBtn_clicked()
@ -519,6 +491,70 @@ void MainWindow::on_sendBtn_clicked()
currentLine = 0; currentLine = 0;
} }
void MainWindow::on_pauseBtn_clicked()
{
if(paused && !sdprinting)
{
paused = false;
if(autolock) ui->controlBox->setChecked(false);
ui->pauseBtn->setText("Pause");
}
else if(!paused && !sdprinting)
{
paused = true;
if(autolock) ui->controlBox->setChecked(true);
ui->pauseBtn->setText("Resume");
}
else if(sdprinting)
{
injectCommand("M25");
}
}
void MainWindow::on_releasebtn_clicked()
{
injectCommand("M84");
}
/////////////////
//Buttons end //
/////////////////
void MainWindow::readSerial()
{
if(printer.canReadLine()) //Check if full line in buffer
{
QByteArray data = printer.readLine(); //Read the line
emit recievedData(data); //Send data to parser thread
if(data.startsWith("ok")) readyRecieve++;
else if(data.startsWith("wa")) readyRecieve=1;
printMsg(QString(data)); //echo
}
}
void MainWindow::printMsg(const char* text)
{
QTextCursor cursor = ui->terminal->textCursor();
cursor.movePosition(QTextCursor::End);
cursor.insertText(text);
ui->terminal->setTextCursor(cursor);
;
}
void MainWindow::printMsg(QString text)
{
QTextCursor cursor = ui->terminal->textCursor();
cursor.movePosition(QTextCursor::End);
cursor.insertText(text);
ui->terminal->setTextCursor(cursor);
}
void MainWindow::sendNext() void MainWindow::sendNext()
{ {
if(!userCommands.isEmpty() && printer.isWritable() && readyRecieve > 0) //Inject user command if(!userCommands.isEmpty() && printer.isWritable() && readyRecieve > 0) //Inject user command
@ -554,26 +590,6 @@ void MainWindow::sendNext()
} }
} }
void MainWindow::on_pauseBtn_clicked()
{
if(paused && !sdprinting)
{
paused = false;
if(autolock) ui->controlBox->setChecked(false);
ui->pauseBtn->setText("Pause");
}
else if(!paused && !sdprinting)
{
paused = true;
if(autolock) ui->controlBox->setChecked(true);
ui->pauseBtn->setText("Resume");
}
else if(sdprinting)
{
injectCommand("M25");
}
}
void MainWindow::checkStatus() void MainWindow::checkStatus()
{ {
if(checkingTemperature if(checkingTemperature
@ -593,11 +609,6 @@ void MainWindow::on_actionSettings_triggered()
settingswindow.exec(); settingswindow.exec();
} }
void MainWindow::on_releasebtn_clicked()
{
injectCommand("M84");
}
void MainWindow::on_actionAbout_triggered() void MainWindow::on_actionAbout_triggered()
{ {
AboutWindow aboutwindow(this); AboutWindow aboutwindow(this);
@ -682,11 +693,6 @@ void MainWindow::updateTemperature(TemperatureReadings r)
sinceLastTemp.restart(); sinceLastTemp.restart();
} }
void MainWindow::on_actionPrint_from_SD_triggered()
{
injectCommand("M20");
}
void MainWindow::on_actionAbout_Qt_triggered() void MainWindow::on_actionAbout_Qt_triggered()
{ {
qApp->aboutQt(); qApp->aboutQt();