jankae/LibreVNA
1
0
Fork 0
mirror of https://github.com/jankae/LibreVNA.git synced 2026-04-06 06:53:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

decouple RST settings from startup settings

Browse source
This commit is contained in:
Jan Käberich 2024-05-01 13:33:18 +02:00
parent 77efc4d924
commit 5692356e90
9 changed files with 60 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Software/PC_Application/LibreVNA-GUI/appwindow.cpp
View file

@ -324,6 +324,20 @@ void AppWindow::SetInitialState()
}
}
void AppWindow::SetResetState()
{
modeHandler->closeModes();
auto vnaIndex = modeHandler->createMode("Vector Network Analyzer", Mode::Type::VNA);
modeHandler->createMode("Signal Generator", Mode::Type::SG);
modeHandler->createMode("Spectrum Analyzer", Mode::Type::SA);
for(auto m : modeHandler->getModes()) {
m->resetSettings();
}
modeHandler->setCurrentIndex(vnaIndex);
}
bool AppWindow::ConnectToDevice(QString serial, DeviceDriver *driver)
{
if(serial.isEmpty()) {
@ -487,15 +501,7 @@ void AppWindow::SetupSCPI()
return "LibreVNA,LibreVNA-GUI,dummy_serial,"+appVersion;
}));
scpi.add(new SCPICommand("*RST", [=](QStringList){
SetInitialState();
auto vna = dynamic_cast<VNA*>(modeHandler->getActiveMode());
if(vna) {
vna->Stop();
}
auto sa = dynamic_cast<SpectrumAnalyzer*>(modeHandler->getActiveMode());
if(sa) {
sa->Stop();
}
SetResetState();
ResetReference();
return SCPI::getResultName(SCPI::Result::Empty);
}, nullptr));