From 11d202d51abdcb68335a75d6d29069c5cece8f35 Mon Sep 17 00:00:00 2001 From: Kevin Matz Date: Sat, 26 Nov 2022 12:41:46 -0500 Subject: [PATCH] allow RLP communications protocols to be enabled/disabled --- example/sACN Explorer/multiverseview.cpp | 8 ++++++++ example/sACN Explorer/multiverseview.ui | 12 ------------ example/sACN Explorer/sacnexplorer.cpp | 6 +++++- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/example/sACN Explorer/multiverseview.cpp b/example/sACN Explorer/multiverseview.cpp index 7e80e33..946cc82 100644 --- a/example/sACN Explorer/multiverseview.cpp +++ b/example/sACN Explorer/multiverseview.cpp @@ -21,6 +21,8 @@ MultiverseView::MultiverseView(QWidget *parent, QSacnNode *node) ui->actionTerminate->setEnabled(false); ui->actionUnsubscribe->setEnabled(false); ui->actionInspect->setEnabled(false); + ui->actionIPv4->setChecked(node->isEnabledIPv4()); + ui->actionIPv6->setChecked(node->isEnabledIPv6()); ui->actionDiscovery->setChecked(node->discoveryEnabled()); ui->menubar->setNativeMenuBar(false); @@ -48,6 +50,12 @@ MultiverseView::MultiverseView(QWidget *parent, QSacnNode *node) connect(ui->actionUACN, &QAction::triggered, this, &MultiverseView::showUacnEditor); + connect(ui->actionIPv4, &QAction::toggled, + node, &QSacnNode::setIPv4); + + connect(ui->actionIPv6, &QAction::toggled, + node, &QSacnNode::setIPv6); + connect(ui->actionInspect, &QAction::triggered, this, [this]() { auto selected = ui->multiverseView->currentIndex(); diff --git a/example/sACN Explorer/multiverseview.ui b/example/sACN Explorer/multiverseview.ui index 9403d3c..4fe4de8 100644 --- a/example/sACN Explorer/multiverseview.ui +++ b/example/sACN Explorer/multiverseview.ui @@ -216,12 +216,6 @@ true - - true - - - false - IPv4 @@ -236,12 +230,6 @@ true - - true - - - false - IPv6 diff --git a/example/sACN Explorer/sacnexplorer.cpp b/example/sACN Explorer/sacnexplorer.cpp index 20b8efc..68baa67 100644 --- a/example/sACN Explorer/sacnexplorer.cpp +++ b/example/sACN Explorer/sacnexplorer.cpp @@ -15,6 +15,8 @@ SacnExplorer::SacnExplorer(int argc, char *argv[]) settings_->beginGroup("ACN"); auto cid = settings_->value("CID", QUuid::createUuid()).toUuid(); auto uacn = settings_->value("UACN", "").toString(); + auto ipv4 = settings_->value("IPv4", true).toBool(); + auto ipv6 = settings_->value("IPv6", true).toBool(); settings_->endGroup(); settings_->beginGroup("sACN"); settings_->beginGroup("receiver"); @@ -23,7 +25,7 @@ SacnExplorer::SacnExplorer(int argc, char *argv[]) settings_->endGroup(); // sACN Node - node_ = new QSacnNode(this, cid, applicationName()); + node_ = new QSacnNode(this, cid, applicationName(), ipv4, ipv6); node_->assignUserName(uacn.toStdString()); qDebug() << "sACN node" << QString(node_->name().c_str()) << "started with CID" << cid.toString(); if (discovery) @@ -54,6 +56,8 @@ void SacnExplorer::saveSettings() settings_->beginGroup("ACN"); settings_->setValue("CID", node_->cid().string().c_str()); settings_->setValue("UACN", node_->userName().c_str()); + settings_->setValue("IPv4", node_->isEnabledIPv4()); + settings_->setValue("IPv6", node_->isEnabledIPv6()); settings_->endGroup(); settings_->beginGroup("sACN"); settings_->beginGroup("receiver");