CMakeLists.txt

@@ -1,50 +1,35 @@
+
 cmake_minimum_required(VERSION 3.14)
 
-project(eismuliplexer-qt)
-
-set(CMAKE_PROJECT_VERSION_MAJOR 0)
-set(CMAKE_PROJECT_VERSION_MINOR 9)
-set(CMAKE_PROJECT_VERSION_PATCH 0)
-
-add_compile_definitions(VERSION_MAJOR=${CMAKE_PROJECT_VERSION_MAJOR})
-add_compile_definitions(VERSION_MINOR=${CMAKE_PROJECT_VERSION_MINOR})
-add_compile_definitions(VERSION_PATCH=${CMAKE_PROJECT_VERSION_PATCH})
-
-if(CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
-	message(FATAL_ERROR "Windows builds have to be cross compiled on UNIX")
-endif()
-
-message("Platform " ${CMAKE_SYSTEM_NAME})
-if(WIN32)
-	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/release-win.sh ${CMAKE_CURRENT_BINARY_DIR}/release.sh @ONLY)
-	add_custom_target(package
-		COMMAND ${CMAKE_CURRENT_BINARY_DIR}/release.sh
-		WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-		COMMENT "Createing release archive"
-		VERBATIM)
-endif(WIN32)
+# Set the project name
+project(eismultiplexer-qt)
 
+# Set C++ standard
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-find_package(PkgConfig REQUIRED)
-pkg_check_modules(EISMULIPLEXER REQUIRED eismuliplexer)
+# Find Qt6
 find_package(Qt6 REQUIRED COMPONENTS Widgets)
-find_package(Qt6 REQUIRED COMPONENTS Core)
 
+# Enable automoc for Qt meta-object compiler
 set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
 
