caiyu/LibreVNA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow higher port number for de-embedding

Browse Source
This commit is contained in:
Jan Käberich 2022-12-08 22:05:31 +01:00
parent d30d444bc7
commit a84d8de0e6
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Software/PC_Application/LibreVNA-GUI/Device/virtualdevice.h
View File

@ -175,6 +175,8 @@ public:
static std::set<QString> GetAvailableVirtualDevices(); static std::set<QString> GetAvailableVirtualDevices();
static VirtualDevice* getConnected(); static VirtualDevice* getConnected();
static constexpr unsigned int maximumSupportedPorts = 8;
signals: signals:
void VNAmeasurementReceived(VNAMeasurement m); void VNAmeasurementReceived(VNAMeasurement m);
void SAmeasurementReceived(SAMeasurement m); void SAmeasurementReceived(SAMeasurement m);

2
Software/PC_Application/LibreVNA-GUI/VNA/Deembedding/matchingnetwork.cpp
View File

@ -112,7 +112,7 @@ void MatchingNetwork::edit()
ui->lDefinedShunt->installEventFilter(this); ui->lDefinedShunt->installEventFilter(this);
ui->port->setValue(port); ui->port->setValue(port);
ui->port->setMaximum(VirtualDevice::getInfo(VirtualDevice::getConnected()).ports); ui->port->setMaximum(VirtualDevice::maximumSupportedPorts);
layout->setContentsMargins(0,0,0,0); layout->setContentsMargins(0,0,0,0);
layout->setSpacing(0); layout->setSpacing(0);

2
Software/PC_Application/LibreVNA-GUI/VNA/Deembedding/portextension.cpp
View File

@ -82,7 +82,7 @@ void PortExtension::edit()
ui->Loss->setValue(ext.loss); ui->Loss->setValue(ext.loss);
ui->Frequency->setValue(ext.frequency); ui->Frequency->setValue(ext.frequency);
ui->port->setValue(port); ui->port->setValue(port);
ui->port->setMaximum(VirtualDevice::getInfo(VirtualDevice::getConnected()).ports); ui->port->setMaximum(VirtualDevice::maximumSupportedPorts);
if(!kit) { if(!kit) {
ui->calkit->setEnabled(false); ui->calkit->setEnabled(false);
} }

4
Software/PC_Application/LibreVNA-GUI/VNA/Deembedding/twothru.cpp
View File

@ -135,9 +135,9 @@ void TwoThru::edit()
ui->lZ0->setVisible(false); ui->lZ0->setVisible(false);
ui->port1->setValue(port1); ui->port1->setValue(port1);
ui->port1->setMaximum(VirtualDevice::getInfo(VirtualDevice::getConnected()).ports); ui->port1->setMaximum(VirtualDevice::maximumSupportedPorts);
ui->port2->setValue(port2); ui->port2->setValue(port2);
ui->port2->setMaximum(VirtualDevice::getInfo(VirtualDevice::getConnected()).ports); ui->port2->setMaximum(VirtualDevice::maximumSupportedPorts);
auto portChanged = [=](){ auto portChanged = [=](){
port1 = ui->port1->value(); port1 = ui->port1->value();