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

Minor tweaks towards release

Browse Source
This commit is contained in:
NeoTheFox 2015-02-28 21:41:22 +03:00
parent 4aa66e8bdf
commit 27583c4828
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
aboutwindow.ui
View File

@ -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 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=" 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="-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 "NeoTheFox") 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="-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="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> <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; }
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>248</x> <x>257</x>
<y>254</y> <y>298</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>157</x> <x>157</x>
@ -91,8 +92,8 @@ p, li { white-space: pre-wrap; }
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>316</x> <x>325</x>
<y>260</y> <y>298</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>286</x> <x>286</x>

17
mainwindow.cpp
View File

@ -23,6 +23,7 @@ MainWindow::MainWindow(QWidget *parent) :
ui->baudbox->addItem(QString::number(250000)); ui->baudbox->addItem(QString::number(250000));
ui->baudbox->addItem(QString::number(460800)); ui->baudbox->addItem(QString::number(460800));
ui->baudbox->addItem(QString::number(500000)); 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->baudbox->setCurrentIndex(2);
ui->extruderlcd->setPalette(Qt::red); 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()); if(settings.value("core/senderinterval").toInt()) sendTimer.setInterval(settings.value("core/senderinterval").toInt());
else sendTimer.setInterval(5); else sendTimer.setInterval(5);
sendTimer.start(); sendTimer.start();
sinceLastTemp.start();
} }
MainWindow::~MainWindow() MainWindow::~MainWindow()
@ -115,7 +118,7 @@ bool MainWindow::sendLine(QString line)
{ {
if(printer.write(line.toUtf8()+'\n')) if(printer.write(line.toUtf8()+'\n'))
{ {
printMsg(line); printMsg(line + '\n');
return true; return true;
} }
else else
@ -167,7 +170,7 @@ void MainWindow::serialconnect()
break; break;
default: default:
printer.setBaudRate(QSerialPort::Baud115200); printer.setBaudRate(ui->baudbox->currentText().toInt());
break; break;
} }
@ -370,7 +373,7 @@ void MainWindow::printMsg(const char* text)
//cursor.insertBlock(bf, cf); //cursor.insertBlock(bf, cf);
cursor.insertText(text); cursor.insertText(text);
cursor.insertText("\n"); //cursor.insertText("\n");
ui->terminal->setTextCursor(cursor); ui->terminal->setTextCursor(cursor);
; ;
@ -386,7 +389,7 @@ void MainWindow::printMsg(QString text)
//cursor.insertBlock(bf, cf); //cursor.insertBlock(bf, cf);
cursor.insertText(text); cursor.insertText(text);
cursor.insertText("\n"); //cursor.insertText("\n");
ui->terminal->setTextCursor(cursor); ui->terminal->setTextCursor(cursor);
} }
@ -397,13 +400,17 @@ void MainWindow::on_sendBtn_clicked()
{ {
sending = false; sending = false;
ui->sendBtn->setText("Send"); ui->sendBtn->setText("Send");
ui->pauseBtn->setText("Pause");
ui->pauseBtn->setDisabled("true"); ui->pauseBtn->setDisabled("true");
paused = false
} }
else if(!sending) else if(!sending)
{ {
sending=true; sending=true;
ui->sendBtn->setText("Stop"); ui->sendBtn->setText("Stop");
ui->pauseBtn->setText("Pause");
ui->pauseBtn->setEnabled("true"); ui->pauseBtn->setEnabled("true");
paused = false
} }
ui->progressBar->setValue(0); ui->progressBar->setValue(0);
@ -447,7 +454,7 @@ void MainWindow::on_pauseBtn_clicked()
void MainWindow::checkStatus() 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) void MainWindow::on_checktemp_stateChanged(int arg1)