Ui tweaks
Ajusted priority
This commit is contained in:
parent
b759337f4d
commit
3dd344f51b
2
main.cpp
2
main.cpp
@ -9,6 +9,8 @@ int main(int argc, char *argv[])
|
|||||||
QCoreApplication::setOrganizationDomain("https://github.com/NeoTheFox");
|
QCoreApplication::setOrganizationDomain("https://github.com/NeoTheFox");
|
||||||
QCoreApplication::setApplicationName("RepRaptor");
|
QCoreApplication::setApplicationName("RepRaptor");
|
||||||
|
|
||||||
|
QThread::currentThread()->setPriority(QThread::HighPriority);
|
||||||
|
|
||||||
MainWindow w;
|
MainWindow w;
|
||||||
w.show();
|
w.show();
|
||||||
|
|
||||||
|
|||||||
@ -139,6 +139,7 @@ MainWindow::~MainWindow()
|
|||||||
|
|
||||||
void MainWindow::open()
|
void MainWindow::open()
|
||||||
{
|
{
|
||||||
|
sdprinting = false;
|
||||||
QString filename;
|
QString filename;
|
||||||
QDir home;
|
QDir home;
|
||||||
filename = QFileDialog::getOpenFileName(this,
|
filename = QFileDialog::getOpenFileName(this,
|
||||||
@ -187,7 +188,6 @@ void MainWindow::parseFile(QFile &file)
|
|||||||
|
|
||||||
}
|
}
|
||||||
file.close();
|
file.close();
|
||||||
sdprinting = false;
|
|
||||||
ui->fileBox->setEnabled(true);
|
ui->fileBox->setEnabled(true);
|
||||||
ui->progressBar->setEnabled(true);
|
ui->progressBar->setEnabled(true);
|
||||||
ui->sendBtn->setText("Send");
|
ui->sendBtn->setText("Send");
|
||||||
@ -780,6 +780,7 @@ void MainWindow::updateTemperature(TemperatureReadings r)
|
|||||||
{
|
{
|
||||||
ui->extruderlcd->display(r.e);
|
ui->extruderlcd->display(r.e);
|
||||||
ui->bedlcd->display(r.b);
|
ui->bedlcd->display(r.b);
|
||||||
|
ui->tempLine->setText(r.raw);
|
||||||
sinceLastTemp.restart();
|
sinceLastTemp.restart();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -76,6 +76,8 @@ void Parser::parse(QByteArray data)
|
|||||||
r.b = temperatureRegxp.cap(0).toDouble();
|
r.b = temperatureRegxp.cap(0).toDouble();
|
||||||
else return;
|
else return;
|
||||||
|
|
||||||
|
r.raw = QString(data);
|
||||||
|
|
||||||
emit recievedTemperature(r);
|
emit recievedTemperature(r);
|
||||||
}
|
}
|
||||||
//else if(data.startsWith("wait")) emit recievedOkWait();
|
//else if(data.startsWith("wait")) emit recievedOkWait();
|
||||||
|
|||||||
@ -8,6 +8,7 @@ namespace RepRaptor
|
|||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
double e, b;
|
double e, b;
|
||||||
|
QString raw;
|
||||||
} TemperatureReadings;
|
} TemperatureReadings;
|
||||||
|
|
||||||
enum Firmware
|
enum Firmware
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user