diff options
Diffstat (limited to 'gui/mainwindow.cc')
-rw-r--r-- | gui/mainwindow.cc | 42 |
1 files changed, 18 insertions, 24 deletions
diff --git a/gui/mainwindow.cc b/gui/mainwindow.cc index b72a0851..c535f878 100644 --- a/gui/mainwindow.cc +++ b/gui/mainwindow.cc @@ -1,36 +1,29 @@ #include "mainwindow.h" -#include "ui_mainwindow.h" #include <functional> #include <iostream> #include <string> -#include "pybindings.h" #include "emb.h" +#include "pybindings.h" +#include "ui_mainwindow.h" -MainWindow::MainWindow(QWidget *parent) : - QMainWindow(parent), - ui(new Ui::MainWindow) +MainWindow::MainWindow(QWidget *parent) + : QMainWindow(parent), ui(new Ui::MainWindow) { ui->setupUi(this); PyImport_ImportModule("emb"); - - write = [this] (std::string s) { - //ui->plainTextEdit->moveCursor(QTextCursor::End); - //ui->plainTextEdit->insertPlainText(s.c_str()); - //ui->plainTextEdit->moveCursor(QTextCursor::End); + + write = [this](std::string s) { + // ui->plainTextEdit->moveCursor(QTextCursor::End); + // ui->plainTextEdit->insertPlainText(s.c_str()); + // ui->plainTextEdit->moveCursor(QTextCursor::End); ui->plainTextEdit->appendPlainText(s.c_str()); }; emb::set_stdout(write); } -MainWindow::~MainWindow() -{ - delete ui; -} +MainWindow::~MainWindow() { delete ui; } -void handle_system_exit() -{ - exit(-1); -} +void handle_system_exit() { exit(-1); } int MainWindow::executePython(std::string command) { @@ -39,9 +32,10 @@ int MainWindow::executePython(std::string command) if (m == NULL) return -1; d = PyModule_GetDict(m); - v = PyRun_StringFlags(command.c_str(), (command.empty() ? Py_file_input : Py_single_input), d, d, NULL); - if (v == NULL) - { + v = PyRun_StringFlags(command.c_str(), + (command.empty() ? Py_file_input : Py_single_input), + d, d, NULL); + if (v == NULL) { PyObject *exception, *v, *tb; if (PyErr_ExceptionMatches(PyExc_SystemExit)) { @@ -60,8 +54,8 @@ int MainWindow::executePython(std::string command) return 0; PyErr_Clear(); - PyObject* objectsRepresentation = PyObject_Str(v); - const char* errorStr = PyUnicode_AsUTF8(objectsRepresentation); + PyObject *objectsRepresentation = PyObject_Str(v); + const char *errorStr = PyUnicode_AsUTF8(objectsRepresentation); ui->plainTextEdit->appendPlainText(errorStr); Py_DECREF(objectsRepresentation); Py_XDECREF(exception); @@ -75,7 +69,7 @@ int MainWindow::executePython(std::string command) 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->update(); ui->lineEdit->clear(); |