nqrduck/nqrduck-measurement
1
0
Fork 0
Code Issues 10 Pull requests Projects Releases Packages Wiki Activity Actions

Update to new measurement structure.

Browse source
This commit is contained in:
jupfi 2024-12-28 16:15:32 +01:00
parent a4885926b5
commit 1397c57d61
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/nqrduck_measurement/controller.py
View file

@ -280,7 +280,7 @@ class MeasurementController(ModuleController):
self.module.model.displayed_measurement = measurement self.module.model.displayed_measurement = measurement
# Adjust the min and max value of the selection box # Adjust the min and max value of the selection box
n_datasets = len(measurement.tdx) n_datasets = measurement.tdy.shape[1]
self.module.view._ui_form.selectionBox.setRange(0, n_datasets - 1) self.module.view._ui_form.selectionBox.setRange(0, n_datasets - 1)
logger.debug(f"Number of datasets: {n_datasets}") logger.debug(f"Number of datasets: {n_datasets}")

8
src/nqrduck_measurement/view.py
View file

@ -187,9 +187,9 @@ class MeasurementView(ModuleView):
logger.debug(f"Displaying dataset index {index}.") logger.debug(f"Displaying dataset index {index}.")
if self.module.model.view_mode == self.module.model.FFT_VIEW: if self.module.model.view_mode == self.module.model.FFT_VIEW:
self.change_to_fft_view() self.change_to_fft_view()
y = self.module.model.displayed_measurement.fdy[index] y = self.module.model.displayed_measurement.fdy[:, index]
x = ( x = (
self.module.model.displayed_measurement.fdx[index] self.module.model.displayed_measurement.fdx
+ float( + float(
self.module.model.displayed_measurement.target_frequency self.module.model.displayed_measurement.target_frequency
- self.module.model.displayed_measurement.IF_frequency - self.module.model.displayed_measurement.IF_frequency
@ -198,8 +198,8 @@ class MeasurementView(ModuleView):
) )
else: else:
self.change_to_time_view() self.change_to_time_view()
x = self.module.model.displayed_measurement.tdx[index] x = self.module.model.displayed_measurement.tdx
y = self.module.model.displayed_measurement.tdy[index] y = self.module.model.displayed_measurement.tdy[:, index]
self._ui_form.plotter.canvas.ax.plot( self._ui_form.plotter.canvas.ax.plot(
x, y.real, label="Real", linestyle="-", alpha=0.35, color="red" x, y.real, label="Real", linestyle="-", alpha=0.35, color="red"