Merge branch 'trigger'

This commit is contained in:
Carl Philipp Klemm 2025-10-13 14:09:10 +02:00
commit a08cf6a682
5 changed files with 170 additions and 8 deletions

View file

@ -1,3 +1,5 @@
#ifndef MAINWINDOW_H
#define MAINWINDOW_H
@ -8,6 +10,7 @@
#include <QPythonHighlighter>
#include "channelwidget.h"
#include "triggerwidget.h"
namespace Ui
{
@ -16,23 +19,25 @@ class MainWindow;
class MainWindow : public QMainWindow
{
Q_OBJECT
std::vector<std::shared_ptr<ChannelWidget>> channels;
Ui::MainWindow *ui;
Q_OBJECT
std::vector<std::shared_ptr<ChannelWidget>> channels;
std::vector<std::shared_ptr<TriggerWidget>> triggers;
Ui::MainWindow *ui;
QCodeEditor codeEditor;
QPythonHighlighter highligter;
QPythonCompleter completer;
signals:
void channelStateChanged(uint16_t device, uint16_t channel);
void channelStateChanged(uint16_t device, uint16_t channel);
public:
explicit MainWindow(QWidget *parent = nullptr);
~MainWindow();
explicit MainWindow(QWidget *parent = nullptr);
~MainWindow();
private:
void enumerateDevices();
void enumerateDevices();
void generateExample();
};
#endif // MAINWINDOW_H