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

reduce inter-segment delay, add integration test for segmented sweep

Browse source
This commit is contained in:
Jan Käberich 2023-10-24 16:39:21 +02:00
parent ccb71f9650
commit 503d689d51
8 changed files with 27 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Software/PC_Application/LibreVNA-GUI/Traces/traceplot.cpp
View file

@ -114,6 +114,7 @@ QString TracePlot::TypeToString(Type t)
case Type::SmithChart: return "Smith Chart";
case Type::Waterfall: return "Waterfall";
case Type::XYPlot: return "XY Plot";
default: return "Invalid";
}
}

1
Software/PC_Application/LibreVNA-GUI/Traces/tracexyplot.cpp
View file

@ -1161,6 +1161,7 @@ bool TraceXYPlot::markerVisible(double x)
void TraceXYPlot::traceDropped(Trace *t, QPoint position)
{
Q_UNUSED(position)
if(!supported(t)) {
// needs to switch to a different domain for the graph
if(!InformationBox::AskQuestion("X Axis Domain Change", "You dropped a trace that is not supported with the currently selected X axis domain."

6
Software/PC_Application/LibreVNA-GUI/VNA/vna.cpp
View file

@ -945,7 +945,7 @@ void VNA::NewDatapoint(DeviceDriver::VNAMeasurement m)
} else {
settings.activeSegment = 0;
}
SettingsChanged(false);
SettingsChanged(false, 0);
}
}
@ -954,9 +954,9 @@ void VNA::UpdateAverageCount()
lAverages->setText(QString::number(average.getLevel()) + "/");
}
void VNA::SettingsChanged(bool resetTraces)
void VNA::SettingsChanged(bool resetTraces, int delay)
{
configurationTimer.start(100);
configurationTimer.start(delay);
changingSettings = true;
configurationTimerResetTraces = resetTraces;
if(resetTraces) {

2
Software/PC_Application/LibreVNA-GUI/VNA/vna.h
View file

@ -118,7 +118,7 @@ private:
bool CalibrationMeasurementActive() { return calWaitFirst || calMeasuring; }
void SetupSCPI();
void UpdateAverageCount();
void SettingsChanged(bool resetTraces = true);
void SettingsChanged(bool resetTraces = true, int delay = 100);
void ConstrainAndUpdateFrequencies();
void LoadSweepSettings();
void StoreSweepSettings();

2
Software/PC_Application/LibreVNA-GUI/preferences.h
View file

@ -202,7 +202,7 @@ private:
{&Startup.SA.detector, "Startup.SA.detector", 0},
{&Startup.SA.averaging, "Startup.SA.averaging", 1},
{&Acquisition.alwaysExciteAllPorts, "Acquisition.alwaysExciteBothPorts", true},
{&Acquisition.allowSegmentedSweep, "Acquisition.allowSegmentedSweep", false},
{&Acquisition.allowSegmentedSweep, "Acquisition.allowSegmentedSweep", true},
{&Acquisition.useMedianAveraging, "Acquisition.useMedianAveraging", false},
{&Acquisition.fullSpanManual, "Acquisition.fullSpanManual", false},
{&Acquisition.fullSpanStart, "Acquisition.fullSpanStart", 0.0},