From a59f9b79e7680e489474666ca8e209ca5af57314 Mon Sep 17 00:00:00 2001
From: NeoTheFox <soniczerops@gmail.com>
Date: Tue, 10 Mar 2015 00:26:32 +0300
Subject: [PATCH] Cleanup

---
 mainwindow.cpp | 132 ++++++++++++++++++++++++++-----------------------
 1 file changed, 69 insertions(+), 63 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 52c58a0..9eb598a 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -274,7 +274,9 @@ void MainWindow::serialconnect()
      }
 }
 
-//Buttons start
+/////////////////
+//Buttons start//
+/////////////////
 void MainWindow::xplus()
 {
     QString command = "G91\nG1 X" + ui->stepspin->text() + "\nG90";
@@ -446,40 +448,10 @@ void MainWindow::on_haltbtn_clicked()
     userCommands.clear();
     injectCommand("M112");
 }
-//Buttons end
 
-void MainWindow::readSerial()
+void MainWindow::on_actionPrint_from_SD_triggered()
 {
-    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);
+    injectCommand("M20");
 }
 
 void MainWindow::on_sendBtn_clicked()
@@ -519,6 +491,70 @@ void MainWindow::on_sendBtn_clicked()
     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()
 {
     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()
 {
     if(checkingTemperature
@@ -593,11 +609,6 @@ void MainWindow::on_actionSettings_triggered()
     settingswindow.exec();
 }
 
-void MainWindow::on_releasebtn_clicked()
-{
-    injectCommand("M84");
-}
-
 void MainWindow::on_actionAbout_triggered()
 {
     AboutWindow aboutwindow(this);
@@ -682,11 +693,6 @@ void MainWindow::updateTemperature(TemperatureReadings r)
     sinceLastTemp.restart();
 }
 
-void MainWindow::on_actionPrint_from_SD_triggered()
-{
-    injectCommand("M20");
-}
-
 void MainWindow::on_actionAbout_Qt_triggered()
 {
     qApp->aboutQt();