caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Proper looking output in python console

Browse Source
This commit is contained in:
Miodrag Milanovic 2018-06-11 15:34:01 +02:00
parent 979a14c930
commit 17fae4c9e1
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gui/mainwindow.cc
View File

@ -13,10 +13,9 @@ MainWindow::MainWindow(Design *_design, QWidget *parent)
PyImport_ImportModule("emb"); PyImport_ImportModule("emb");
write = [this](std::string s) { write = [this](std::string s) {
// ui->plainTextEdit->moveCursor(QTextCursor::End); ui->plainTextEdit->moveCursor(QTextCursor::End);
// ui->plainTextEdit->insertPlainText(s.c_str()); ui->plainTextEdit->insertPlainText(s.c_str());
// ui->plainTextEdit->moveCursor(QTextCursor::End); ui->plainTextEdit->moveCursor(QTextCursor::End);
ui->plainTextEdit->appendPlainText(s.c_str());
}; };
emb::set_stdout(write); emb::set_stdout(write);
std::string title = "nextpnr-ice40 - " + design->chip.getChipName(); std::string title = "nextpnr-ice40 - " + design->chip.getChipName();
@ -57,8 +56,11 @@ int MainWindow::executePython(std::string command)
PyErr_Clear(); PyErr_Clear();
PyObject *objectsRepresentation = PyObject_Str(v); PyObject *objectsRepresentation = PyObject_Str(v);
const char *errorStr = PyUnicode_AsUTF8(objectsRepresentation); std::string errorStr =
ui->plainTextEdit->appendPlainText(errorStr); PyUnicode_AsUTF8(objectsRepresentation) + std::string("\n");
ui->plainTextEdit->moveCursor(QTextCursor::End);
ui->plainTextEdit->insertPlainText(errorStr.c_str());
ui->plainTextEdit->moveCursor(QTextCursor::End);
Py_DECREF(objectsRepresentation); Py_DECREF(objectsRepresentation);
Py_XDECREF(exception); Py_XDECREF(exception);
Py_XDECREF(v); Py_XDECREF(v);
@ -72,7 +74,10 @@ int MainWindow::executePython(std::string command)
void MainWindow::on_lineEdit_returnPressed() void MainWindow::on_lineEdit_returnPressed()
{ {
std::string input = ui->lineEdit->text().toStdString(); std::string input = ui->lineEdit->text().toStdString();
ui->plainTextEdit->appendPlainText(std::string(">>> " + input).c_str()); ui->plainTextEdit->moveCursor(QTextCursor::End);
ui->plainTextEdit->insertPlainText(
std::string(">>> " + input + "\n").c_str());
ui->plainTextEdit->moveCursor(QTextCursor::End);
ui->plainTextEdit->update(); ui->plainTextEdit->update();
ui->lineEdit->clear(); ui->lineEdit->clear();
int error = executePython(input); int error = executePython(input);