From a84d8de0e6175a3316ad63cdb26f94948d14809d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20K=C3=A4berich?= <j.kaeberich@gmx.de>
Date: Thu, 8 Dec 2022 22:05:31 +0100
Subject: [PATCH] Allow higher port number for de-embedding

---
 Software/PC_Application/LibreVNA-GUI/Device/virtualdevice.h   | 2 ++
 .../LibreVNA-GUI/VNA/Deembedding/matchingnetwork.cpp          | 2 +-
 .../LibreVNA-GUI/VNA/Deembedding/portextension.cpp            | 2 +-
 .../PC_Application/LibreVNA-GUI/VNA/Deembedding/twothru.cpp   | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Software/PC_Application/LibreVNA-GUI/Device/virtualdevice.h b/Software/PC_Application/LibreVNA-GUI/Device/virtualdevice.h
index fada186..4fc9ee8 100644
--- a/Software/PC_Application/LibreVNA-GUI/Device/virtualdevice.h
+++ b/Software/PC_Application/LibreVNA-GUI/Device/virtualdevice.h
@@ -175,6 +175,8 @@ public:
     static std::set<QString> GetAvailableVirtualDevices();
     static VirtualDevice* getConnected();
 
+    static constexpr unsigned int maximumSupportedPorts = 8;
+
 signals:
     void VNAmeasurementReceived(VNAMeasurement m);
     void SAmeasurementReceived(SAMeasurement m);
diff --git a/Software/PC_Application/LibreVNA-GUI/VNA/Deembedding/matchingnetwork.cpp b/Software/PC_Application/LibreVNA-GUI/VNA/Deembedding/matchingnetwork.cpp
index 1ae5180..678bc26 100644
--- a/Software/PC_Application/LibreVNA-GUI/VNA/Deembedding/matchingnetwork.cpp
+++ b/Software/PC_Application/LibreVNA-GUI/VNA/Deembedding/matchingnetwork.cpp
@@ -112,7 +112,7 @@ void MatchingNetwork::edit()
     ui->lDefinedShunt->installEventFilter(this);
 
     ui->port->setValue(port);
-    ui->port->setMaximum(VirtualDevice::getInfo(VirtualDevice::getConnected()).ports);
+    ui->port->setMaximum(VirtualDevice::maximumSupportedPorts);
 
     layout->setContentsMargins(0,0,0,0);
     layout->setSpacing(0);
diff --git a/Software/PC_Application/LibreVNA-GUI/VNA/Deembedding/portextension.cpp b/Software/PC_Application/LibreVNA-GUI/VNA/Deembedding/portextension.cpp
index 29d0345..816f41e 100644
--- a/Software/PC_Application/LibreVNA-GUI/VNA/Deembedding/portextension.cpp
+++ b/Software/PC_Application/LibreVNA-GUI/VNA/Deembedding/portextension.cpp
@@ -82,7 +82,7 @@ void PortExtension::edit()
     ui->Loss->setValue(ext.loss);
     ui->Frequency->setValue(ext.frequency);
     ui->port->setValue(port);
-    ui->port->setMaximum(VirtualDevice::getInfo(VirtualDevice::getConnected()).ports);
+    ui->port->setMaximum(VirtualDevice::maximumSupportedPorts);
     if(!kit) {
         ui->calkit->setEnabled(false);
     }
diff --git a/Software/PC_Application/LibreVNA-GUI/VNA/Deembedding/twothru.cpp b/Software/PC_Application/LibreVNA-GUI/VNA/Deembedding/twothru.cpp
index 68be693..3bc37fc 100644
--- a/Software/PC_Application/LibreVNA-GUI/VNA/Deembedding/twothru.cpp
+++ b/Software/PC_Application/LibreVNA-GUI/VNA/Deembedding/twothru.cpp
@@ -135,9 +135,9 @@ void TwoThru::edit()
     ui->lZ0->setVisible(false);
 
     ui->port1->setValue(port1);
-    ui->port1->setMaximum(VirtualDevice::getInfo(VirtualDevice::getConnected()).ports);
+    ui->port1->setMaximum(VirtualDevice::maximumSupportedPorts);
     ui->port2->setValue(port2);
-    ui->port2->setMaximum(VirtualDevice::getInfo(VirtualDevice::getConnected()).ports);
+    ui->port2->setMaximum(VirtualDevice::maximumSupportedPorts);
 
     auto portChanged = [=](){
         port1 = ui->port1->value();