Skip to content

Commit 4496711

Browse files
committed
Prevent crash for invalid characters
1 parent fb7faf5 commit 4496711

File tree

2 files changed

+23
-3
lines changed

2 files changed

+23
-3
lines changed

src/mslice/presenters/cut_widget_presenter.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,16 @@ def _parse_input(self):
114114
e_units,
115115
)
116116

117-
intensity_start = self._cut_view.get_intensity_start()
118-
intensity_end = self._cut_view.get_intensity_end()
117+
try:
118+
intensity_start = float(self._cut_view.get_intensity_start())
119+
except ValueError:
120+
intensity_start = None
121+
warnings.warn("Invalid intensity start parameter")
122+
try:
123+
intensity_end = float(self._cut_view.get_intensity_end())
124+
except ValueError:
125+
intensity_end = None
126+
warnings.warn("Invalid intensity end parameter")
119127

120128
norm_to_one = bool(self._cut_view.get_intensity_is_norm_to_one())
121129
width = self._cut_view.get_integration_width()

src/mslice/widgets/workspacemanager/input_boxes.py

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,16 @@ def __init__(self, is_bose=False, parent=None):
5050
def user_input(self):
5151
v1 = self.edit1.text()
5252
v2 = self.edit2.text()
53-
return float(v1) if v1 else None, float(v2) if v2 else None
53+
v1_value = None
54+
v2_value = None
55+
if v1:
56+
try:
57+
v1_value = float(v1)
58+
except ValueError:
59+
pass
60+
if v2:
61+
try:
62+
v2_value = float(v2)
63+
except ValueError:
64+
pass
65+
return v1_value, v2_value

0 commit comments

Comments
 (0)