Fix crop limits (#336)

cbrnr · Mar 24, 2022 · 91e7537 · 91e7537
1 parent a9f921b
commit 91e7537
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -37,6 +37,7 @@
 - Fix exporting to BrainVision with annotations starting with "BAD" or "EDGE" ([#276](https://github.com/cbrnr/mnelab/pull/276) by [Clemens Brunner](https://github.com/cbrnr))
 - Exporting to .fif.gz now uses the correct extension on macOS ([#301](https://github.com/cbrnr/mnelab/pull/301) by [Clemens Brunner](https://github.com/cbrnr))
 - Round physical minima and maxima to integers in EDF export ([#310](https://github.com/cbrnr/mnelab/pull/310) by [Clemens Brunner](https://github.com/cbrnr))
+- Fix crop limit could exceed the signal length ([#336](https://github.com/cbrnr/mnelab/pull/336) by [Clemens Brunner](https://github.com/cbrnr))
 
 ## [0.7.0] - 2021-12-29
 ### Added

diff --git a/mnelab/dialogs/crop.py b/mnelab/dialogs/crop.py
@@ -24,7 +24,7 @@ def __init__(self, parent, start, stop):
         self.start_checkbox.stateChanged.connect(self.toggle_start)
         grid.addWidget(self.start_checkbox, 0, 0)
         self._start = QDoubleSpinBox()
-        self._start.setMaximum(999999)
+        self._start.setMaximum(stop)
         self._start.setValue(start)
         self._start.setDecimals(2)
         self._start.setSuffix(" s")
@@ -35,7 +35,7 @@ def __init__(self, parent, start, stop):
         self.stop_checkbox.stateChanged.connect(self.toggle_stop)
         grid.addWidget(self.stop_checkbox, 1, 0)
         self._stop = QDoubleSpinBox()
-        self._stop.setMaximum(999999)
+        self._stop.setMaximum(stop)
         self._stop.setValue(stop)
         self._stop.setDecimals(2)
         self._stop.setSuffix(" s")

diff --git a/mnelab/mainwindow.py b/mnelab/mainwindow.py
@@ -727,12 +727,11 @@ def edit_events(self):
 
     def crop(self):
         """Crop data."""
-        fs = self.model.current["data"].info["sfreq"]
-        length = self.model.current["data"].n_times / fs
-        dialog = CropDialog(self, 0, length)
+        stop = self.model.current["data"].times[-1]
+        dialog = CropDialog(self, 0, stop)
         if dialog.exec():
             self.auto_duplicate()
-            self.model.crop(dialog.start or 0, dialog.stop)
+            self.model.crop(max(dialog.start, 0), min(dialog.stop, stop))
 
     def append_data(self):
         """Concatenate raw data objects to current one."""