diff --git a/Software/PC_Application/preferencesdialog.ui b/Software/PC_Application/preferencesdialog.ui
index 53505fc..77c111b 100644
--- a/Software/PC_Application/preferencesdialog.ui
+++ b/Software/PC_Application/preferencesdialog.ui
@@ -6,8 +6,8 @@
0
0
- 936
- 951
+ 876
+ 587
@@ -15,7 +15,7 @@
-
-
+
-
@@ -69,587 +69,1040 @@
-
-
-
-
- 0
- 0
-
+
+
+ true
-
-
- 16777215
- 16777215
-
-
-
- 2
-
-
-
+
+
+
+ 0
+ 0
+ 654
+ 884
+
+
+
-
-
-
-
-
-
- When starting the application...
-
-
-
-
-
-
- Autoconnect to the first device available
-
-
-
- -
-
-
- Set to...
-
-
-
- -
-
-
-
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 16777215
+ 16777215
+
+
+
+ 3
+
+
+
+
-
+
+
-
+
+
+ When starting the application...
+
+
-
-
+
- Last used
-
-
- StartupSweepGroup
-
-
-
- -
-
-
- Default values
-
-
- StartupSweepGroup
-
-
-
- -
-
-
- Setup file
-
-
- StartupSweepGroup
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
-
-
- -
-
-
- 2
-
-
-
-
-
-
-
- The last used sweep settings (e.g. span, bandwidth,...) will be remembered. The graphs, traces and markers will not be remembered and the default configuration for them is used on startup.
-
-
- true
+ Autoconnect to the first device available
-
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
-
-
-
-
- -
-
+
- All settings (sweep settings as well as graphs, markers and traces) will be taken from the specified file. If the autosave option is checked, the current state of the GUI is stored in this file during shutdown as well.
-
-
- true
+ Set to...
-
-
+
-
-
-
- File location:
-
-
-
- -
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 20
- 16777215
-
-
-
- ...
-
-
+
+
-
+
+
+ Last used
+
+
+ StartupSweepGroup
+
+
+
+ -
+
+
+ Default values
+
+
+ StartupSweepGroup
+
+
+
+ -
+
+
+ Setup file
+
+
+ StartupSweepGroup
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
-
-
-
- Autosave to this file on shutdown
+
+
+ 2
+
+
+
-
+
+
+ The last used sweep settings (e.g. span, bandwidth,...) will be remembered. The graphs, traces and markers will not be remembered and the default configuration for them is used on startup.
+
+
+ true
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+
+
+
+
+ -
+
+
+ All settings (sweep settings as well as graphs, markers and traces) will be taken from the specified file. If the autosave option is checked, the current state of the GUI is stored in this file during shutdown as well.
+
+
+ true
+
+
+
+ -
+
+
-
+
+
+ File location:
+
+
+
+ -
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 20
+ 16777215
+
+
+
+ ...
+
+
+
+
+
+ -
+
+
+ Autosave to this file on shutdown
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 545
+
+
+
+
+
+
+
+
+ -
+
+
+ These default values for the sweep settings will be used. The graphs, traces and markers will not be remembered and the default configuration for them is used on startup.
+
+
+ true
+
+
+
+ -
+
+
+ Vector Network Analyzer
+
+
+
-
+
+
-
+
+
+ Type:
+
+
+
+ -
+
+
-
+
+ Frequency Sweep
+
+
+ -
+
+ Power Sweep
+
+
+
+
+
+
+ -
+
+
-
+
+
+ Frequency Sweep:
+
+
+
-
+
+
+ Start:
+
+
+
+ -
+
+
+ -
+
+
+ Stop:
+
+
+
+ -
+
+
+ -
+
+
+ Simulus level:
+
+
+
+ -
+
+
+ dbm
+
+
+ -42.000000000000000
+
+
+ 0.000000000000000
+
+
+ 0.250000000000000
+
+
+
+
+
+
+ -
+
+
+ Power Sweep:
+
+
+
-
+
+
+ Start:
+
+
+
+ -
+
+
+ dbm
+
+
+ -42.000000000000000
+
+
+ 0.000000000000000
+
+
+ 0.250000000000000
+
+
+
+ -
+
+
+ Stop:
+
+
+
+ -
+
+
+ dbm
+
+
+ -42.000000000000000
+
+
+ 0.000000000000000
+
+
+ 0.250000000000000
+
+
+
+ -
+
+
+ Frequency:
+
+
+
+ -
+
+
+
+
+
+
+
+ -
+
+
-
+
+
+ Points:
+
+
+
+ -
+
+
+ 1
+
+
+ 4501
+
+
+ 501
+
+
+
+ -
+
+
+ IF bandwitdh:
+
+
+
+ -
+
+
+ -
+
+
+ Averaging:
+
+
+
+ -
+
+
+ 1
+
+
+ 99
+
+
+
+
+
+
+
+
+ -
+
+
+ Signal Generator
+
+
+
-
+
+
+ Frequency:
+
+
+
+ -
+
+
+ -
+
+
+ Output level:
+
+
+
+ -
+
+
+ dbm
+
+
+ -42.000000000000000
+
+
+ 0.000000000000000
+
+
+ 0.250000000000000
+
+
+
+
+
+
+ -
+
+
+ Spectrum Analyzer
+
+
+
-
+
+
+ Start:
+
+
+
+ -
+
+
+ -
+
+
+ Stop:
+
+
+
+ -
+
+
+ -
+
+
+ RBW:
+
+
+
+ -
+
+
+ -
+
+
+ Window:
+
+
+
+ -
+
+
-
+
+ None
+
+
+ -
+
+ Kaiser
+
+
+ -
+
+ Hann
+
+
+ -
+
+ Flat Top
+
+
+
+
+ -
+
+
+ Detector:
+
+
+
+ -
+
+
-
+
+ +Peak
+
+
+ -
+
+ -Peak
+
+
+ -
+
+ Sample
+
+
+ -
+
+ Normal
+
+
+ -
+
+ Average
+
+
+
+
+ -
+
+
+ Signal Identification:
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+ Averaging:
+
+
+
+ -
+
+
+ 1
+
+
+ 99
+
+
+
+
+
+
+
+
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 545
-
-
-
-
-
-
- -
-
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 17
+ 37
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+ Vector Network Analyzer
+
+
+
-
+
+
+ <html><head/><body><p>If only S11/S21 or S22/S12 are enabled, faster sweeps are possible by only exciting one port. Checking this option forces the device to always excite both ports even when the measurements from one port will not be used.</p></body></html>
+
+
+ Always perform full 2-port measurement
+
+
+
+ -
+
+
+ <html><head/><body><p>Due to limited fractional divider settings, the source and 1.LO PLLs are not able to reach every frequency exactly. At some specific frequencies this causes the final IF to shift. At these frequencies there will be a positive or negative peak in the trace measurement that is not actually there.<br/><br/>Checking this option shifts the 2.LO for points where this could be an issue. This will remove the peaks but slows down the sweep slightly.</p></body></html>
+
+
+ Suppress invalid peaks
+
+
+
+ -
+
+
+ <html><head/><body><p>If enabled, the step attenuator setting will be changed during the sweep to keep the selected output power across frequency as accurate as possible.</p></body></html>
+
+
+ Adjust power level during sweep
+
+
+
+ -
+
+
+ Use harmonic mixing
+
+
+
+ -
+
+
+ Allow segmented sweep (increases maximum number of points)
+
+
+
+
+
+
+ -
+
+
+ Spectrum Analyzer
+
+
+
-
+
+
-
+
+
+ <html><head/><body><p>Normally, the spectrum analyzer mode tunes the LO for each point and measures the final IF only at one frequency. When this option is enabled, a DFT of the final IF is calculated instead which covers multiple frequencies with one measurement.</p><p>This can speed up the measurement at low RBWs significantly.</p></body></html>
+
- These default values for the sweep settings will be used. The graphs, traces and markers will not be remembered and the default configuration for them is used on startup.
-
-
- true
+ Use DFT when RBW is below
- -
-
-
- Vector Network Analyzer
+
-
+
+
+
+
+
+
+
+ -
+
+
+ Common
+
+
+
-
+
+
-
+
+
+ Averaging mode:
-
-
-
-
-
-
-
-
- Type:
-
-
-
- -
-
-
-
-
- Frequency Sweep
-
-
- -
-
- Power Sweep
-
-
-
-
-
-
- -
-
-
-
-
-
- Frequency Sweep:
-
-
-
-
-
-
- Start:
-
-
-
- -
-
-
- -
-
-
- Stop:
-
-
-
- -
-
-
- -
-
-
- Simulus level:
-
-
-
- -
-
-
- dbm
-
-
- -42.000000000000000
-
-
- 0.000000000000000
-
-
- 0.250000000000000
-
-
-
-
-
-
- -
-
-
- Power Sweep:
-
-
-
-
-
-
- Start:
-
-
-
- -
-
-
- dbm
-
-
- -42.000000000000000
-
-
- 0.000000000000000
-
-
- 0.250000000000000
-
-
-
- -
-
-
- Stop:
-
-
-
- -
-
-
- dbm
-
-
- -42.000000000000000
-
-
- 0.000000000000000
-
-
- 0.250000000000000
-
-
-
- -
-
-
- Frequency:
-
-
-
- -
-
-
-
-
-
-
-
- -
-
-
-
-
-
- Points:
-
-
-
- -
-
-
- 1
-
-
- 4501
-
-
- 501
-
-
-
- -
-
-
- IF bandwitdh:
-
-
-
- -
-
-
- -
-
-
- Averaging:
-
-
-
- -
-
-
- 1
-
-
- 99
-
-
-
-
-
-
- -
-
-
- Signal Generator
-
-
+
-
+
+
-
+
+ Mean
+
+
+ -
+
+ Median
+
+
+
+
+
+
+ -
+
+
+ IF frequencies
+
+
+
-
+
+
+ This section contains advanced system settings. It is recommended to leave them at default values unless you know what you are doing. Slight changes of the IF frequencies can be used to shift possible spikes to less problematic frequencies. Large changes of these frequencies may severely impact device performance.
+
+
+ true
+
+
+
+ -
+
-
-
+
- Frequency:
+ IF 1:
-
-
+
+
+ <html><head/><body><p>Frequency of the first IF</p></body></html>
+
+
-
-
+
- Output level:
+ ADC prescaler:
-
-
-
- dbm
+
+
+ <html><head/><body><p>ADC prescaler in FPGA. The ADC sample rate is determined by 102.4MHz/prescaler</p></body></html>
- -42.000000000000000
+ 112
- 0.000000000000000
+ 255
-
- 0.250000000000000
+
+ 128
-
-
-
- -
-
-
- Spectrum Analyzer
-
-
-
-
-
-
- Start:
-
-
-
- -
-
-
- -
-
-
- Stop:
-
-
-
- -
-
-
-
-
+
- RBW:
+ ADC sample rate:
-
-
+
+
+ false
+
+
-
-
+
- Window:
+ Phase increment:
-
-
-
-
-
- None
-
-
- -
-
- Kaiser
-
-
- -
-
- Hann
-
-
- -
-
- Flat Top
-
-
+
+
+ <html><head/><body><p>Phase increment per ADC sample. Together with the ADC sample rate this determines the frequency of the second IF</p></body></html>
+
+
+ 1
+
+
+ 4095
+
+
+ 1280
+
-
-
+
- Detector:
+ IF 2:
-
-
-
-
-
- +Peak
-
-
- -
-
- -Peak
-
-
- -
-
- Sample
-
-
- -
-
- Normal
-
-
- -
-
- Average
-
-
-
-
- -
-
-
- Signal Identification:
+
+
+ false
- -
-
+
+
+
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+
+
+
+
+ -
+
+
-
+
+
+ Show unit on graph axes
+
+
+
+ -
+
+
+ Size
+
+
+
-
+
+
+ Line Width:
+
+
+
+ -
+
+
+ 0.100000000000000
+
+
+
+ -
+
+
+ Font (axes):
+
+
+
+ -
+
+
+ 1
+
+
+
+ -
+
+
+ 1
+
+
+
+ -
+
+
+ 1
+
+
+
+ -
+
+
+ 1
+
+
+
+ -
+
+
+ Font (trace names):
+
+
+
+ -
+
+
+ Font (marker data):
+
+
+
+ -
+
+
+ Font (cursor overlay):
+
+
+
+
+
+
+ -
+
+
+ Colors
+
+
+
-
+
+
+ Background:
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+ Axis:
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+ Ticks
+
+
+ false
+
+
+
-
+
+
+
+
+
+ false
+
+
+ false
+
+
+
+ -
+
+
+ Tick lines:
+
+
+
+ -
+
- -
-
+
-
+
- Averaging:
+ Different background for every 2nd Y tick
-
-
- -
-
-
- 1
-
-
- 99
+
+ true
@@ -658,676 +1111,232 @@
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 17
- 37
-
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 48
- 20
-
-
-
-
-
-
-
-
- -
-
-
- Vector Network Analyzer
-
-
-
-
-
-
- <html><head/><body><p>If only S11/S21 or S22/S12 are enabled, faster sweeps are possible by only exciting one port. Checking this option forces the device to always excite both ports even when the measurements from one port will not be used.</p></body></html>
-
-
- Always perform full 2-port measurement
-
-
-
- -
-
-
- <html><head/><body><p>Due to limited fractional divider settings, the source and 1.LO PLLs are not able to reach every frequency exactly. At some specific frequencies this causes the final IF to shift. At these frequencies there will be a positive or negative peak in the trace measurement that is not actually there.<br/><br/>Checking this option shifts the 2.LO for points where this could be an issue. This will remove the peaks but slows down the sweep slightly.</p></body></html>
-
-
- Suppress invalid peaks
-
-
-
- -
-
-
- <html><head/><body><p>If enabled, the step attenuator setting will be changed during the sweep to keep the selected output power across frequency as accurate as possible.</p></body></html>
-
-
- Adjust power level during sweep
-
-
-
- -
-
-
- Use harmonic mixing
-
-
-
- -
-
-
- Allow segmented sweep (increases maximum number of points)
-
-
-
-
-
-
- -
-
-
- Spectrum Analyzer
-
-
-
-
-
-
-
-
-
- <html><head/><body><p>Normally, the spectrum analyzer mode tunes the LO for each point and measures the final IF only at one frequency. When this option is enabled, a DFT of the final IF is calculated instead which covers multiple frequencies with one measurement.</p><p>This can speed up the measurement at low RBWs significantly.</p></body></html>
-
-
- Use DFT when RBW is below
-
-
-
- -
-
-
-
-
-
-
-
- -
-
-
- Common
-
-
-
-
-
-
-
-
-
- Averaging mode:
-
-
-
- -
-
-
-
-
- Mean
-
-
- -
-
- Median
-
-
-
-
-
-
- -
-
-
- IF frequencies
-
-
+
-
-
-
- This section contains advanced system settings. It is recommended to leave them at default values unless you know what you are doing. Slight changes of the IF frequencies can be used to shift possible spikes to less problematic frequencies. Large changes of these frequencies may severely impact device performance.
-
-
- true
+
+
+ Trace Domain Handling
+
+
-
+
+
+ <html><head/><body><p>A trace may change its output format/domain if certain settings are changed (e.g. from frequency to time domain when enabling TDR). Depending on the type of change, the graphs settings also have to be adjusted. Select the the behavior of the graphs when this happens:</p></body></html>
+
+
+ true
+
+
+
+ -
+
+
-
+
+ Remove changed trace from all unsupported graphs
+
+
+ -
+
+ Adjust graphs to support the changed trace (may remove other traces)
+
+
+ -
+
+ Adjust graph only if it contains no other traces
+
+
+
+
+
-
-
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 80
+ 20
+
+
+
+
+
+
+
+
+ -
+
+
-
+
+
+ Default Behavior
+
+
+
-
+
+
+ Show data on graphs
+
+
+
+ -
+
+
+ Show data in all available formats
+
+
+
+
+
+
+ -
+
-
-
+
- IF 1:
+ Positioning:
-
-
-
- <html><head/><body><p>Frequency of the first IF</p></body></html>
-
-
-
- -
-
-
- ADC prescaler:
-
-
-
- -
-
-
- <html><head/><body><p>ADC prescaler in FPGA. The ADC sample rate is determined by 102.4MHz/prescaler</p></body></html>
-
-
- 112
-
-
- 255
-
-
- 128
-
-
-
- -
-
-
- ADC sample rate:
-
-
-
- -
-
-
- false
-
-
-
- -
-
-
- Phase increment:
-
-
-
- -
-
-
- <html><head/><body><p>Phase increment per ADC sample. Together with the ADC sample rate this determines the frequency of the second IF</p></body></html>
-
-
- 1
-
-
- 4095
-
-
- 1280
-
-
-
- -
-
-
- IF 2:
-
-
-
- -
-
-
- false
+
+
+ QComboBox::AdjustToContents
+
-
+
+ Snap to measurement points
+
+
+ -
+
+ Interpolate between points
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
- Show unit on graph axes
-
-
-
- -
-
-
- Size
-
-
-
-
-
-
- Line Width:
-
-
-
- -
-
-
- 0.100000000000000
-
-
-
- -
-
-
- Font (axes):
-
-
-
- -
-
-
- 1
-
-
-
- -
-
-
- 1
-
-
-
- -
-
-
- 1
-
-
-
- -
-
-
- 1
-
-
-
- -
-
-
- Font (trace names):
-
-
-
- -
-
-
- Font (marker data):
-
-
-
- -
-
-
- Font (cursor overlay):
-
-
-
-
-
-
- -
-
-
- Colors
-
-
-
-
-
-
- Background:
-
-
-
- -
-
-
-
-
-
-
- -
-
-
- Axis:
-
-
-
- -
-
-
-
-
-
-
- -
-
-
- Ticks
-
-
- false
-
-
-
-
-
-
-
-
-
- false
-
-
- false
-
-
-
- -
-
-
- Tick lines:
-
-
-
- -
-
-
-
-
-
-
- -
-
-
- Different background for every 2nd Y tick
-
-
- true
-
-
-
-
-
-
-
-
-
- -
-
-
- Trace Domain Handling
-
-
-
-
-
-
- <html><head/><body><p>A trace may change its output format/domain if certain settings are changed (e.g. from frequency to time domain when enabling TDR). Depending on the type of change, the graphs settings also have to be adjusted. Select the the behavior of the graphs when this happens:</p></body></html>
-
-
- true
-
-
-
- -
-
-
-
-
- Remove changed trace from all unsupported graphs
-
-
- -
-
- Adjust graphs to support the changed trace (may remove other traces)
-
-
- -
-
- Adjust graph only if it contains no other traces
-
-
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 80
- 20
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
- Default Behavior
-
-
-
-
-
-
- Show data on graphs
-
-
-
- -
-
-
- Show data in all available formats
-
-
-
-
-
-
- -
-
-
-
-
-
- Positioning:
-
-
- -
-
-
-
-
- Snap to measurement points
-
-
- -
-
- Interpolate between points
-
-
-
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 300
+ 20
+
+
+
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 368
- 20
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
- SCPI Control
-
-
-
-
-
-
- Enable server
-
-
-
- -
-
-
-
-
-
- Port:
-
-
-
- -
-
-
- 1
-
-
- 65535
-
-
-
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 471
- 20
-
-
-
+
+
+
+ -
+
+
-
+
+
+ SCPI Control
+
+
+
-
+
+
+ Enable server
+
+
+
+ -
+
+
-
+
+
+ Port:
+
+
+
+ -
+
+
+ 1
+
+
+ 65535
+
+
+
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 471
+ 20
+
+
+
+
+
+
+