Subversion Repositories Code-Repo

Compare Revisions

Ignore whitespace Rev 371 → Rev 372

/Misc Projects/PcMarlinInterface/IOWidget.cpp
5,7 → 5,7
// Serial data UI
textData = new QTextEdit();
textData->setCurrentFont(QFont("Consolas", 8));
textData->append("Waiting for serial connection...");
textData->append("Waiting for serial connection... ");
textData->setMinimumSize(400, 100);
textData->setReadOnly(true);
textTransmit = new QLineEdit();
28,7 → 28,9
connect(textTransmit, SIGNAL(returnPressed()), btnTransmit, SIGNAL(clicked()));
connect(btnClear, SIGNAL(clicked()), this, SLOT(ClearBtn()));
 
EnableTransmit(false);
// EnableTransmit(false);
textTransmit->setEnabled(false);
btnTransmit->setEnabled(false);
lastTransmit = true;
}
 
47,13 → 49,15
str = QString(data);
}
 
emit TransmitByteArray(str.toUtf8());
textData->setTextColor(Qt::darkBlue);
 
QStringList cmds = str.split('\n');
QTime curTime = QTime::currentTime();
QStringList cmds = str.split('\n', QString::SkipEmptyParts);
for (int i = 0; i < cmds.size(); i++) {
textData->append("TX: " + cmds[i]);
emit TransmitByteArray((cmds[i] + '\n').toUtf8());
textData->setTextColor(Qt::darkBlue);
textData->append(curTime.toString("[HH:mm:ss:zzz]: ") + cmds[i]);
}
textData->moveCursor(QTextCursor::End);
textData->ensureCursorVisible();
 
// Save a flag indicating last activity was a transmit
lastTransmit = true;
62,13 → 66,17
void IOWidget::ProcessReceivedByte(QByteArray data)
{
textData->setTextColor(Qt::darkRed);
data.replace("\n", "\nRX: ");
QTime curTime = QTime::currentTime();
QString timeString = "\n" + curTime.toString("[HH:mm:ss:zzz]: ");
if (data.endsWith('\n')) data.remove(data.size()-1, 1);
data.replace('\n', timeString);
if (lastTransmit) {
textData->insertPlainText("\nRX: " + QString(data));
textData->insertPlainText(timeString + QString(data));
} else {
textData->insertPlainText(QString(data));
}
textData->moveCursor(QTextCursor::End);
textData->ensureCursorVisible();
lastTransmit = false;
}
 
79,11 → 87,17
 
void IOWidget::EnableTransmit(bool enable)
{
textData->setTextColor(Qt::black);
if (enable) {
textTransmit->setEnabled(true);
btnTransmit->setEnabled(true);
textData->insertPlainText("connected!");
} else {
textTransmit->setEnabled(false);
btnTransmit->setEnabled(false);
textData->append("Serial disconnected.");
textData->append("Waiting for serial connection... ");
}
textData->moveCursor(QTextCursor::End);
textData->ensureCursorVisible();
}