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

Removed unneeded concurrent module

Browse Source
This commit is contained in:
NeoTheFox 2015-03-15 16:42:50 +03:00
parent 12edb52d0c
commit bdb3660134
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RepRaptor.pro
View File

@ -5,7 +5,7 @@
# #
#------------------------------------------------- #-------------------------------------------------
QT += core gui serialport concurrent QT += core gui serialport
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets greaterThan(QT_MAJOR_VERSION, 4): QT += widgets

5
mainwindow.cpp
View File

@ -364,8 +364,9 @@ void MainWindow::homeall()
void MainWindow::on_sendbtn_clicked() void MainWindow::on_sendbtn_clicked()
{ {
emit injectCommand(ui->sendtext->text()); QString command = ui->sendtext->text();
userHistory.append(ui->sendtext->text()); emit injectCommand(command);
userHistory.append(command);
userHistoryPos = 0; userHistoryPos = 0;
} }

6
mainwindow.h
View File

@ -5,14 +5,13 @@
#include <QFileDialog> #include <QFileDialog>
#include <QtSerialPort/QtSerialPort> #include <QtSerialPort/QtSerialPort>
#include <QFile> #include <QFile>
#include <QFuture> #include <QThread>
#include <QVector> #include <QVector>
#include <QTextStream> #include <QTextStream>
#include <QtConcurrent/QtConcurrent>
#include <QSettings> #include <QSettings>
#include <QElapsedTimer> #include <QElapsedTimer>
#include <QMessageBox>
#include <QRegExp> #include <QRegExp>
#include <QMap>
#include "settingswindow.h" #include "settingswindow.h"
#include "aboutwindow.h" #include "aboutwindow.h"
@ -43,6 +42,7 @@ public:
QThread *senderThread; QThread *senderThread;
protected: protected:
QMap <QString, QString> macros;
QFile gfile; QFile gfile;
QVector<QString> gcode; QVector<QString> gcode;
QQueue <QString> userCommands; QQueue <QString> userCommands;