-add_executable(${PROJECT_NAME}
+# Include the libeismultiplexer library
+include_directories(/workspace/libeismultiplexer)
+link_directories(/workspace/libeismultiplexer/build)
+
+# Add the application executable
+add_executable(eismultiplexer-qt
     main.cpp
+    mainwindow.cpp
+    mainwindow.h
     channelwidget.cpp
     channelwidget.h
-    mainwindow.h
-    mainwindow.cpp
-    mainwindow.ui
-    multiplexer.h
-    multiplexer.cpp
 )
-target_compile_options(${PROJECT_NAME} PUBLIC "-Wall")
-target_link_libraries(${PROJECT_NAME} PRIVATE Qt6::Widgets Qt6::Core ${EISMULIPLEXER_LIBRARIES})
-#target_include_directories(${PROJECT_NAME} PUBLIC ${EISMULIPLEXER_INCLUDE_DIRS})
+target_compile_options(eismultiplexer-qt PUBLIC "-Wall")
+
+# Link Qt Widgets
+target_link_libraries(eismultiplexer-qt Qt6::Widgets eismultiplexer)
+
+# Include directories
+target_include_directories(eismultiplexer-qt PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

channelwidget.cpp

@@ -1,43 +1,30 @@
+
+
+
 #include "channelwidget.h"
 #include <QDebug>
 #include <QMessageBox>
 
-ChannelWidget::ChannelWidget(uint16_t deviceSerial, uint16_t channelNumber,
-                             std::shared_ptr<struct eismultiplexer> multiplexer,
+ChannelWidget::ChannelWidget(uint16_t deviceSerial, uint16_t channelNumber, struct eismultiplexer* multiplexer,
                              QWidget *parent)
-	:
-	QWidget(parent),
-	deviceSerial(deviceSerial),
-	channelNumber(channelNumber),
-	multiplexer(multiplexer),
-	checkbox("Enable"),
-	devicelabel(QString::asprintf("Device %04u", deviceSerial)),
-	channellabel(QString::asprintf("Channel %u", channelNumber)),
-	ganglabel("Ganged:")
+    : QWidget(parent), deviceSerial(deviceSerial), channelNumber(channelNumber), multiplexer(multiplexer)
 {
-	hlayout.addLayout(&labellayout);
-	vlayout.addLayout(&hlayout);
+    // Create layout
+    QHBoxLayout* layout = new QHBoxLayout(this);
 
-	labellayout.addWidget(&devicelabel);
-	labellayout.addWidget(&channellabel);
+    // Create label with device serial and channel number
+    label = new QLabel(QString("Device %1, Channel %2").arg(deviceSerial).arg(channelNumber), this);
+    layout->addWidget(label);
 
-	line.setGeometry(QRect(320, 150, 118, 3));
-	line.setFrameShape(QFrame::HLine);
-	line.setFrameShadow(QFrame::Sunken);
-	vlayout.addWidget(&line);
+    // Create checkbox
+    checkbox = new QCheckBox(this);
+    layout->addWidget(checkbox);
 
-	gangcombo.addItem("Unganged");
+    // Connect checkbox signal
+    connect(checkbox, &QCheckBox::toggled, this, &ChannelWidget::onChannelToggled);
 
-	hlayout.addStretch();
-	hlayout.addWidget(&ganglabel);
-	hlayout.addWidget(&gangcombo);
-	hlayout.addWidget(&checkbox);
-	connect(&checkbox, &QCheckBox::toggled, this, &ChannelWidget::onChannelToggled);
-
-	setFixedHeight(96);
-	setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-
-	setLayout(&vlayout);
+    // Set layout
+    setLayout(layout);
 }
 
 ChannelWidget::~ChannelWidget()
@@ -57,39 +44,33 @@ uint16_t ChannelWidget::getChannelNumber() const
 
 bool ChannelWidget::isChecked() const
 {
-	return checkbox.isChecked();
+    return checkbox->isChecked();
 }
 
 void ChannelWidget::onChannelToggled(bool checked)
 {
-	if (checked)
-	{
+    if (checked) {
         // Emit signal before actually turning on the channel
         emit channelAboutToBeTurnedOn(deviceSerial, channelNumber);
     }
 
     channel_t channelFlag = static_cast<channel_t>(1 << channelNumber);
-	if (checked)
-	{
-		if (eismultiplexer_connect_channel(multiplexer.get(), channelFlag) < 0)
-		{
+    if (checked) {
+        if (eismultiplexer_connect_channel(multiplexer.get(), channelFlag) < 0) {
             QMessageBox::warning(this, tr("Connection Failed"),
                                  tr("Failed to connect channel %1 on device %2").arg(channelNumber).arg(deviceSerial));
             qWarning() << "Failed to connect channel" << channelNumber << "on device" << deviceSerial;
-			checkbox.blockSignals(true);
-			checkbox.setChecked(false);
+            checkbox->blockSignals(true);
+            checkbox->setChecked(false);
             setEnabled(false); // Gray out the widget
         }
-	}
-	else
-	{
-		if (eismultiplexer_disconnect_channel(multiplexer.get(), channelFlag) < 0)
-		{
+    } else {
+        if (eismultiplexer_disconnect_channel(multiplexer.get(), channelFlag) < 0) {
             QMessageBox::warning(this, tr("Disconnection Failed"),
                                  tr("Failed to disconnect channel %1 on device %2").arg(channelNumber).arg(deviceSerial));
             qWarning() << "Failed to disconnect channel" << channelNumber << "on device" << deviceSerial;
-			checkbox.blockSignals(true);
-			checkbox.setChecked(true);
+            checkbox->blockSignals(true);
+            checkbox->setChecked(true);
             setEnabled(false); // Gray out the widget
         }
     }

channelwidget.h

@@ -5,7 +5,6 @@
 #include <QCheckBox>
 #include <QLabel>
 #include <QHBoxLayout>
-#include <QComboBox>
 #include <eismultiplexer.h>
 #include <memory>
 
@@ -14,8 +13,7 @@ class ChannelWidget : public QWidget
     Q_OBJECT
 
 public:
-	explicit ChannelWidget(uint16_t deviceSerial, uint16_t channelNumber,
-	                       std::shared_ptr<struct eismultiplexer> multiplexer,
+    explicit ChannelWidget(uint16_t deviceSerial, uint16_t channelNumber, struct eismultiplexer* multiplexer,
                            QWidget *parent = nullptr);
     ~ChannelWidget() override;
 
@@ -33,15 +31,8 @@ private:
     uint16_t deviceSerial;
     uint16_t channelNumber;
     std::shared_ptr<struct eismultiplexer> multiplexer;
-	QCheckBox checkbox;
-	QLabel devicelabel;
-	QLabel channellabel;
-	QLabel ganglabel;
-	QComboBox gangcombo;
-	QFrame line;
-	QVBoxLayout vlayout;
-	QHBoxLayout hlayout;
-	QVBoxLayout labellayout;
+    QCheckBox* checkbox;
+    QLabel* label;
 };
 
 #endif // CHANNELWIDGET_H

main.cpp

@@ -1,3 +1,4 @@
+
 #include <QApplication>
 #include "mainwindow.h"
 

mainwindow.cpp

@@ -1,68 +1,85 @@
-#include <eismultiplexer.h>
-#include <QMessageBox>
 #include "mainwindow.h"
-#include "ui_mainwindow.h"
+#include <QDebug>
+#include <QMessageBox>
+#include <eismultiplexer.h>
+#include <memory>
 
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
-	, ui(new Ui::MainWindow)
 {
-	ui->setupUi(this);
+    setupUi();
     enumerateDevices();
-
-	connect(ui->actionQuit, &QAction::triggered, this, [this]()
-	{
-		close();
-	});
 }
 
 MainWindow::~MainWindow()
 {
-	delete ui;
+    // Clean up all channel widgets
+    for (auto widget : channelWidgets) {
+        delete widget;
     }
+}
+
+void MainWindow::setupUi()
+{
+    // Create central widget and main layout
+    centralWidget = new QWidget(this);
+    mainLayout = new QVBoxLayout(centralWidget);
+
+    // Create scroll area
+    scrollArea = new QScrollArea(this);
+    scrollContent = new QWidget();
+    scrollLayout = new QVBoxLayout(scrollContent);
+
+    // Set up scroll area properties
+    scrollArea->setWidget(scrollContent);
+    scrollArea->setWidgetResizable(true);
+    scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+
+    // Add scroll area to main layout
+    mainLayout->addWidget(scrollArea);
+
+    // Set central widget
+    setCentralWidget(centralWidget);
+    setWindowTitle("EIS Multiplexer Controller");
+}
+
+void MainWindow::onChannelAboutToBeTurnedOn(uint16_t deviceSerial, uint16_t channelNumber)
+{}
 
 void MainWindow::enumerateDevices()
 {
     size_t count = 0;
     uint16_t* serials = eismultiplexer_list_available_devices(&count);
 
-	if (!serials || count == 0)
-	{
-		QMessageBox::warning(nullptr, tr("No Devices Found"),
+    if (!serials || count == 0) {
+        QMessageBox::warning(this, tr("No Devices Found"),
                              tr("No EIS multiplexer devices were found. Please connect a device and try again."));
         qWarning() << "No EIS multiplexer devices found";
-		exit(0);
+        close();
         return;
     }
 
-	for (size_t i = 0; i < count; i++)
-	{
+    for (size_t i = 0; i < count; i++) {
         uint16_t serial = serials[i];
         std::shared_ptr<struct eismultiplexer> multiplexer(new struct eismultiplexer);
-		if (eismultiplexer_connect(multiplexer.get(), serial) >= 0)
-		{
+        if (eismultiplexer_connect(multiplexer.get(), serial) >= 0) {
             uint16_t channelCount = 0;
             qDebug()<<"Adding channels from device "<<serial;
-			if (eismultiplexer_get_channel_count(multiplexer.get(), &channelCount) >= 0)
-			{
-				for (uint16_t channel = 0; channel < channelCount; channel++)
-				{
-					std::shared_ptr<ChannelWidget> widget(new ChannelWidget(serial, channel, multiplexer));
+            if (eismultiplexer_get_channel_count(multiplexer.get(), &channelCount) >= 0) {
+                for (uint16_t channel = 0; channel < channelCount; channel++) {
+                    ChannelWidget* widget = new ChannelWidget(serial, channel, multiplexer.get());
                     qDebug()<<"Added widget from device "<<serial<<" channel "<<channel;
-					channels.push_back(widget);
-					ui->channelLayout->addWidget(widget.get());
+                    channelWidgets.push_back(widget);
+                    scrollLayout->addWidget(widget);
                 }
             }
-		}
-		else
-		{
+        } else {
             QMessageBox::warning(this, tr("Connection Failed"),
                                  tr("Failed to connect to device with serial %1").arg(serial));
             qWarning() << "Failed to connect to device with serial" << serial;
         }
-		ui->channelLayout->addStretch();
     }
-	ui->statusbar->showMessage("Ready");
 
     free(serials);
 }
+

mainwindow.h

@@ -1,31 +1,42 @@
+
+
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
 #include <QMainWindow>
-#include <memory>
-
+#include <QScrollArea>
+#include <QVBoxLayout>
+#include <QWidget>
+#include <vector>
 #include "channelwidget.h"
 
-namespace Ui
-{
-class MainWindow;
-}
+QT_BEGIN_NAMESPACE
+namespace Ui { class MainWindow; }
+QT_END_NAMESPACE
 
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
-	std::vector<std::shared_ptr<ChannelWidget>> channels;
-	Ui::MainWindow *ui;
-
-signals:
-	void channelStateChanged(uint16_t device, uint16_t channel);
 
 public:
     explicit MainWindow(QWidget *parent = nullptr);
-	~MainWindow();
+    ~MainWindow() override;
+
+private slots:
+    void onChannelAboutToBeTurnedOn(uint16_t deviceSerial, uint16_t channelNumber);
 
 private:
     void enumerateDevices();
+    void setupUi();
+
+    QWidget *centralWidget;
+    QVBoxLayout *mainLayout;
+    QScrollArea *scrollArea;
+    QWidget *scrollContent;
+    QVBoxLayout *scrollLayout;
+
+    std::vector<ChannelWidget*> channelWidgets;
 };
 
 #endif // MAINWINDOW_H
+

mainwindow.ui

@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>800</width>
-    <height>600</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>EisMultiplexer-Qt</string>
-  </property>
-  <widget class="QWidget" name="centralwidget">
-   <layout class="QVBoxLayout" name="verticalLayout">
-    <item>
-     <widget class="QScrollArea" name="scrollArea">
-      <property name="widgetResizable">
-       <bool>true</bool>
-      </property>
-      <widget class="QWidget" name="scrollAreaWidgetContents">
-       <property name="geometry">
-        <rect>
-         <x>0</x>
-         <y>0</y>
-         <width>788</width>
-         <height>537</height>
-        </rect>
-       </property>
-       <layout class="QVBoxLayout" name="verticalLayout_3">
-        <item>
-         <layout class="QVBoxLayout" name="channelLayout"/>
-        </item>
-       </layout>
-      </widget>
-     </widget>
-    </item>
-   </layout>
-  </widget>
-  <widget class="QMenuBar" name="menubar">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>800</width>
-     <height>29</height>
-    </rect>
-   </property>
-   <widget class="QMenu" name="menuFile">
-    <property name="title">
-     <string>File</string>
-    </property>
-    <addaction name="actionQuit"/>
-   </widget>
-   <addaction name="menuFile"/>
-  </widget>
-  <widget class="QStatusBar" name="statusbar"/>
-  <action name="actionQuit">
-   <property name="text">
-    <string>Quit</string>
-   </property>
-  </action>
- </widget>
- <resources/>
- <connections/>
-</ui>

multiplexer.cpp

@@ -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()
-{
-
-}

multiplexer.h

@@ -1,22 +0,0 @@
-#ifndef MULTIPLEXER_H
-#define MULTIPLEXER_H
-
-#include <QObject>
-#include "eismultiplexer.h"
-
-class Multiplexer : public QObject
-{
-	Q_OBJECT
-	std::vector<std::shared_ptr<struct eismultiplexer>> multiplexers;
-	std::vector<channel_t> channelStates;
-
-public:
-	explicit Multiplexer(QObject *parent = nullptr);
-	~Multiplexer();
-	void probe();
-
-signals:
-	void foundDevice(std::shared_ptr<struct eismultiplexer>);
-};
-
-#endif // MULTIPLEXER_H