diff --git a/aboutwindow.ui b/aboutwindow.ui index 73fd8a3..ecb5e09 100644 --- a/aboutwindow.ui +++ b/aboutwindow.ui @@ -36,7 +36,8 @@ p, li { white-space: pre-wrap; } <p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><img src=":/pics/logo" /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">RepRaptor</span> is a free and open source software for controlling RepRap and similar mashines. This software is distributed by terms of <a href="https://www.gnu.org/licenses/gpl-2.0.html"><span style=" text-decoration: underline; color:#0000ff;">GPL v2 licence.</span></a></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; text-decoration: underline; color:#0000ff;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">RepRaptor's main goal is to be as simple as possible and fast, yet functional. This software is being developed as a primary host software for <span style=" font-weight:600;">MGTU MIREA</span> university's 3D printing labratory.</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">RepRaptor's main goal is to be as simple as possible and fast, yet functional. This software is being developed as a primary host software for <span style=" font-weight:600;">MGTU MIREA</span> university's 3D printing labratory by</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="mailto:repraptor-dev@repraptor.33mail.com"><span style=" text-decoration: underline; color:#0000ff;">Nickolay (aka &quot;NeoTheFox&quot;) Mardanov.</span></a></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="https://github.com/NeoTheFox/RepRaptor"><span style=" text-decoration: underline; color:#0000ff;">GitHub</span></a></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.reprap.org"><span style=" text-decoration: underline; color:#0000ff;">RepRap</span></a></p> @@ -75,8 +76,8 @@ p, li { white-space: pre-wrap; } accept() - 248 - 254 + 257 + 298 157 @@ -91,8 +92,8 @@ p, li { white-space: pre-wrap; } reject() - 316 - 260 + 325 + 298 286 diff --git a/mainwindow.cpp b/mainwindow.cpp index 6c6eca3..4f05539 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -23,6 +23,7 @@ MainWindow::MainWindow(QWidget *parent) : ui->baudbox->addItem(QString::number(250000)); ui->baudbox->addItem(QString::number(460800)); ui->baudbox->addItem(QString::number(500000)); + if(settings.value("printer/baudrateIndex").toInt()) ui->baudbox->setCurrentIndex(settings.value("printer/baudrateIndex").toInt()); ui->baudbox->setCurrentIndex(2); ui->extruderlcd->setPalette(Qt::red); @@ -47,6 +48,8 @@ MainWindow::MainWindow(QWidget *parent) : if(settings.value("core/senderinterval").toInt()) sendTimer.setInterval(settings.value("core/senderinterval").toInt()); else sendTimer.setInterval(5); sendTimer.start(); + + sinceLastTemp.start(); } MainWindow::~MainWindow() @@ -115,7 +118,7 @@ bool MainWindow::sendLine(QString line) { if(printer.write(line.toUtf8()+'\n')) { - printMsg(line); + printMsg(line + '\n'); return true; } else @@ -167,7 +170,7 @@ void MainWindow::serialconnect() break; default: - printer.setBaudRate(QSerialPort::Baud115200); + printer.setBaudRate(ui->baudbox->currentText().toInt()); break; } @@ -370,7 +373,7 @@ void MainWindow::printMsg(const char* text) //cursor.insertBlock(bf, cf); cursor.insertText(text); - cursor.insertText("\n"); + //cursor.insertText("\n"); ui->terminal->setTextCursor(cursor); ; @@ -386,7 +389,7 @@ void MainWindow::printMsg(QString text) //cursor.insertBlock(bf, cf); cursor.insertText(text); - cursor.insertText("\n"); + //cursor.insertText("\n"); ui->terminal->setTextCursor(cursor); } @@ -397,13 +400,17 @@ void MainWindow::on_sendBtn_clicked() { sending = false; ui->sendBtn->setText("Send"); + ui->pauseBtn->setText("Pause"); ui->pauseBtn->setDisabled("true"); + paused = false } else if(!sending) { sending=true; ui->sendBtn->setText("Stop"); + ui->pauseBtn->setText("Pause"); ui->pauseBtn->setEnabled("true"); + paused = false } ui->progressBar->setValue(0); @@ -447,7 +454,7 @@ void MainWindow::on_pauseBtn_clicked() void MainWindow::checkStatus() { - if(checkingTemperature && sinceLastTemp.elapsed() < statusTimer.interval()) sendLine("M105"); + if(checkingTemperature && (sinceLastTemp.elapsed() < statusTimer.interval())) sendLine("M105"); } void MainWindow::on_checktemp_stateChanged(int arg1)