diff --git a/pyproject.toml b/pyproject.toml index 96b7035..f015c1e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,6 +30,7 @@ dependencies = [ "nqrduck", "nqrduck-pulseprogrammer", "nqrduck-spectrometer", + "quackseq", ] [project.optional-dependencies] diff --git a/src/nqrduck_measurement/controller.py b/src/nqrduck_measurement/controller.py index 8c0e49c..2f513d0 100644 --- a/src/nqrduck_measurement/controller.py +++ b/src/nqrduck_measurement/controller.py @@ -4,9 +4,11 @@ import logging import json from PyQt6.QtCore import pyqtSlot, pyqtSignal from PyQt6.QtWidgets import QApplication -from .signalprocessing_options import Apodization, Fitting + from nqrduck.module.module_controller import ModuleController -from nqrduck_spectrometer.measurement import Measurement +from quackseq.measurement import Measurement + +from .signalprocessing_options import Apodization, Fitting logger = logging.getLogger(__name__) @@ -231,7 +233,7 @@ class MeasurementController(ModuleController): self.module.model.displayed_measurement = apodized_measurement self.module.model.add_measurement(apodized_measurement) - + def show_fitting_dialog(self) -> None: """Show fitting dialog.""" logger.debug("Showing fitting dialog.") diff --git a/src/nqrduck_measurement/model.py b/src/nqrduck_measurement/model.py index 9ba0e56..28e1497 100644 --- a/src/nqrduck_measurement/model.py +++ b/src/nqrduck_measurement/model.py @@ -2,7 +2,7 @@ import logging from PyQt6.QtCore import pyqtSignal -from nqrduck_spectrometer.measurement import Measurement +from quackseq.measurement import Measurement from nqrduck.module.module_model import ModuleModel logger = logging.getLogger(__name__) diff --git a/src/nqrduck_measurement/signalprocessing_options.py b/src/nqrduck_measurement/signalprocessing_options.py index 4768e5c..09905c6 100644 --- a/src/nqrduck_measurement/signalprocessing_options.py +++ b/src/nqrduck_measurement/signalprocessing_options.py @@ -2,8 +2,8 @@ import logging import sympy -from nqrduck_spectrometer.measurement import Measurement, Fit, T2StarFit, LorentzianFit -from nqrduck.helpers.functions import Function, GaussianFunction, CustomFunction +from quackseq.measurement import Measurement, Fit, T2StarFit, LorentzianFit +from quackseq.functions import Function, GaussianFunction, CustomFunction from nqrduck.helpers.formbuilder import ( DuckFormBuilder, DuckFormFunctionSelectionField,