Add stop execution button. Sleeps on all API calls.

Signed-off-by: Bhathiya Perera <[email protected]>

Author: JaDogg

About.htm

@@ -6,8 +6,8 @@
 <br />
 <b>Credits</b>
 <ul>
-<li>Qt 5.3.2</li>
-<li>Python 3.4.2</li>
+<li>Qt 5.9.0</li>
+<li>Python 3.6.1</li>
 <li>Frankie Simon's Python Syntax Highlight Code (Modified)</li>
 <li>Mateusz Loskot's Embedding Code (Modified)</li>
 <li>Train Icon from awicons.com</li>

Features/snippets.cpp

@@ -1,5 +1,6 @@
 #include "Features/snippets.h"
 #include <iostream>
+#include <QDataStream>
 
 Snippets::Snippets(QObject *parent) : QObject(parent), m_snippets(nullptr) {
   bool success;

Icons/Stop.png

@@ -35,14 +35,18 @@ HEADERS  += UI/mainview.h \
 
 FORMS    += UI/mainview.ui
 
-QMAKE_CXXFLAGS += -std=c++11 -Wpedantic
-
 RESOURCES += \
     PyRunResources.qrc
 
 RC_FILE = WindowsResources/win_rsrc.rc
 
 
-win32: LIBS += -LC:\Python34\libs\ -lpython34
-win32: INCLUDEPATH += C:\Python34\include
-win32: DEPENDPATH += C:\Python34\include
+win32: LIBS += -LC:\Users\Bhathiya\AppData\Local\Programs\Python\Python36-32\libs\ -lpython36
+win32: INCLUDEPATH += C:\Users\Bhathiya\AppData\Local\Programs\Python\Python36-32\include
+win32: DEPENDPATH += C:\Users\Bhathiya\AppData\Local\Programs\Python\Python36-32\include
+
+greaterThan(QT_MAJOR_VERSION, 4){
+    CONFIG += c++11
+} else {
+    QMAKE_CXXFLAGS += -std=c++11 -Wpedantic
+}

PyRun.pro

@@ -18,6 +18,7 @@
         <file>Icons/TuteLoad.png</file>
         <file>Icons/TuteFail.png</file>
         <file>Icons/TutePass.png</file>
+        <file>Icons/Stop.png</file>
     </qresource>
     <qresource prefix="/"/>
 </RCC>

PyRunResources.qrc

@@ -134,6 +134,7 @@ PyObject *ApiGetInput(PyObject *self, PyObject *args) {
   if (!PyArg_ParseTuple(args, ":numargs"))
     return NULL;
 
+  QThread::msleep(10);
   return Py_BuildValue("s", mainView->GetInput().toStdString().c_str());
 }
 PyObject *ApiSetInput(PyObject *self, PyObject *args) {
@@ -142,20 +143,23 @@ PyObject *ApiSetInput(PyObject *self, PyObject *args) {
     return NULL;
 
   emit worker->SetInput(QString(data));
+  QThread::msleep(10);
 
   return Py_BuildValue("i", 0);
 }
 PyObject *ApiGetAppPath(PyObject *self, PyObject *args) {
   if (!PyArg_ParseTuple(args, ":numargs"))
     return NULL;
 
+  QThread::msleep(10);
   return Py_BuildValue(
       "s", QCoreApplication::applicationDirPath().toStdString().c_str());
 }
 PyObject *ApiGetOutput(PyObject *self, PyObject *args) {
   if (!PyArg_ParseTuple(args, ":numargs"))
     return NULL;
 
+  QThread::msleep(10);
   return Py_BuildValue("s", mainView->GetOutput().toStdString().c_str());
 }
 
@@ -165,13 +169,15 @@ PyObject *ApiSetOutput(PyObject *self, PyObject *args) {
     return NULL;
 
   emit worker->SetOutput(QString(data));
+  QThread::msleep(10);
 
   return Py_BuildValue("i", 0);
 }
 PyObject *ApiGetCode(PyObject *self, PyObject *args) {
   if (!PyArg_ParseTuple(args, ":numargs"))
     return NULL;
 
+  QThread::msleep(10);
   return Py_BuildValue("s", mainView->GetCode().toStdString().c_str());
 }
 
@@ -181,6 +187,7 @@ PyObject *ApiSetCode(PyObject *self, PyObject *args) {
     return NULL;
 
   emit worker->SetCode(QString(data));
+  QThread::msleep(10);
 
   return Py_BuildValue("i", 0);
 }
@@ -191,6 +198,7 @@ PyObject *ApiSetSearchRegex(PyObject *self, PyObject *args) {
     return NULL;
 
   emit worker->SetSearchRegex(QString(data));
+  QThread::msleep(10);
 
   return Py_BuildValue("i", 0);
 }
@@ -201,6 +209,7 @@ PyObject *ApiWriteOutput(PyObject *self, PyObject *args) {
     return NULL;
 
   emit worker->WriteOutput(QString(data));
+  QThread::msleep(10);
 
   return Py_BuildValue("i", 0);
 }

PythonAccess/emb.cpp

@@ -12,6 +12,7 @@ void PythonWorker::RunPython(const QString &startme, const QString &code) {
 
   emb::StdOutWriteType write = [this](std::string s) {
     emit this->WriteOutput(QString::fromStdString(s));
+    QThread::msleep(10);
   };
 
   emb::SetStdout(write);

PythonAccess/pythonworker.cpp

@@ -2,6 +2,7 @@
 #define PYTHONWORKER_H
 
 #include <QObject>
+#include <QThread>
 
 class PythonWorker : public QObject {
   Q_OBJECT

PythonAccess/pythonworker.h

@@ -23,8 +23,9 @@ void MainView::SetupPython() {
   emb::setMainView(this);
   PythonWorker *worker = new PythonWorker();
   emb::setWorker(worker);
-  worker->moveToThread(&m_workerThread);
-  connect(&m_workerThread, &QThread::finished, worker, &QObject::deleteLater);
+  m_workerThread = new QThread();
+  worker->moveToThread(m_workerThread);
+  connect(m_workerThread, &QThread::finished, worker, &QObject::deleteLater);
   connect(this, &MainView::operate, worker, &PythonWorker::RunPython);
   connect(worker, &PythonWorker::WriteOutput, this, &MainView::WriteOutput);
   connect(worker, &PythonWorker::SetCode, this, &MainView::SetCode);
@@ -35,14 +36,15 @@ void MainView::SetupPython() {
   connect(worker, &PythonWorker::EndPythonRun, this, &MainView::EndPythonRun);
   connect(worker, &PythonWorker::SetSearchRegex, this,
           &MainView::SetSearchRegex);
-  m_workerThread.start();
+  m_workerThread->start();
 }
 // Buttons to enable when you execute a python script
 void MainView::StartPythonRun() {
   ui->btnRun->setEnabled(false);
   ui->btnRunSnippet->setEnabled(false);
   ui->btnRunSnippetFromCombo->setEnabled(false);
   ui->dwTutorial->setEnabled(false);
+  ui->btnStopPython->setEnabled(true);
 }
 // End python script
 void MainView::EndPythonRun() {
@@ -56,6 +58,7 @@ void MainView::EndPythonRun() {
   ui->btnRunSnippet->setEnabled(true);
   ui->btnRunSnippetFromCombo->setEnabled(true);
   ui->dwTutorial->setEnabled(true);
+  ui->btnStopPython->setEnabled(false);
 }
 // Util function: Confirm message box
 bool MainView::Confirm(const QString &what) {
@@ -169,8 +172,9 @@ MainView::~MainView() {
   settings.setValue(KEY_NOTESBOX, ui->txtNotes->toPlainText());
   settings.setValue(KEY_FONT, ui->fntCombo->currentText());
   settings.setValue(KEY_FONTSIZE, ui->cmbFontSize->currentIndex());
-  m_workerThread.quit();
-  m_workerThread.wait();
+  m_workerThread->quit();
+  m_workerThread->wait();
+  delete m_workerThread;
   delete ui;
   delete m_tute;
 }
@@ -542,3 +546,12 @@ void MainView::on_btnTuteMark_clicked()
 
     emit operate(m_startMe, ui->txtCode->toPlainText());
 }
+
+void MainView::on_btnStopPython_clicked()
+{
+    m_workerThread->terminate();
+    this->EndPythonRun();
+    m_workerThread->wait();
+    delete m_workerThread;
+    SetupPython();
+}

UI/mainview.cpp

@@ -86,12 +86,14 @@ private slots:
   void on_btnTuteLoad_clicked();
   void on_btnTuteMark_clicked();
 
+  void on_btnStopPython_clicked();
+
 private:
   const QString FILETYPES_PYTHON = tr("Python Code (*.py);;All files (*.*)");
   const QString FILETYPES_OTHER = tr("Text files (*.txt);;All files (*.*)");
   const QString FILETYPES_TUTE = tr("Tutorial files (*.tute);;All files (*.*)");
 
-  QThread m_workerThread;
+  QThread* m_workerThread;
   Ui::MainView *ui;
   PythonSyntaxHighlighter *m_highlighterCodeArea;
   PythonSyntaxHighlighter *m_highlighterSnippetArea;