Monor structure tweaks

This commit is contained in:
NeoTheFox 2015-03-14 01:11:54 +03:00
parent fb02f184ed
commit 3f0d2a135f
3 changed files with 5 additions and 6 deletions

View File

@ -531,7 +531,7 @@ void MainWindow::printMsg(const char* text)
cursor.insertText(text); cursor.insertText(text);
ui->terminal->setTextCursor(cursor); ui->terminal->setTextCursor(cursor);
;
} }
void MainWindow::printMsg(QString text) void MainWindow::printMsg(QString text)
@ -835,9 +835,9 @@ void MainWindow::updateFileProgress(FileProgress p)
ui->pauseBtn->setEnabled(true); ui->pauseBtn->setEnabled(true);
sending = true; sending = true;
} }
ui->filelines->setText(QString::number(p.P) ui->filelines->setText(QString::number(p.T)
+ QString("/") + QString("/")
+ QString::number(p.T) + QString::number(p.P)
+ QString(" Lines")); + QString(" Lines"));
ui->progressBar->setValue(((float)p.P/p.T) * 100); ui->progressBar->setValue(((float)p.P/p.T) * 100);
} }

View File

@ -156,7 +156,7 @@ void Sender::setFile(QVector <QString> f)
void Sender::injectCommand(QString command) void Sender::injectCommand(QString command)
{ {
userCommands.enqueue(command); if(userCommands.contains(command)) userCommands.enqueue(command);
} }
void Sender::recievedOkWait() void Sender::recievedOkWait()

View File

@ -20,9 +20,8 @@ public:
explicit Sender(QObject *parent = 0); explicit Sender(QObject *parent = 0);
~Sender(); ~Sender();
QSerialPort *printer;
protected: protected:
QSerialPort *printer;
int currentLine; int currentLine;
int totalLineNum; int totalLineNum;
int baudrate; int baudrate;