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

Fixed protocol

Browse Source
This commit is contained in:
NeoTheFox 2015-03-03 21:52:37 +03:00
parent a8744c5cd8
commit caf9a47fb9
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mainwindow.cpp
View File

@ -385,6 +385,7 @@ void MainWindow::readSerial()
{ {
QFuture<TemperatureReadings> parseThread = QtConcurrent::run(this, &MainWindow::parseStatus, data); QFuture<TemperatureReadings> parseThread = QtConcurrent::run(this, &MainWindow::parseStatus, data);
statusWatcher.setFuture(parseThread); //parseThread is very costly operation statusWatcher.setFuture(parseThread); //parseThread is very costly operation
ui->tempLine->setText(data);
} }
else if(data.startsWith("Resend")) //Handle resend if requested else if(data.startsWith("Resend")) //Handle resend if requested
{ {
@ -403,7 +404,6 @@ void MainWindow::readSerial()
readingFiles = true; //start reading files from SD readingFiles = true; //start reading files from SD
} }
commandDone = true;
printMsg(QString(data)); //echo printMsg(QString(data)); //echo
} }
} }

16
mainwindow.ui
View File

@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>761</width> <width>761</width>
<height>433</height> <height>456</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -206,6 +206,19 @@
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="2"> <item row="2" column="0" colspan="2">
<widget class="QLabel" name="tempLine">
<property name="maximumSize">
<size>
<width>200</width>
<height>15</height>
</size>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="QCheckBox" name="checktemp"> <widget class="QCheckBox" name="checktemp">
<property name="text"> <property name="text">
<string>Check temperature</string> <string>Check temperature</string>
@ -555,7 +568,6 @@
<addaction name="menuTools"/> <addaction name="menuTools"/>
<addaction name="menuAbout"/> <addaction name="menuAbout"/>
</widget> </widget>
<widget class="QStatusBar" name="statusBar"/>
<widget class="QToolBar" name="toolBar"> <widget class="QToolBar" name="toolBar">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>

2
settingswindow.cpp
View File

@ -7,7 +7,7 @@ SettingsWindow::SettingsWindow(QWidget *parent) :
{ {
ui->setupUi(this); ui->setupUi(this);
if(!settings.value("core/firstrun").toBool()) ui->senderbox->setValue(2); if(!settings.value("core/firstrun").toBool()) ui->senderbox->setValue(4);
else ui->senderbox->setValue(settings.value("core/senderinterval").toFloat()); else ui->senderbox->setValue(settings.value("core/senderinterval").toFloat());
if(settings.value("core/statusinterval").toInt()) ui->statusbox->setValue(settings.value("core/statusinterval").toInt()); if(settings.value("core/statusinterval").toInt()) ui->statusbox->setValue(settings.value("core/statusinterval").toInt());