Merge branch 'fix/split' into develop

Author: PierreRaybaut

cdl/gui/actionhandler.py

@@ -815,9 +815,9 @@ def cra_fit(title, fitdlgfunc, iconname, tip: str | None = None):
                         "related to Error function (erf)"
                     ),
                 )
-            self.action_for("windowing")
+            self.action_for("apply_window")
             self.action_for("detrending")
-            self.action_for("interpolation")
+            self.action_for("interpolate")
             self.action_for("resampling")
             with self.new_menu(_("Stability analysis"), icon_name="stability.svg"):
                 self.action_for("allan_variance")

cdl/gui/docks.py

@@ -61,7 +61,7 @@
 
 from cdl.config import APP_NAME, Conf, _
 from sigima_.algorithms.image import get_centroid_fourier
-from sigima_.algorithms.signal import fwhm
+from sigima_.algorithms.signal.pulse import fwhm
 from sigima_.obj import create_signal
 
 if TYPE_CHECKING:

cdl/gui/processor/signal.py

@@ -290,7 +290,7 @@ def register_computations(self) -> None:
         )
         # Other processing
         self.register_1_to_1(
-            sigima_signal.windowing,
+            sigima_signal.apply_window,
             _("Windowing"),
             paramclass=sigima_.param.WindowingParam,
             icon_name="windowing.svg",
@@ -305,7 +305,7 @@ def register_computations(self) -> None:
             icon_name="detrending.svg",
         )
         self.register_2_to_1(
-            sigima_signal.interpolation,
+            sigima_signal.interpolate,
             _("Interpolation"),
             paramclass=sigima_.param.InterpolationParam,
             obj2_name=_("signal for X values"),

cdl/tests/features/signals/deltax_dialog_unit_test.py

@@ -11,7 +11,7 @@
 
 from cdl.tests.data import create_paracetamol_signal
 from cdl.widgets.signaldeltax import SignalDeltaXDialog
-from sigima_.algorithms.signal import full_width_at_y
+from sigima_.algorithms.signal.pulse import full_width_at_y
 
 
 def test_signal_delta_x_dialog():

cdl/tests/features/signals/fft1d_unit_test.py

@@ -16,13 +16,13 @@
 from guidata.qthelpers import qt_app_context
 
 import cdl.tests.data as ctd
-import sigima_.algorithms.signal as alg
 import sigima_.computation.signal as sigima_signal
 import sigima_.obj
 import sigima_.param
 from cdl.env import execenv
 from cdl.utils.tests import check_array_result, check_scalar_result
 from cdl.utils.vistools import view_curves
+from sigima_.algorithms.signal import fourier
 
 
 def test_signal_fft_interactive() -> None:
@@ -43,8 +43,8 @@ def test_signal_fft_interactive() -> None:
         extra_param = sigima_.obj.PeriodicParam()
         s1 = sigima_.obj.create_signal_from_param(newparam, extra_param=extra_param)
         t, y = s1.xydata
-        f, s = alg.fft1d(t, y)
-        t2, y2 = alg.ifft1d(f, s)
+        f, s = fourier.fft1d(t, y)
+        t2, y2 = fourier.ifft1d(f, s)
         execenv.print("Comparing original and FFT/iFFT signals...", end=" ")
         execenv.print("OK")
         check_array_result("Signal FFT/iFFT X data", t2, t)

cdl/tests/features/signals/fitdialog_unit_test.py

@@ -14,7 +14,7 @@
 from cdl.tests.data import GaussianNoiseParam, create_noisy_signal, get_test_signal
 from cdl.utils.tests import get_default_test_name
 from cdl.widgets import fitdialog as fdlg
-from sigima_.algorithms.signal import peak_indices
+from sigima_.algorithms.signal.peakdetection import peak_indices
 
 
 def test_fit_dialog():

cdl/tests/features/signals/select_xy_cursor_unit_test.py

@@ -16,7 +16,7 @@
 from cdl.env import execenv
 from cdl.tests.data import create_paracetamol_signal
 from cdl.widgets.signalcursor import SignalCursorDialog
-from sigima_.algorithms.signal import find_first_x_at_y_value
+from sigima_.algorithms.signal.features import find_first_x_at_y_value
 
 
 @pytest.mark.parametrize("cursor_orientation", ["horizontal", "vertical"])

cdl/tests/features/signals/spectrum1d_unit_test.py

@@ -12,17 +12,21 @@
 
 from guidata.qthelpers import qt_app_context
 
-import sigima_.algorithms.signal as alg
 from cdl.tests.data import get_test_signal
 from cdl.utils.vistools import view_curves
+from sigima_.algorithms.signal.fourier import (
+    magnitude_spectrum,
+    phase_spectrum,
+    psd,
+)
 
 
 def test_signal_magnitude_spectrum_interactive() -> None:
     """Interactive test of the magnitude spectrum of a signal."""
     with qt_app_context():
         obj = get_test_signal("dynamic_parameters.txt")
         x, y = obj.xydata
-        xms, yms = alg.magnitude_spectrum(x, y, log_scale=True)
+        xms, yms = magnitude_spectrum(x, y, log_scale=True)
         view_curves(
             [(xms, yms)],
             title="Magnitude spectrum",
@@ -36,7 +40,7 @@ def test_signal_phase_spectrum_interactive() -> None:
     with qt_app_context():
         obj = get_test_signal("dynamic_parameters.txt")
         x, y = obj.xydata
-        xps, yps = alg.phase_spectrum(x, y)
+        xps, yps = phase_spectrum(x, y)
         view_curves(
             [(xps, yps)],
             title="Phase spectrum",
@@ -50,7 +54,7 @@ def test_signal_psd_interactive() -> None:
     with qt_app_context():
         obj = get_test_signal("dynamic_parameters.txt")
         x, y = obj.xydata
-        xpsd, ypsd = alg.psd(x, y, log_scale=True)
+        xpsd, ypsd = psd(x, y, log_scale=True)
         view_curves(
             [(xpsd, ypsd)],
             title="Power spectral density",

cdl/tests/scenarios/common.py

@@ -179,7 +179,7 @@ def run_signal_computations(
     for method_value, _method_name in param.methods:
         panel.objview.set_current_object(noiseobj2)
         param.method = method_value
-        panel.processor.run_feature("windowing", param)
+        panel.processor.run_feature("apply_window", param)
 
     win.add_object(sig1.copy())
 
@@ -246,7 +246,7 @@ def run_signal_computations(
             param = sigima_.param.InterpolationParam.create(
                 method=method, fill_value=fill_value
             )
-            panel.processor.run_feature("interpolation", sig2, param)
+            panel.processor.run_feature("interpolate", sig2, param)
 
     # Test resampling
     xmin, xmax = x[0], x[-1]

cdl/widgets/fitdialog.py

@@ -14,13 +14,13 @@
 
 from cdl.config import _
 from cdl.utils.tests import get_default_test_name
-from sigima_.algorithms.signal import (
+from sigima_.algorithms.signal.fitmodels import (
     GaussianModel,
     LorentzianModel,
     VoigtModel,
-    sort_frequencies,
-    xpeak,
 )
+from sigima_.algorithms.signal.fourier import sort_frequencies
+from sigima_.algorithms.signal.peakdetection import xpeak
 
 
 def guifit(