diff --git a/CMakeLists.txt b/CMakeLists.txt index a5c3161..11ab008 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,6 +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 set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON) @@ -41,15 +42,17 @@ add_executable(${PROJECT_NAME} mainwindow.h mainwindow.cpp mainwindow.ui - multiplexer.h - multiplexer.cpp triggerwidget.cpp triggerwidget.h + pythonrunner.cpp + pythonrunner.h ) 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 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) diff --git a/channelwidget.cpp b/channelwidget.cpp index 5c32f45..2f6a02e 100644 --- a/channelwidget.cpp +++ b/channelwidget.cpp @@ -108,7 +108,6 @@ void ChannelWidget::onGangComboChanged(int index) gangedChannelNumber = -1; checkbox.setEnabled(true); checkbox.setChecked(false); - checkbox.setChecked(false); } else { // A ganged channel was selected QString currentText = gangcombo.currentText(); @@ -128,7 +127,7 @@ void ChannelWidget::onGangComboChanged(int index) void ChannelWidget::onOtherChannelStateChanged(uint16_t deviceSerial, uint16_t channelNumber, bool checked) { // If this channel is ganged to the channel that changed state - if (gangedDeviceSerial == deviceSerial && gangedChannelNumber == channelNumber) { + if (this->deviceSerial == deviceSerial && this->channelNumber == channelNumber) { // Update our checkbox state to follow the ganged channel checkbox.blockSignals(true); checkbox.setChecked(checked); @@ -163,3 +162,9 @@ void ChannelWidget::setGangedChannel(uint16_t gangedDeviceSerial, uint16_t gange updateCheckboxState(); } +void ChannelWidget::replaceMultiplexer(std::shared_ptr multiplexer, int serial) +{ + if(serial == deviceSerial || serial == -1) + this->multiplexer = multiplexer; +} + diff --git a/channelwidget.h b/channelwidget.h index 959ad86..f149df0 100644 --- a/channelwidget.h +++ b/channelwidget.h @@ -33,6 +33,7 @@ public slots: private slots: void onChannelToggled(bool checked); void onGangComboChanged(int index); + void replaceMultiplexer(std::shared_ptr multiplexer, int serial = -1); signals: void channelAboutToBeTurnedOn(uint16_t deviceSerial, uint16_t channelNumber); diff --git a/external/QCodeEditor/CMakeLists.txt b/external/QCodeEditor/CMakeLists.txt index 63918e8..f0b611b 100644 --- a/external/QCodeEditor/CMakeLists.txt +++ b/external/QCodeEditor/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.6) +cmake_minimum_required(VERSION 3.14) project(QCodeEditor) set(CMAKE_CXX_STANDARD 11) diff --git a/mainwindow.cpp b/mainwindow.cpp index efef4b8..b7bd50e 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,3 @@ -#include #include #include #include @@ -14,11 +13,11 @@ MainWindow::MainWindow(QWidget *parent): ui(new Ui::MainWindow), codeEditor(this), pythonOutput(this), + pythonRunner(&pythonOutput), currentFilePath(""), isFileModified(false) { ui->setupUi(this); - enumerateDevices(); codeEditor.setAutoIndentation(true); codeEditor.setAutoParentheses(true); @@ -49,6 +48,13 @@ MainWindow::MainWindow(QWidget *parent): isFileModified = true; updateStatus(); }); + + // Connect Run and Stop buttons + connect(ui->pushButtonRun, &QPushButton::clicked, this, &MainWindow::runScript); + connect(ui->pushButtonStop, &QPushButton::clicked, this, &MainWindow::stopScript); + connect(&pythonRunner, &PythonRunner::scriptFinished, this, &MainWindow::stopScript); + enumerateDevices(); + generateExample(); } MainWindow::~MainWindow() @@ -56,6 +62,30 @@ MainWindow::~MainWindow() delete ui; } +void MainWindow::readState() +{ + for (auto& multiplexer : multiplexers) { + channel_t channelstate = eismultiplexer_get_connected(multiplexer.second.get()); + for (auto& channel : channels) { + for(size_t i = 0; i < 16; ++i) { + channel_t mask = static_cast(1 << i); + channel->onOtherChannelStateChanged(multiplexer.first, i, channelstate & mask); + } + } + + int triggerCount = eismultiplexer_get_trigger_count(multiplexer.second.get()); + for(int i = 0; i < triggerCount; ++i) { + bool level; + trigger_state_t state; + int ret = eismultiplexer_get_trigger_state(multiplexer.second.get(), i, &state, &level); + if (ret < 0) { + for (auto& trigger : triggers) + trigger->updateSate(multiplexer.first, i, state); + } + } + } +} + void MainWindow::updateStatus() { if (!currentFilePath.isEmpty()) { @@ -144,6 +174,9 @@ void MainWindow::enumerateDevices() { size_t count = 0; uint16_t* serials = eismultiplexer_list_available_devices(&count); + if (ui->scrollArea->layout()) + delete ui->scrollArea->layout(); + QVBoxLayout* channelLayout = new QVBoxLayout(ui->scrollArea); if (!serials || count == 0) { @@ -162,6 +195,7 @@ void MainWindow::enumerateDevices() int ret = eismultiplexer_connect(multiplexer.get(), serial); if (ret == 0) { + multiplexers.push_back({serial, multiplexer}); uint16_t channelCount = 0; qDebug()<<"Adding channels from device "<= 0) @@ -171,7 +205,7 @@ void MainWindow::enumerateDevices() std::shared_ptr widget(new ChannelWidget(serial, channel, multiplexer)); qDebug()<<"Added widget from device "<channelLayout->addWidget(widget.get()); + channelLayout->addWidget(widget.get()); } } @@ -185,7 +219,7 @@ void MainWindow::enumerateDevices() std::shared_ptr triggerWidget(new TriggerWidget(serial, trigger, multiplexer)); qDebug()<<"Added trigger widget from device "<channelLayout->addWidget(triggerWidget.get()); + channelLayout->addWidget(triggerWidget.get()); } } } @@ -196,7 +230,8 @@ void MainWindow::enumerateDevices() qWarning()<<"Failed to connect to device with serial"<channelLayout->addStretch(); + + channelLayout->addStretch(); // Second pass: populate gang combos and connect signals for channels for (const auto& widget : channels) { @@ -220,10 +255,39 @@ void MainWindow::enumerateDevices() } } + readState(); + ui->statusbar->showMessage("Ready"); free(serials); - generateExample(); +} + +void MainWindow::runScript() { + QString scriptContent = codeEditor.toPlainText(); + pythonRunner.runScript(scriptContent); + ui->pushButtonRun->setEnabled(false); + ui->pushButtonStop->setEnabled(true); + codeEditor.setEnabled(false); + ui->scrollArea->setEnabled(false); + disconnectDevices(); +} + +void MainWindow::stopScript() { + pythonRunner.stopScript(); + channels.clear(); + triggers.clear(); + ui->pushButtonRun->setEnabled(true); + ui->pushButtonStop->setEnabled(false); + codeEditor.setEnabled(true); + ui->scrollArea->setEnabled(true); + enumerateDevices(); +} + +void MainWindow::disconnectDevices() +{ + for(auto& multiplexer : multiplexers) + eismultiplexer_disconnect(multiplexer.second.get()); + multiplexers.clear(); } void MainWindow::generateExample() @@ -241,7 +305,7 @@ void MainWindow::generateExample() size_t i = 0; for (uint16_t serial : serials) { - example.append(QString("multiplexer_") + QString::number(i) + " multi.Multiplexer(serial=" + QString::number(serial) + ")\n"); + example.append(QString("multiplexer_") + QString::number(i) + " = multi.Multiplexer(serial=" + QString::number(serial) + ")\n"); ++i; } diff --git a/mainwindow.h b/mainwindow.h index ec96f0a..686c6a2 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -1,16 +1,16 @@ - - #ifndef MAINWINDOW_H #define MAINWINDOW_H +#include #include #include #include #include #include - +#include #include "channelwidget.h" #include "triggerwidget.h" +#include "pythonrunner.h" namespace Ui { @@ -19,14 +19,16 @@ class MainWindow; class MainWindow : public QMainWindow { - Q_OBJECT - std::vector> channels; - std::vector> triggers; - Ui::MainWindow *ui; + Q_OBJECT + std::vector> triggers; + std::vector> channels; + std::vector>> multiplexers; + Ui::MainWindow *ui; QCodeEditor codeEditor; QPythonHighlighter highligter; QPythonCompleter completer; QTextEdit pythonOutput; + PythonRunner pythonRunner; signals: void channelStateChanged(uint16_t device, uint16_t channel); @@ -39,11 +41,15 @@ private slots: void onActionOpenTriggered(); void onActionSaveTriggered(); void onActionSaveAsTriggered(); + void runScript(); + void stopScript(); + void readState(); private: void enumerateDevices(); void generateExample(); void updateStatus(); + void disconnectDevices(); QString currentFilePath; bool isFileModified; }; diff --git a/mainwindow.ui b/mainwindow.ui index d32da49..c858820 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -16,58 +16,65 @@ - - - 10 + + + Qt::Orientation::Horizontal - - + + + + 0 + - - - false - - - Stop - - - - - - - - - - Run - - - - - + + + + + false + + + Stop + + + + + + + + + + Run + + + + + + + - - - - - - - true - - - - - 0 - 0 - 591 - 533 - + + + + + 400 + 0 + - - - - - + + true + + + + + 0 + 0 + 504 + 537 + + + + diff --git a/multiplexer.cpp b/multiplexer.cpp deleted file mode 100644 index 3e1c8e0..0000000 --- a/multiplexer.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include "multiplexer.h" - -Multiplexer::Multiplexer(QObject *parent) - : QObject{parent} -{} - -Multiplexer::~Multiplexer() -{ - for(auto& multiplexer : multiplexers) - eismultiplexer_disconnect(multiplexer.get()); -} - -void Multiplexer::probe() -{ - -} diff --git a/multiplexer.h b/multiplexer.h deleted file mode 100644 index 32a04ec..0000000 --- a/multiplexer.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef MULTIPLEXER_H -#define MULTIPLEXER_H - -#include -#include "eismultiplexer.h" - -class Multiplexer : public QObject -{ - Q_OBJECT - std::vector> multiplexers; - std::vector channelStates; - -public: - explicit Multiplexer(QObject *parent = nullptr); - ~Multiplexer(); - void probe(); - -signals: - void foundDevice(std::shared_ptr); -}; - -#endif // MULTIPLEXER_H diff --git a/pythonrunner.cpp b/pythonrunner.cpp new file mode 100644 index 0000000..e2ba0ab --- /dev/null +++ b/pythonrunner.cpp @@ -0,0 +1,56 @@ +#include "pythonrunner.h" +#include + +PythonRunner::PythonRunner(QTextEdit* outputWidget, QObject* parent) + : QObject(parent), m_outputWidget(outputWidget), m_process(nullptr) { + m_process = new QProcess(this); + connect(m_process, &QProcess::readyReadStandardOutput, this, &PythonRunner::onOutputAvailable); + connect(m_process, &QProcess::readyReadStandardError, this, &PythonRunner::onErrorAvailable); + connect(m_process, QOverload::of(&QProcess::finished), this, &PythonRunner::onProcessFinished); +} + +PythonRunner::~PythonRunner() { + if (m_process) { + m_process->terminate(); + m_process->waitForFinished(1000); + } +} + +bool PythonRunner::runScript(const QString& scriptContent) { + if (m_process->state() == QProcess::Running) { + m_process->terminate(); + m_process->waitForFinished(1000); + } + + m_outputWidget->clear(); + m_process->start("python3", QStringList() << "-u" << "-c" << scriptContent); + + return true; +} + +void PythonRunner::stopScript() { + if (m_process && m_process->state() == QProcess::Running) { + m_process->terminate(); + } +} + +void PythonRunner::onOutputAvailable() { + QByteArray output = m_process->readAllStandardOutput(); + m_outputWidget->append(output); + m_outputWidget->moveCursor(QTextCursor::End); +} + +void PythonRunner::onErrorAvailable() { + QByteArray error = m_process->readAllStandardError(); + m_outputWidget->append(error); + m_outputWidget->moveCursor(QTextCursor::End); +} + +void PythonRunner::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 was stopped\n"); + } + emit scriptFinished(exitCode); +} diff --git a/pythonrunner.h b/pythonrunner.h new file mode 100644 index 0000000..8a8ac15 --- /dev/null +++ b/pythonrunner.h @@ -0,0 +1,31 @@ +#pragma once + +#include +#include +#include +#include + +class PythonRunner : public QObject { + Q_OBJECT + +public: + PythonRunner(QTextEdit* outputWidget, QObject* parent = nullptr); + ~PythonRunner(); + + bool runScript(const QString& scriptContent); + void stopScript(); + +private slots: + void onOutputAvailable(); + void onErrorAvailable(); + void onProcessFinished(int exitCode, QProcess::ExitStatus exitStatus); + +signals: + void scriptFinished(int code); + +private: + QTextEdit* m_outputWidget; + QProcess* m_process; + bool ready; + QTemporaryDir dir; +}; diff --git a/triggerwidget.cpp b/triggerwidget.cpp index efa6627..f051768 100644 --- a/triggerwidget.cpp +++ b/triggerwidget.cpp @@ -70,9 +70,46 @@ void TriggerWidget::onLevelToggled(bool checked) updateTriggerState(); } +void TriggerWidget::updateSate(uint16_t serial, uint16_t trigger, trigger_state_t state) +{ + if (serial == deviceSerial && trigger == triggerNumber) { + switch (state) + { + case TRIGGER_INPUT: + levelCheckbox.blockSignals(true); + levelCheckbox.setChecked(false); + levelCheckbox.setEnabled(false); + levelCheckbox.blockSignals(false); + inputCheckbox.blockSignals(true); + inputCheckbox.setChecked(true); + inputCheckbox.blockSignals(false); + break; + case TRIGGER_HIGH: + inputCheckbox.blockSignals(true); + inputCheckbox.setChecked(false); + inputCheckbox.blockSignals(false); + levelCheckbox.blockSignals(true); + levelCheckbox.setChecked(true); + levelCheckbox.setEnabled(true); + levelCheckbox.blockSignals(false); + break; + case TRIGGER_LOW: + inputCheckbox.blockSignals(true); + inputCheckbox.setChecked(false); + inputCheckbox.blockSignals(false); + levelCheckbox.blockSignals(true); + levelCheckbox.setChecked(true); + levelCheckbox.setEnabled(false); + levelCheckbox.blockSignals(false); + default: + break; + } + } +} + void TriggerWidget::updateTriggerState() { - trigger_state_t state; + trigger_state_t state = TRIGGER_INPUT; if(inputCheckbox.isChecked()) { levelCheckbox.blockSignals(true); diff --git a/triggerwidget.h b/triggerwidget.h index 718ed1b..0fe17cb 100644 --- a/triggerwidget.h +++ b/triggerwidget.h @@ -22,6 +22,7 @@ public: uint16_t getDeviceSerial() const; uint16_t getTriggerNumber() const; + void updateSate(uint16_t serial, uint16_t trigger, trigger_state_t state); private slots: void onInputToggled(bool checked);