Fix python include issue

CMakeLists.txt

@@ -28,7 +28,7 @@ find_package(PkgConfig REQUIRED)
 pkg_check_modules(EISMULIPLEXER REQUIRED eismuliplexer)
 find_package(Qt6 REQUIRED COMPONENTS Widgets)
 find_package(Qt6 REQUIRED COMPONENTS Core)
-# find_package(Python3 REQUIRED) - Removed since we're using QProcess instead of embedding Python
+find_package(Python3 COMPONENTS Interpreter Development REQUIRED)
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTOUIC ON)
@@ -53,9 +53,8 @@ add_executable(${PROJECT_NAME}
 set_target_properties(${PROJECT_NAME} PROPERTIES WIN32_EXECUTABLE ON)
 target_compile_options(${PROJECT_NAME} PUBLIC "-Wall")
 target_include_directories(${PROJECT_NAME} PUBLIC QCodeEditor)
-# target_include_directories(${PROJECT_NAME} PRIVATE ${Python3_INCLUDE_DIRS}) - Removed since we're using QProcess instead of embedding Python
-target_link_libraries(${PROJECT_NAME} PRIVATE Qt6::Widgets Qt6::Core ${EISMULIPLEXER_LIBRARIES} QCodeEditor)
-# ${Python3_LIBRARIES} - Removed since we're using QProcess instead of embedding Python
+target_include_directories(${PROJECT_NAME} PRIVATE ${Python3_INCLUDE_DIRS})
+target_link_libraries(${PROJECT_NAME} PRIVATE Qt6::Widgets Qt6::Core ${EISMULIPLEXER_LIBRARIES} QCodeEditor ${Python3_LIBRARIES})
 set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/resources/eismultiplexerqt.png PROPERTIES QT_RESOURCE_ALIAS eismultiplexerqt.png)
 qt_add_resources(${PROJECT_NAME} "resources" PREFIX "/" FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/eismultiplexerqt.png )
 install(TARGETS ${PROJECT_NAME} DESTINATION bin)

pythonembed.cpp

@@ -1,61 +1,73 @@
-
-
 #include "pythonembed.h"
+#pragma push_macro("slots")
+#undef slots
+#include <Python.h>
+#pragma pop_macro("slots")
 #include <QDebug>
 
 PythonEmbed::PythonEmbed(QTextEdit* outputWidget, QObject* parent)
-    : QObject(parent), m_outputWidget(outputWidget), m_process(nullptr) {
-    m_process = new QProcess(this);
-    connect(m_process, &QProcess::readyReadStandardOutput, this, &PythonEmbed::onOutputAvailable);
-    connect(m_process, &QProcess::readyReadStandardError, this, &PythonEmbed::onErrorAvailable);
-    connect(m_process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), this, &PythonEmbed::onProcessFinished);
+    : QObject(parent), m_outputWidget(outputWidget) {
+    // Initialize Python
+    Py_Initialize();
+
+    m_initialized = true;
+
+    // Initialize the output widget with Python prompt
+    m_outputWidget->clear();
+    m_outputWidget->append("Python 3.11.2 (main, Oct  5 2023, 17:20:59) [GCC 11.4.0] on linux\n");
+    m_outputWidget->append("Type \"help\", \"copyright\", \"credits\" or \"license\" for more information.\n\n");
+    m_outputWidget->append(">>> ");
 }
 
 PythonEmbed::~PythonEmbed() {
-    if (m_process) {
-        m_process->terminate();
-        m_process->waitForFinished(1000);
+    if (m_initialized) {
+        Py_Finalize();
     }
 }
 
 void PythonEmbed::runScript(const QString& scriptContent) {
-    if (m_process->state() == QProcess::Running) {
-        m_process->terminate();
-        m_process->waitForFinished(1000);
+    if (!m_initialized) {
+        m_outputWidget->append("Python not initialized\n");
+        return;
     }
 
-    m_outputWidget->clear();
-    m_outputWidget->append("Python 3.11.2 (main, Oct  5 2023, 17:20:59) [GCC 11.4.0] on linux\n");
-    m_outputWidget->append("Type \"help\", \"copyright\", \"credits\" or \"license\" for more information.\n\n");
+    // Convert QString to const char*
+    QByteArray scriptBytes = scriptContent.toUtf8();
+    const char* script = scriptBytes.constData();
 
-    m_process->start("python3", QStringList() << "-c" << scriptContent);
+    // Run the script
+    PyRun_SimpleString(script);
+
+    // Check for any errors
+    if (PyErr_Occurred()) {
+        handlePythonError("Script execution error");
+    } else {
+        m_outputWidget->append("\n>>> ");
+    }
 }
 
 void PythonEmbed::stopScript() {
-    if (m_process && m_process->state() == QProcess::Running) {
-        m_process->terminate();
+    // In this simple implementation, we don't have a running Python thread
+    // to stop, but we could add that functionality later
+}
+
+void PythonEmbed::handlePythonError(const char* context) {
+    PyObject *type, *value, *traceback;
+    PyErr_Fetch(&type, &value, &traceback);
+    if (type) {
+        PyObject *str = PyObject_Str(value);
+        PyObject *bytes = PyUnicode_AsEncodedString(str, "utf-8", "strict");
+        const char *error_msg = PyBytes_AS_STRING(bytes);
+
+        QString errorString = QString::fromUtf8(context) + ": " + QString::fromUtf8(error_msg);
+        m_outputWidget->append(errorString);
+
+        Py_DecRef(str);
+        Py_DecRef(bytes);
+        Py_DecRef(type);
+        Py_DecRef(value);
+        Py_DecRef(traceback);
+    } else {
+        m_outputWidget->append(QString::fromUtf8(context) + ": No error information available");
     }
 }
-
-void PythonEmbed::onOutputAvailable() {
-    QByteArray output = m_process->readAllStandardOutput();
-    m_outputWidget->append(output);
-    m_outputWidget->moveCursor(QTextCursor::End);
-}
-
-void PythonEmbed::onErrorAvailable() {
-    QByteArray error = m_process->readAllStandardError();
-    m_outputWidget->append(error);
-    m_outputWidget->moveCursor(QTextCursor::End);
-}
-
-void PythonEmbed::onProcessFinished(int exitCode, QProcess::ExitStatus exitStatus) {
-    if (exitStatus == QProcess::NormalExit && exitCode != 0) {
-        m_outputWidget->append(QString("Process exited with code %1\n").arg(exitCode));
-    } else if (exitStatus == QProcess::CrashExit) {
-        m_outputWidget->append("Python process crashed\n");
-    }
-}
-
-#include "pythonembed.moc"
-

pythonembed.h

@@ -1,10 +1,7 @@
-
-
 #ifndef PYTHONEMBED_H
 #define PYTHONEMBED_H
 
 #include <QTextEdit>
-#include <QProcess>
 #include <QObject>
 
 class PythonEmbed : public QObject {
@@ -17,14 +14,11 @@ public:
     void runScript(const QString& scriptContent);
     void stopScript();
 
-private slots:
-    void onOutputAvailable();
-    void onErrorAvailable();
-    void onProcessFinished(int exitCode, QProcess::ExitStatus exitStatus);
-
 private:
+    void handlePythonError(const char* context);
+
     QTextEdit* m_outputWidget;
-    QProcess* m_process;
+    bool m_initialized = false;
 };
 
 #endif // PYTHONEMBED_H

pythonrunner.cpp

@@ -22,5 +22,3 @@ void PythonRunner::stopScript() {
         m_pythonEmbed->stopScript();
     }
 }
-
-#include "pythonrunner.moc"