Merge branch 'trigger'
This commit is contained in:
commit
a08cf6a682
5 changed files with 170 additions and 8 deletions
|
|
@ -3,6 +3,7 @@
|
|||
#include <QMessageBox>
|
||||
#include "mainwindow.h"
|
||||
#include "ui_mainwindow.h"
|
||||
#include "triggerwidget.h"
|
||||
|
||||
MainWindow::MainWindow(QWidget *parent):
|
||||
QMainWindow(parent),
|
||||
|
|
@ -64,6 +65,20 @@ void MainWindow::enumerateDevices()
|
|||
ui->channelLayout->addWidget(widget.get());
|
||||
}
|
||||
}
|
||||
|
||||
// Add trigger widgets
|
||||
int triggerCount = eismultiplexer_get_trigger_count(multiplexer.get());
|
||||
if (triggerCount > 0)
|
||||
{
|
||||
qDebug()<<"Adding triggers from device "<<serial;
|
||||
for (int trigger = 0; trigger < triggerCount; trigger++)
|
||||
{
|
||||
std::shared_ptr<TriggerWidget> triggerWidget(new TriggerWidget(serial, trigger, multiplexer));
|
||||
qDebug()<<"Added trigger widget from device "<<serial<<" trigger "<<trigger;
|
||||
triggers.push_back(triggerWidget);
|
||||
ui->channelLayout->addWidget(triggerWidget.get());
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -74,7 +89,7 @@ void MainWindow::enumerateDevices()
|
|||
}
|
||||
ui->channelLayout->addStretch();
|
||||
|
||||
// Second pass: populate gang combos and connect signals
|
||||
// Second pass: populate gang combos and connect signals for channels
|
||||
for (const auto& widget : channels) {
|
||||
// Populate gang combo with all other channels
|
||||
for (const auto& otherWidget : channels) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue