From b60379192c6ba25cddbf7306551b191c9ffa0f0e Mon Sep 17 00:00:00 2001 From: NeoTheFox Date: Sun, 1 Mar 2015 16:28:46 +0300 Subject: [PATCH] Updated menus and added screenshot to README.md --- README.md | 3 +++ mainwindow.cpp | 8 ++++++-- settingswindow.ui | 20 +++++++++++++++++++- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4651972..555cdba 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,9 @@ A Qt RepRap gcode sender/host controller Right now the project is in early stage, use only for development testing! +## Screenshots +![RepRaptor printing a file](http://reprap.org/mediawiki/images/2/2d/RepRaptor_screenshot0.png) + ## Building on Ubuntu 14.04.2 ``` diff --git a/mainwindow.cpp b/mainwindow.cpp index 9dfb725..b6c5f8f 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -406,6 +406,7 @@ void MainWindow::on_sendBtn_clicked() ui->sendBtn->setText("Send"); ui->pauseBtn->setText("Pause"); ui->pauseBtn->setDisabled("true"); + ui->controlBox->setChecked("true"); paused = false; } else if(!sending) @@ -414,6 +415,7 @@ void MainWindow::on_sendBtn_clicked() ui->sendBtn->setText("Stop"); ui->pauseBtn->setText("Pause"); ui->pauseBtn->setEnabled("true"); + ui->controlBox->setChecked("false"); paused = false; } @@ -423,14 +425,14 @@ void MainWindow::on_sendBtn_clicked() void MainWindow::sendNext() { - if(injectingCommand && commandDone && printer.bytesToWrite() < 100) + if(injectingCommand && commandDone && printer.bytesToWrite() < 150) { sendLine(userCommand); commandDone=false; injectingCommand=false; return; } - else if(sending && !paused && printer.bytesToWrite() < 100 && commandDone) + else if(sending && !paused && printer.bytesToWrite() < 150 && commandDone) { if(currentLine >= gcode.size()) //check if we are at the end of array { @@ -454,11 +456,13 @@ void MainWindow::on_pauseBtn_clicked() if(paused) { paused = false; + ui->controlBox->setChecked(false); ui->pauseBtn->setText("Pause"); } else { paused = true; + ui->controlBox->setChecked(true); ui->pauseBtn->setText("Resume"); } } diff --git a/settingswindow.ui b/settingswindow.ui index f6030da..17bce22 100644 --- a/settingswindow.ui +++ b/settingswindow.ui @@ -51,6 +51,15 @@ + + A good default is 5, lower = fater, higher = less CPU load + + + 100 + + + 1 + 999 @@ -72,8 +81,17 @@ + + A good default is 5000. More = less interruptions, less = better temperature monitoring + + + 100 + + + 500 + - 9999 + 99999